delimiter, not sep

Clients/VisualStudioCode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "java-tx-language-extension",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "java-tx-language-extension",
-      "version": "0.0.18",
+      "version": "0.0.19",
       "dependencies": {
         "@vscode/vsce": "^3.6.1",
         "vscode-languageclient": "^9.0.1"

Clients/VisualStudioCode/package.json

@@ -3,7 +3,7 @@
   "name": "java-tx-language-extension",
   "displayName": "Java-TX Language Extension",
   "description": "The Language Extension for Java-TX with Typehints and Syntax Checks",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "engines": {
     "vscode": "^1.94.0"
   },

Clients/VisualStudioCode/src/extension.ts

@@ -56,7 +56,7 @@ function createClient(context: vscode.ExtensionContext): LanguageClient | null {
 
   const cmd: Executable = {
     command: 'java',
-    args: ['-Xss10m', '-cp', `${compiler}:${workspaceFolder}/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar`, "de.dhbw.JavaTXLanguageServerLauncher"],
+    args: ['-Xss10m', '-cp', `${compiler}${path.delimiter}${workspaceFolder}/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar`, "de.dhbw.JavaTXLanguageServerLauncher"],
   };
 
   const serverOptions: ServerOptions = {

Clients/emacs/README.md

@@ -0,0 +1,11 @@
+## Install emacs plugin:
+
+Edit your .emacs file and add the following:
+
+```
+(use-package javatx-mode
+  :custom
+  (javatx-compiler-path "$PATH_TO_COMPILER$")
+  (javatx-lsp-server-path "$PATH_TO_LSP$")
+  :load-path "~/.emacs.d/lisp")
+```

Clients/emacs/javatx-mode.el

@@ -0,0 +1,84 @@
+;;; javatx-mode.el --- Major mode for .jav files -*- lexical-binding: t; -*-
+
+(defvar javatx-mode-hook nil
+  "Hook called when entering `javatx-mode`.")
+
+;; Define the mode
+(define-derived-mode javatx-mode java-mode "Javatx"
+  "Major mode for editing `.jav` files.")
+
+;; Automatically use javatx-mode for .jav files
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.jav\\'" . javatx-mode))
+
+(provide 'javatx-mode)
+;;; javatx-mode.el ends here
+
+;; Initialize package sources
+(require 'package)
+(setq package-archives
+      '(("melpa" . "https://melpa.org/packages/")
+        ("gnu" . "https://elpa.gnu.org/packages/")))
+(package-initialize)
+
+;; Refresh package contents if needed
+(unless package-archive-contents
+  (package-refresh-contents))
+
+;; Install use-package if not installed
+(unless (package-installed-p 'use-package)
+  (package-install 'use-package))
+
+(require 'use-package)
+(setq use-package-always-ensure t) ;; automatically install packages if missing
+
+(use-package lsp-mode
+  :hook (prog-mode . lsp)
+  :commands lsp
+  :config
+  (setq lsp-prefer-flymake nil)) ;; use flycheck instead of flymake
+
+(use-package lsp-ui
+  :commands lsp-ui-mode
+  :hook (lsp-mode . lsp-ui-mode)
+  :config
+  (setq lsp-ui-sideline-show-hover t
+        lsp-ui-sideline-show-code-actions t
+        lsp-ui-sideline-show-diagnostics t))
+
+(defcustom javatx-compiler-path nil
+  "Path to the JavaTX Compiler jar."
+  :type 'string
+  :group 'javatx)
+
+(defcustom javatx-lsp-server-path nil
+  "Path to the JavaTX Language Server jar."
+  :type 'string
+  :group 'javatx)
+
+;;register javatx-mode lsp
+(with-eval-after-load 'lsp-mode
+  (message "Compiler path: %s" javatx-compiler-path)
+  (message "Server path: %s" javatx-lsp-server-path)
+  (add-to-list 'lsp-language-id-configuration '(javatx-mode . "Java-TX"))
+  (lsp-register-client
+   (make-lsp-client
+    :new-connection (lsp-stdio-connection (lambda () `("java" "-cp" ,(format "%s:%s" (expand-file-name javatx-compiler-path) (expand-file-name javatx-lsp-server-path)) "de.dhbw.JavaTXLanguageServerLauncher")))
+    :major-modes '(javatx-mode)
+    :server-id 'javatx-lsp-proxy)))
+
+(add-hook 'javatx-mode-hook #'lsp) ;; start LSP automatically for .jav files
+
+;; Automatically enable inlay hints for javatx-mode
+(add-hook 'javatx-mode-hook
+          (lambda ()
+            ;; Replace 'lsp-inlay-hints-mode' with whatever inlay hints function you use
+            (when (fboundp 'lsp-inlay-hints-mode)
+              (lsp-inlay-hints-mode 1))))
+
+
+(setq lsp-log-io t)  ;; enable logging of LSP messages
+
+(with-eval-after-load 'lsp-mode
+  (define-key lsp-mode-map (kbd "C-c a") 'lsp-execute-code-action))
+

LanguageServer/src/main/java/de/dhbw/JavaTXLanguageServer.java

@@ -17,6 +17,7 @@ import java.util.concurrent.CompletableFuture;
  * */
 public class JavaTXLanguageServer implements LanguageServer {
     private static final Logger logger = LogManager.getLogger(JavaTXLanguageServer.class);
+    public static ClientCapabilities capabilities;
     private LanguageClient client;
 
     public void connect(LanguageClient client) {
@@ -48,6 +49,7 @@ public class JavaTXLanguageServer implements LanguageServer {
         if(params.getWorkspaceFolders() != null && !params.getWorkspaceFolders().isEmpty()) {
             textDocumentService.setFileRoot(params.getWorkspaceFolders());
         }
+        JavaTXLanguageServer.capabilities = params.getCapabilities();
 
         return CompletableFuture.supplyAsync(() -> new InitializeResult(capabilities));
     }

LanguageServer/src/main/java/de/dhbw/JavaTXTextDocumentService.java

@@ -113,8 +113,7 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
         if (!syntaxErrors.isEmpty()) {
             clientService.publishDiagnostics(params.getTextDocument().getUri(), syntaxErrors);
         }
-        client.refreshDiagnostics();
+        clientService.updateClient();
-        client.refreshInlayHints();
         textDocuments.put(params.getTextDocument().getUri(), params.getTextDocument().getText());
         textDocumentService.saveFileWithUri(params.getTextDocument().getUri(), params.getTextDocument().getText());
     }
@@ -154,10 +153,10 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
     @Override
     public void didSave(DidSaveTextDocumentParams didSaveTextDocumentParams) {
         logService.log("[didSave] Client triggered didSave-Event.");
-        clientService.startLoading("compile-task", "Inferring types...", client);
+        clientService.startLoading("compile-task", "Inferring types...");
         saveHandler.handleSave(didSaveTextDocumentParams);
-        clientService.stopLoading("compile-task", "Types successfully inferred", client);
+        clientService.stopLoading("compile-task", "Types successfully inferred");
-        clientService.updateClient(client);
+        clientService.updateClient();
     }
 
     @Override
@@ -298,7 +297,9 @@ public class JavaTXTextDocumentService implements org.eclipse.lsp4j.services.Tex
 
         logService.log("[codeAction] Client requested Insert at Line [" + params.getRange().getStart().getLine() + "] and from Char [" + params.getRange().getStart().getCharacter() + "] to [" + params.getRange().getEnd().getCharacter() + "].", MessageType.Info);
 
-        logService.log("Code-Action Context was: " + params.getContext().getTriggerKind().name(), MessageType.Info);
+        var triggerKind = params.getContext().getTriggerKind();
+        if (triggerKind != null)
+            logService.log("Code-Action Context was: " + triggerKind.name(), MessageType.Info);
 
         return CompletableFuture.supplyAsync(() -> {
             return codeActionHandler.handleNewCodeAction(params);

LanguageServer/src/main/java/de/dhbw/service/ClientService.java

@@ -3,8 +3,12 @@ package de.dhbw.service;
 import org.eclipse.lsp4j.*;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.lsp4j.services.LanguageServer;
+
+import de.dhbw.JavaTXLanguageServer;
 
 import java.util.List;
+import java.util.Map;
 
 public class ClientService {
 
@@ -39,13 +43,10 @@ public class ClientService {
         this.client = client;
     }
 
-    public void updateClient(LanguageClient client) {
-        client.refreshInlayHints();
-        client.refreshDiagnostics();
-    }
-
     public void updateClient() {
+        if (JavaTXLanguageServer.capabilities.getWorkspace().getInlayHint() != null)
             client.refreshInlayHints();
+        if (JavaTXLanguageServer.capabilities.getWorkspace().getDiagnostics() != null)
             client.refreshDiagnostics();
     }
 
@@ -53,7 +54,7 @@ public class ClientService {
         return client;
     }
 
-    public void startLoading(String taskName, String title, LanguageClient client) {
+    public void startLoading(String taskName, String title) {
         Either<String, Integer> token = Either.forLeft(taskName);
         client.createProgress(new WorkDoneProgressCreateParams(token));
 
@@ -67,7 +68,7 @@ public class ClientService {
 
     }
 
-    public void stopLoading(String taskName, String title, LanguageClient client) {
+    public void stopLoading(String taskName, String title) {
         Either<String, Integer> token = Either.forLeft(taskName);
         WorkDoneProgressEnd end = new WorkDoneProgressEnd();
         end.setMessage(title);