Merge branch 'master' of github.com:EmmyLua/VSCode-EmmyLua

Author: CppCXY

package.json

@@ -300,6 +300,11 @@
                     "default": "",
                     "description": "%config.misc.executablePath%"
                 },
+                "emmylua.misc.globalConfigPath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "%config.misc.globalConfigPath%"
+                },
                 "lua.trace.server": {
                     "type": "string",
                     "enum": [

package.nls.json

@@ -16,5 +16,6 @@
     "debug.launch.newWindow": "create new windows",
     "config.autoInsertTripleDash.description": "Automatically insert \"---\" when line breaking after a comment",
     "config.misc.executablePath": "Specify the executable file path in VSCode",
-    "config.develop.port": "Specify the port for the debugger to listen on"
+    "config.develop.port": "Specify the port for the debugger to listen on",
+    "config.misc.globalConfigPath": "Specify a path to the global configuration file"
 }

package.nls.zh-cn.json

@@ -15,5 +15,7 @@
     "debug.launch.newWindow": "emmylua会创建一个新窗口展示这个进程",
     "config.autoInsertTripleDash.description": "在注解后换行时自动插入 \"---\"",
     "config.misc.executablePath": "VSCode中指定可执行文件路径",
-    "config.develop.port": "指定开发监听的端口"
-}
+    "config.develop.port": "指定开发监听的端口",
+    "config.misc.globalConfigPath": "指定全局配置文件的路径"
+}
+

src/extension.ts

@@ -148,13 +148,22 @@ async function doStartServer() {
 
         serverOptions = {
             command: configExecutablePath,
-            args: []
+            args: [],
+            options: { env: {} }
         };
 
         let parameters = config.get<string[]>("emmylua.ls.startParameters");
         if (parameters && parameters.length > 0) {
             serverOptions.args = parameters;
         }
+
+        let globalConfigPath = config.get<string>("emmylua.misc.globalConfigPath")?.trim();
+        if (globalConfigPath && globalConfigPath.length > 0) {
+            if (!serverOptions.options || !serverOptions.options.env) {
+                serverOptions.options = { env: {} }
+            }
+            serverOptions.options.env['EMMYLUALS_CONFIG'] = globalConfigPath;
+        }
     }
 
     ctx.client = new LanguageClient(ctx.LANGUAGE_ID, "EmmyLua plugin for vscode.", serverOptions, clientOptions);