Merge pull request #204 from xuhuanzy/dev

添加"自定义运行路径"配置与整理选项

Author: CppCXY

package.json

@@ -276,14 +276,19 @@
                     "type": "string",
                     "default": ""
                 },
-                "emmylua.ls.start_parameters": {
+                "emmylua.ls.startParameters": {
                     "type": "array",
                     "default": []
                 },
-                "emmylua.autoInsertTripleDash": {
+                "emmylua.misc.autoInsertTripleDash": {
                     "type": "boolean",
                     "default": true,
                     "description": "%config.autoInsertTripleDash.description%"
+                },
+                "emmylua.misc.executablePath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "%config.misc.executablePath%"
                 }
             }
         },

package.nls.json

@@ -14,5 +14,6 @@
     "debug.launch.arguments": "arguments pass to executable file",
     "debug.launch.blockOnExit": "block process when exit",
     "debug.launch.newWindow": "create new windows",
-    "config.autoInsertTripleDash.description": "Automatically insert \"---\" when line breaking after a comment"
+    "config.autoInsertTripleDash.description": "Automatically insert \"---\" when line breaking after a comment",
+    "config.misc.executablePath": "Specify the executable file path in VSCode"
 }

package.nls.zh-cn.json

@@ -14,5 +14,6 @@
     "debug.launch.arguments": "传递给可执行文件的参数",
     "debug.launch.blockOnExit": "进程结束时是否阻塞进程保持窗口开启",
     "debug.launch.newWindow": "emmylua会创建一个新窗口展示这个进程",
-    "config.autoInsertTripleDash.description": "在注解后换行时自动插入 \"---\""
+    "config.autoInsertTripleDash.description": "在注解后换行时自动插入 \"---\"",
+    "config.misc.executablePath": "VSCode中指定可执行文件路径"
 }

src/extension.ts

@@ -131,19 +131,27 @@ async function doStartServer() {
             return Promise.resolve(result);
         };
     } else {
-        let platform = os.platform();
-        let executableName = platform === 'win32' ? 'emmylua_ls.exe' : 'emmylua_ls';
-        const exe = path.join(context.extensionPath, 'server', executableName);
-
-        if (platform !== 'win32') {
-            fs.chmodSync(exe, '777');
+        const config = vscode.workspace.getConfiguration(
+            undefined,
+            vscode.workspace.workspaceFolders?.[0]
+        );
+        let configExecutablePath = config.get<string>("emmylua.misc.executablePath")?.trim();
+        if (!configExecutablePath || configExecutablePath.length == 0) {
+            let platform = os.platform();
+            let executableName = platform === 'win32' ? 'emmylua_ls.exe' : 'emmylua_ls';
+            configExecutablePath = path.join(context.extensionPath, 'server', executableName);
+
+            if (platform !== 'win32') {
+                fs.chmodSync(configExecutablePath, '777');
+            }
         }
+
         serverOptions = {
-            command: exe,
+            command: configExecutablePath,
             args: []
         };
 
-        let parameters = vscode.workspace.getConfiguration("emmylua").get<string[]>("ls.start_parameters");
+        let parameters = config.get<string[]>("emmylua.ls.startParameters");
         if (parameters && parameters.length > 0) {
             serverOptions.args = parameters;
         }

src/languageConfiguration.ts

@@ -32,8 +32,11 @@ export class LuaLanguageConfiguration implements LanguageConfiguration {
         ];
 
         // 读取配置决定是否添加三横线规则
-        const config = workspace.getConfiguration('emmylua');
-        const autoInsertTripleDash = config.get<boolean>('autoInsertTripleDash', true);
+        const config = workspace.getConfiguration(
+            undefined,
+            workspace.workspaceFolders?.[0]
+        );
+        const autoInsertTripleDash = config.get<boolean>('emmylua.misc.autoInsertTripleDash', true);
         // 第二个参数是默认值（当配置不存在时使用）
         if (autoInsertTripleDash) {
             this.onEnterRules = [