Resolve path

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.14",
+  "version": "0.0.18",
   "engines": {
     "vscode": "^1.94.0"
   },
@@ -20,6 +20,18 @@
         "command": "tx.restartLanguageServer",
         "title": "TX: Restart Language Server"
       }
+    ],
+    "configuration": [
+      {
+        "title": "JavaTX Language Server Plugin",
+        "properties": {
+          "tx.compilerLocation": {
+            "type": "string",
+            "format": "file",
+            "description": "JavaTX Compiler Location"
+          }
+        }
+      }
     ]
   },
   "scripts": {
@@ -42,6 +54,7 @@
     "typescript": "^5.6.2"
   },
   "dependencies": {
+    "@vscode/vsce": "^3.6.1",
     "vscode-languageclient": "^9.0.1"
   }
 }

Clients/VisualStudioCode/src/extension.ts

@@ -1,28 +1,67 @@
+import path from 'path';
+import os from "os";
 import * as vscode from 'vscode';
 import {
+  Executable,
   LanguageClient,
   LanguageClientOptions,
   ServerOptions
 } from 'vscode-languageclient/node';
 
+let homeDirectory: string;
+let currentUser: string;
+
+function untildify(pathWithTilde: string) {
+	if (homeDirectory === undefined) {
+		homeDirectory = os.homedir();
+	}
+
+	// Handle regular ~ expansion (current user)
+	if (homeDirectory && /^~(?=$|\/|\\)/.test(pathWithTilde)) {
+		return pathWithTilde.replace(/^~/, homeDirectory);
+	}
+
+	// Handle ~username expansion (only for current user)
+	const userMatch = pathWithTilde.match(/^~([^/\\]+)(.*)/);
+	if (userMatch) {
+		if (currentUser === undefined) {
+			currentUser = os.userInfo().username;
+		}
+
+		if (currentUser) {
+			const username = userMatch[1];
+			const rest = userMatch[2];
+			if (username === currentUser) {
+				return homeDirectory + rest;
+			}
+		}
+	}
+
+	// Return unchanged if no expansion occurred
+	return pathWithTilde;
+}
+
 let client: LanguageClient | undefined;   // <— global, damit wir neu starten können
 
-function createClient(context: vscode.ExtensionContext): LanguageClient {
+function createClient(context: vscode.ExtensionContext): LanguageClient | null {
   const workspaceFolder = context.extensionPath;
+  const config = vscode.workspace.getConfiguration("tx");
+
+  let compiler = config.get<string>("compilerLocation");
+  if (!compiler || compiler.trim() === "") {
+    vscode.window.showErrorMessage("Bitte konfiguriere den Pfad des Java-TX Compilers in den Einstellungen!");
+    return null;
+  }
+  compiler = path.resolve(untildify(compiler));
+
+  const cmd: Executable = {
+    command: 'java',
+    args: ['-Xss10m', '-cp', `${compiler}:${workspaceFolder}/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar`, "de.dhbw.JavaTXLanguageServerLauncher"],
+  };
 
   const serverOptions: ServerOptions = {
-    run: {
+    run: cmd,
-      command: 'java',
+    debug: cmd
-      args: ['-Xss10m', '-jar', workspaceFolder + "/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar"],
-    },
-    debug: {
-      command: 'java',
-      args: [
-      '-Xss10m',
-      '-jar',
-      workspaceFolder + '/JavaTXLanguageServer-1.0-SNAPSHOT-jar-with-dependencies.jar',
-    ],
-    }
   };
 
   const clientOptions: LanguageClientOptions = {
@@ -42,7 +81,9 @@ function createClient(context: vscode.ExtensionContext): LanguageClient {
 }
 
 export async function activate(context: vscode.ExtensionContext) {
-  client = createClient(context);
+  const c = createClient(context);
+  if (!c) return;
+  client = c;
 
   client.start()
     .then(() => console.log("Language Client erfolgreich gestartet"))
@@ -50,12 +91,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
   console.log('Congratulations, your extension "tx" is now active!');
 
-  // Beispiel-Command aus deinem Code bleibt
-  const hello = vscode.commands.registerCommand('lspclient.helloWorld', () => {
-    vscode.window.showInformationMessage('Hello World from TX!');
-  });
-  context.subscriptions.push(hello);
-
   // *** NEU: Restart-Command ***
   const restart = vscode.commands.registerCommand('tx.restartLanguageServer', async () => {
     if (!client) {
@@ -68,7 +103,9 @@ export async function activate(context: vscode.ExtensionContext) {
     } catch (e) {
       console.error('Fehler beim Stoppen des Language Clients:', e);
     }
-    client = createClient(context); // komplett neu erzeugen
+    const c = createClient(context); // komplett neu erzeugen
+    if (!c) return;
+    client = c;
     try {
       await client.start();
       vscode.window.showInformationMessage('Java-TX Language Server neu gestartet.');

LanguageServer/pom.xml

@@ -14,61 +14,17 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.antlr/antlr4 -->
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4</artifactId>
-            <version>4.11.1</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.java-diff-utils</groupId>
-            <artifactId>java-diff-utils</artifactId>
-            <version>4.12</version>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.0</version>
+            <version>5.14.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.classgraph</groupId>
-            <artifactId>classgraph</artifactId>
-            <version>4.8.172</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.2.0-jre</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>9.5</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>
             <artifactId>org.eclipse.lsp4j</artifactId>
@@ -78,6 +34,7 @@
             <groupId>de.dhbwstuttgart</groupId>
             <artifactId>JavaTXcompiler</artifactId>
             <version>0.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <properties>

README.md

@@ -63,7 +63,8 @@ The Language Server in itself can be used for any Client. The Clients task is to
 If you make changes in the Compiler Interface, you have to change the jar and therefore the Dependency in the Java TX Language Server
 You can follow this steps:
 1. package the JavaTX Compiler
-2. take the Jar-File and copy it into the /lib Folder
+2. create a lib Folder at ./LangaugeServer -> ./LanguageServer/lib
+2. take the Jar-File and copy it into the /lib Folder at 
 3. execute this Maven command to add the Jar in your local Repository: ```mvn install:install-file   -Dfile=lib/JavaTXcompiler-0.1-jar-with-dependencies.jar   -DgroupId=de.dhbwstuttgart   -DartifactId=JavaTXcompiler   -Dversion=0.1   -Dpackaging=jar```
 4. run ```maven clean```, ```validate``` and ```install``` to load the new Dependency
 5. you can now package the Language Server or change the code accordingly.