0.3.2

Author: ailisp

README.md

@@ -35,6 +35,9 @@ Common Lisp Editing Extension for vscode
 
 Users appreciate release notes as you update your extension.
 
+### 0.3.2
+- Fix path issue that requires cl-lsp in path, was not fixed properly in 0.3.1
+
 ### 0.3.1
 - Use absolute path as default cl-lsp path
 

package-lock.json

@@ -2,7 +2,7 @@
     "name": "commonlisp-vscode",
     "displayName": "Common Lisp",
     "description": "Common Lisp Editing Extension for vscode",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "publisher": "ailisp",
     "icon": "Lisplogo.png",
     "repository": {
@@ -122,7 +122,8 @@
         "vscode-test": "^1.3.0"
     },
     "dependencies": {
+        "expand-home-dir": "0.0.3",
         "portfinder": "^1.0.26",
         "vscode-languageclient": "^6.1.3"
     }
-}
+}

package.json

@@ -3,6 +3,7 @@ import * as child_process from 'child_process';
 import * as net from 'net';
 import * as portfinder from 'portfinder';
 import * as util from 'util';
+
 import {
     workspace, Disposable, ExtensionContext, languages,
     window, commands, InputBoxOptions
@@ -12,20 +13,29 @@ import {
     TransportKind, TextDocumentIdentifier, TextDocumentPositionParams,
     StreamInfo
 } from 'vscode-languageclient';
+import { homedir } from 'os';
 
 let languageClient: LanguageClient;
 
 let repl: vscode.Terminal | null = null;
 
 let lspPort: number | null = null;
 
+function expandHomeDir(path: string): string {
+    if (path.startsWith('~/')) {
+        return homedir()+path.slice(1);
+    }
+    return path;
+}
+
 async function startLSP() {
     lspPort = await portfinder.getPortPromise({
         port: 10003
     });
+    let lsppath = expandHomeDir(workspace.getConfiguration().get<string>('commonlisp.lsppath')!);
     return vscode.window.createTerminal({
         name: "Common Lisp REPL",
-        shellPath: "cl-lsp",
+        shellPath: lsppath,
         shellArgs: ["tcp", lspPort.toString()],
         hideFromUser: true,
     });
@@ -122,7 +132,6 @@ function backoff<T>(retries: number, fn: () => Promise<T>, delay = 500): Promise
 export async function activate(context: ExtensionContext) {
     let serverOptions: ServerOptions;
     serverOptions = async () => {
-        let lsppath = workspace.getConfiguration().get<string>('commonlisp.lsppath')!;
         let client = new net.Socket();
         repl = await startLSP();
         return await backoff(5, () => {