0.9.11

Author: CppCXY

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 [中文Log](CHANGELOG_CN.md)
 
+# 0.9.11
+
+`FIX` Fix mac path issue
+
 # 0.9.10
 
 `FIX` Fix generic table infer issue

CHANGELOG_CN.md

@@ -1,5 +1,9 @@
 # Change Log
 
+# 0.9.11
+
+`FIX` 修复mac路径问题
+
 # 0.9.10
 
 `FIX` 修复泛型表推断问题

build/config.js

@@ -1,6 +1,6 @@
 exports.default = {
     emmyDebuggerVersion: '1.8.2',
     emmyDebuggerUrl: 'https://github.com/EmmyLua/EmmyLuaDebugger/releases/download',
-    newLanguageServerVersion: "0.4.5",
+    newLanguageServerVersion: "0.4.6",
     newLanguageServerUrl: "https://github.com/CppCXY/emmylua-analyzer-rust/releases/download"
 }

build/prepare.js

@@ -43,10 +43,9 @@ async function build() {
 
     // new ls
     if (args[2].endsWith('.tar.gz')) {
-        let name = args[2].substring(0, args[2].length - 7);
-        await decompress(`temp/${args[2]}`, `server/${name}/`, { plugins: [decompressTargz()] });
-    } else {
-        await decompress(`temp/${args[2]}`, 'server/');
+        await decompress(`temp/${args[2]}`, `server/`, { plugins: [decompressTargz()] });
+    } else if (args[2].endsWith('.zip')) {
+        await decompress(`temp/${args[2]}`, `server/`);
     }
 }
 

package.json

@@ -2,7 +2,7 @@
     "name": "emmylua",
     "displayName": "EmmyLua",
     "description": "EmmyLua for vscode",
-    "version": "0.9.10",
+    "version": "0.9.11",
     "icon": "res/icon.png",
     "publisher": "tangzx",
     "engines": {

src/extension.ts

@@ -105,22 +105,6 @@ async function startServer() {
     });
 }
 
-const serverPaths: { [key: string]: { [key: string]: string } } = {
-    win32: {
-        arm64: 'emmylua_ls-win32-arm64',
-        x64: 'emmylua_ls-win32-x64',
-        ia32: 'emmylua_ls-win32-ia32'
-    },
-    linux: {
-        arm64: 'emmylua_ls-linux-aarch64-glibc.2.17',
-        x64: 'emmylua_ls-linux-x64-glibc.2.17'
-    },
-    darwin: {
-        arm64: 'emmylua_ls-darwin-arm64',
-        x64: 'emmylua_ls-darwin-x64'
-    }
-};
-
 async function doStartServer() {
     const context = ctx.extensionContext;
     const clientOptions: LanguageClientOptions = {
@@ -148,16 +132,8 @@ async function doStartServer() {
         };
     } else {
         let platform = os.platform();
-        let arch = os.arch();
         let executableName = platform === 'win32' ? 'emmylua_ls.exe' : 'emmylua_ls';
-
-        const serverDir = serverPaths[platform]?.[arch];
-        if (!serverDir) {
-            vscode.window.showErrorMessage(`Unsupported platform: ${platform} ${arch}`);
-            return;
-        }
-
-        const exe = path.join(context.extensionPath, 'server', serverDir, executableName);
+        const exe = path.join(context.extensionPath, 'server', executableName);
 
         if (platform !== 'win32') {
             fs.chmodSync(exe, '777');