Resolve path

out/extension.js

@@ -39,6 +39,7 @@ const vscode = __importStar(require("vscode"));
 const cp = __importStar(require("child_process"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 const codelensProvider_1 = require("./codelensProvider");
 function getConfig(key, def) { const v = vscode.workspace.getConfiguration().get(key); return v === undefined ? def : v; }
 function getWorkspaceFolderUri(docUri) { return docUri ? vscode.workspace.getWorkspaceFolder(docUri)?.uri : vscode.workspace.workspaceFolders?.[0]?.uri; }
@@ -46,10 +47,38 @@ function readPackageName(text) { return text.match(/^\s*package\s+([\w\.]+)\s*;/
 function fqcnFromDocument(doc) { const pkg = readPackageName(doc.getText()); const simple = path.basename(doc.fileName).replace(/\.java$/i, ""); return pkg ? `${pkg}.${simple}` : simple; }
 function execInTerminal(cmd, cwd, name = "Java Class Runner") { const t = vscode.window.terminals.find(tt => tt.name === name) || vscode.window.createTerminal({ name }); t.show(true); if (cwd)
     t.sendText(`cd "${cwd}"`); t.sendText(cmd); }
-function ensureDir(dir) { if (!fs.existsSync(dir))
-    fs.mkdirSync(dir, { recursive: true }); }
-async function compileJava(javaFile, outDir, classpath, ctxpath) {
-    ensureDir(outDir);
+let homeDirectory;
+let currentUser;
+function untildify(pathWithTilde) {
+    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;
+}
+async function ensureDir(p) {
+    await fs.promises.mkdir(p, { recursive: true });
+}
+async function compileJava(javaFile, outDir, classpath, ctxpath, wd) {
+    await ensureDir(outDir);
     if (javaFile.includes(".java")) {
         return new Promise((resolve, reject) => {
             const args = [javaFile, "-cp", classpath, "-d", outDir];
@@ -59,12 +88,29 @@ async function compileJava(javaFile, outDir, classpath, ctxpath) {
             proc.on("close", code => code === 0 ? resolve() : reject(new Error(`javac exit code ${code}\n${stderr}`)));
         });
     }
+    vscode.window.showInformationMessage("Compiling with Java-TX");
     return new Promise((resolve, reject) => {
-        const args = ["-jar", ctxpath + "/JavaTXcompiler-0.1-jar-with-dependencies.jar", javaFile, "-cp", classpath, "-d", outDir];
-        const proc = cp.spawn("java", args, { shell: process.platform === "win32" });
-        let stderr = "";
-        proc.stderr.on("data", d => stderr += d.toString());
-        proc.on("close", code => code === 0 ? resolve() : reject(new Error(`javac exit code ${code}\n${stderr}`)));
+        const config = vscode.workspace.getConfiguration("tx");
+        let compiler = config.get("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 args = [
+            "-jar", compiler, javaFile,
+            "-cp", classpath,
+            "-d", outDir,
+        ];
+        console.log("spawn args:", args.map(a => JSON.stringify(a)).join(" "));
+        const proc = cp.spawn("java", args, {
+            cwd: wd,
+            env: { ...process.env },
+            shell: false,
+        });
+        proc.stdout.on("data", d => console.log(`[java stdout] ${d}`));
+        proc.stderr.on("data", d => console.error(`[java stderr] ${d}`));
+        proc.on("close", code => code === 0 ? resolve() : reject(new Error(`javac exit code ${code}}`)));
     });
 }
 function activate(ctx) {
@@ -99,7 +145,7 @@ function activate(ctx) {
             return;
         }
         try {
-            await compileJava(ed.document.fileName, outDir, `"${cpFolders.join(";")}"`, ctx.extensionPath);
+            await compileJava(ed.document.fileName, outDir, cpFolders.join(path.delimiter), ctx.extensionPath, wd);
         }
         catch (err) {
             vscode.window.showErrorMessage(`Kompilierung fehlgeschlagen: ${err?.message || String(err)}`);
@@ -127,7 +173,8 @@ function activate(ctx) {
             vscode.window.showErrorMessage("Keine .class-Datei im Ausgabeverzeichnis gefunden.");
             return;
         }
-        const cmd = `java -cp "${cpFolders.join(";")}" ${mainClass}`.trim();
+        const cmd = `java -cp "${cpFolders.join(path.delimiter)}" ${mainClass}`.trim();
+        vscode.window.showInformationMessage(cmd);
         execInTerminal(cmd, wd);
     }));
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
-  "name": "java-class-runner",
-  "version": "1.0.2",
+  "name": "java-tx-main-runner",
+  "version": "0.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "java-class-runner",
-      "version": "1.0.2",
+      "name": "java-tx-main-runner",
+      "version": "0.0.5",
       "devDependencies": {
         "@types/node": "^20.11.0",
         "@types/vscode": "^1.85.0",

package.json

@@ -3,7 +3,7 @@
   "name": "java-tx-main-runner",
   "displayName": "Java-TX Main Runner",
   "description": "Führt Java und Java-TX Main-Methoden aus und nutzt den /out Ordner als Classpath. Fügt einen 'Run' CodeLens über main(...) hinzu.",
-  "version": "0.0.2",
+  "version": "0.0.6",
   "engines": {
     "vscode": "^1.85.0"
   },
@@ -95,4 +95,4 @@
     "typescript": "^5.3.3",
     "vsce": "^2.15.0"
   }
-}
+}

src/extension.ts

@@ -3,6 +3,7 @@ import * as vscode from "vscode";
 import * as cp from "child_process";
 import * as fs from "fs";
 import * as path from "path";
+import * as os from "os";
 import { JavaMainCodeLensProvider } from "./codelensProvider";
 
 function getConfig<T>(key: string, def: T): T { const v = vscode.workspace.getConfiguration().get<T>(key); return v===undefined?def:v; }
@@ -10,10 +11,46 @@ function getWorkspaceFolderUri(docUri?: vscode.Uri): vscode.Uri | undefined { re
 function readPackageName(text: string): string | undefined { return text.match(/^\s*package\s+([\w\.]+)\s*;/m)?.[1]; }
 function fqcnFromDocument(doc: vscode.TextDocument): string | undefined { const pkg = readPackageName(doc.getText()); const simple = path.basename(doc.fileName).replace(/\.java$/i,""); return pkg ? `${pkg}.${simple}` : simple; }
 function execInTerminal(cmd: string, cwd?: string, name="Java Class Runner") { const t = vscode.window.terminals.find(tt=>tt.name===name) || vscode.window.createTerminal({name}); t.show(true); if (cwd) t.sendText(`cd "${cwd}"`); t.sendText(cmd); }
-function ensureDir(dir: string) { if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true }); }
 
-async function compileJava(javaFile: string, outDir: string, classpath: string, ctxpath : string): Promise<void> {
-  ensureDir(outDir);
+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;
+}
+
+async function ensureDir(p: string) {
+  await fs.promises.mkdir(p, { recursive: true });
+}
+
+async function compileJava(javaFile: string, outDir: string, classpath: string, ctxpath : string, wd: string): Promise<void> {
+  await ensureDir(outDir);
   if(javaFile.includes(".java")){
     return new Promise((resolve, reject) => {
       const args = [javaFile, "-cp", classpath, "-d", outDir];
@@ -23,11 +60,35 @@ async function compileJava(javaFile: string, outDir: string, classpath: string,
     });
   }
   
+  vscode.window.showInformationMessage("Compiling with Java-TX")
   return new Promise((resolve, reject) => {
-    const args = ["-jar", ctxpath + "/JavaTXcompiler-0.1-jar-with-dependencies.jar", javaFile, "-cp", classpath, "-d", outDir];
-    const proc = cp.spawn("java", args, { shell: process.platform==="win32" });
-    let stderr=""; proc.stderr.on("data", d=>stderr+=d.toString());
-    proc.on("close", code=> code===0 ? resolve() : reject(new Error(`javac exit code ${code}\n${stderr}`)));
+
+    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 args = [
+      "-jar", compiler, javaFile,
+      "-cp", classpath,
+      "-d", outDir,
+    ];
+
+    console.log("spawn args:", args.map(a => JSON.stringify(a)).join(" "));
+
+    const proc = cp.spawn("java", args, {
+    cwd: wd,
+    env: { ...process.env },
+    shell: false,
+    });
+
+    proc.stdout.on("data", d => console.log(`[java stdout] ${d}`));
+    proc.stderr.on("data", d => console.error(`[java stderr] ${d}`));
+    proc.on("close", code=> code===0 ? resolve() : reject(new Error(`javac exit code ${code}}`)));
+
   });
 
 }
@@ -70,7 +131,7 @@ export function activate(ctx: vscode.ExtensionContext) {
     if (!fqcn) { vscode.window.showErrorMessage("Konnte FQCN nicht bestimmen."); return; }
 
     try { 
-      await compileJava(ed.document.fileName, outDir, `"${cpFolders.join(";")}"`, ctx.extensionPath); }
+      await compileJava(ed.document.fileName, outDir, cpFolders.join(path.delimiter), ctx.extensionPath, wd); }
 
     catch (err:any) { 
       vscode.window.showErrorMessage(`Kompilierung fehlgeschlagen: ${err?.message || String(err)}`); 
@@ -96,7 +157,8 @@ export function activate(ctx: vscode.ExtensionContext) {
       vscode.window.showErrorMessage("Keine .class-Datei im Ausgabeverzeichnis gefunden.");
       return;
     }
-    const cmd = `java -cp "${cpFolders.join(";")}" ${mainClass}`.trim();
+    const cmd = `java -cp "${cpFolders.join(path.delimiter)}" ${mainClass}`.trim();
+    vscode.window.showInformationMessage(cmd)
     execInTerminal(cmd, wd);
   }));
 }