Add escriptPath configuration option (#163)

erlang-ls · Sep 18, 2024 · 040c81b · 040c81b
1 parent 34ac95f
commit 040c81b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/client/src/client.ts b/client/src/client.ts
@@ -101,13 +101,18 @@ export async function get_client(context: ExtensionContext): Promise<LanguageCli
         serverArgs.push("--log-dir", logPath);
     }
 
+    let escriptPath = workspace.getConfiguration('erlang_ls').escriptPath;
+    if (escriptPath === "") {
+        escriptPath = 'escript';
+    }
+
     let serverOptions: ServerOptions = {
-        command: 'escript',
+        command: escriptPath,
         args: serverArgs,
         transport: TransportKind.stdio
     };
 
-    verifyExecutable(serverPath);
+    verifyExecutable(serverPath, escriptPath);
 
     return new LanguageClient(
         'erlang_ls',
@@ -117,8 +122,8 @@ export async function get_client(context: ExtensionContext): Promise<LanguageCli
     );
 }
 
-export function verifyExecutable(serverPath: string) {
-    const res = spawnSync('escript', [serverPath, "--version"]);
+export function verifyExecutable(serverPath: string, escriptPath: string) {
+    const res = spawnSync(escriptPath, [serverPath, "--version"]);
     if (res.status !== 0) {
         window.showErrorMessage('Could not start Language Server. Error: ' + res.stdout);
     }

diff --git a/client/src/debugger.ts b/client/src/debugger.ts
@@ -26,7 +26,7 @@ class ErlangDebugAdapterExecutableFactory implements vscode.DebugAdapterDescript
         const erlangConfig = vscode.workspace;
         const executable = erlangConfig.getConfiguration('erlang_ls').get<string>('dapPath') || '';
 
-        let command = 'escript';
+        const command = erlangConfig.getConfiguration('erlang_ls').get<string>('escriptPath') || 'escript';
         let args;
 
         if (executable.length > 0) {

diff --git a/package.json b/package.json
@@ -64,6 +64,12 @@
           "default": "",
           "description": "Override the default path of the els_dap executable with a custom one."
         },
+        "erlang_ls.escriptPath": {
+          "scope": "window",
+          "type": "string",
+          "default": "",
+          "description": "Override the default path of the escript executable with a custom one."
+        },
         "erlang_ls.logPath": {
           "scope": "window",
           "type": "string",