服务加载位置

3 files changed, 19 insertions, 46 deletions

diff --git a/client/out/extension.js b/client/out/extension.js
index af5c2bf9..6fe820d8 100644
--- a/client/out/extension.js
+++ b/client/out/extension.js
@@ -13,24 +13,13 @@ function activate(context) {
     // If the extension is launched in debug mode then the debug server options are used
     // Otherwise the run options are used
     let serverOptions = {
-        run: {
-            command: context.asAbsolutePath(path.join('server', 'bin', 'lua-language-server')),
-            args: [
-                '-E',
-                '-e',
-                'LANG="' + language + '"',
-                context.asAbsolutePath(path.join('server', 'main.lua'))
-            ]
-        },
-        debug: {
-            command: context.asAbsolutePath(path.join('server', 'bin', 'lua-language-server')),
-            args: [
-                '-E',
-                '-e',
-                'LANG="' + language + '"',
-                context.asAbsolutePath(path.join('server', 'main.lua'))
-            ]
-        }
+        command: context.asAbsolutePath(path.join('server', 'Windows', 'bin', 'lua-language-server')),
+        args: [
+            '-E',
+            '-e',
+            'LANG="' + language + '"',
+            context.asAbsolutePath(path.join('server', 'main.lua'))
+        ]
     };
     // Options to control the language client
     let clientOptions = {
diff --git a/client/out/extension.js.map b/client/out/extension.js.map
index 44809556..241f960e 100644
--- a/client/out/extension.js.map
+++ b/client/out/extension.js.map
@@ -1 +1 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,6BAA6B;AAC7B,mCAA0D;AAE1D,iEAK+B;AAE/B,IAAI,MAAsB,CAAC;AAE3B,SAAgB,QAAQ,CAAC,OAAyB;IACjD,IAAI,QAAQ,GAAG,YAAG,CAAC,QAAQ,CAAC;IAE5B,oFAAoF;IACpF,qCAAqC;IACrC,IAAI,aAAa,GAAkB;QAClC,GAAG,EAAE;YACJ,OAAO,EAAE,OAAO,CAAC,cAAc,CAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,qBAAqB,CAAC,CACjD;YACD,IAAI,EAAE;gBACL,IAAI;gBACJ,IAAI;gBACJ,QAAQ,GAAG,QAAQ,GAAG,GAAG;gBACzB,OAAO,CAAC,cAAc,CACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC/B;aACD;SACD;QACD,KAAK,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,cAAc,CAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,qBAAqB,CAAC,CACjD;YACD,IAAI,EAAE;gBACL,IAAI;gBACJ,IAAI;gBACJ,QAAQ,GAAG,QAAQ,GAAG,GAAG;gBACzB,OAAO,CAAC,cAAc,CACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC/B;aACD;SACD;KACD,CAAC;IAEF,yCAAyC;IACzC,IAAI,aAAa,GAA0B;QAC1C,+CAA+C;QAC/C,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,WAAW,EAAE;YACZ,sFAAsF;YACtF,UAAU,EAAE,kBAAS,CAAC,uBAAuB,CAAC,cAAc,CAAC;SAC7D;KACD,CAAC;IAEF,mDAAmD;IACnD,MAAM,GAAG,IAAI,sCAAc,CAC1B,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,aAAa,CACb,CAAC;IAEF,qDAAqD;IACrD,MAAM,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAtDD,4BAsDC;AAED,SAAgB,UAAU;IACzB,IAAI,CAAC,MAAM,EAAE;QACZ,OAAO,SAAS,CAAC;KACjB;IACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AALD,gCAKC"}
\ No newline at end of file
+{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAEhG,6BAA6B;AAC7B,mCAA0D;AAE1D,iEAI+B;AAE/B,IAAI,MAAsB,CAAC;AAE3B,SAAgB,QAAQ,CAAC,OAAyB;IACjD,IAAI,QAAQ,GAAG,YAAG,CAAC,QAAQ,CAAC;IAE5B,oFAAoF;IACpF,qCAAqC;IACrC,IAAI,aAAa,GAAkB;QAClC,OAAO,EAAE,OAAO,CAAC,cAAc,CAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAC5D;QACD,IAAI,EAAE;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ,GAAG,QAAQ,GAAG,GAAG;YACzB,OAAO,CAAC,cAAc,CACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAC/B;SACD;KACD,CAAC;IAEF,yCAAyC;IACzC,IAAI,aAAa,GAA0B;QAC1C,+CAA+C;QAC/C,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,WAAW,EAAE;YACZ,sFAAsF;YACtF,UAAU,EAAE,kBAAS,CAAC,uBAAuB,CAAC,cAAc,CAAC;SAC7D;KACD,CAAC;IAEF,mDAAmD;IACnD,MAAM,GAAG,IAAI,sCAAc,CAC1B,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,aAAa,CACb,CAAC;IAEF,qDAAqD;IACrD,MAAM,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAvCD,4BAuCC;AAED,SAAgB,UAAU;IACzB,IAAI,CAAC,MAAM,EAAE;QACZ,OAAO,SAAS,CAAC;KACjB;IACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACtB,CAAC;AALD,gCAKC"}
\ No newline at end of file
diff --git a/client/src/extension.ts b/client/src/extension.ts
index c6aba572..db9cbdda 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -10,7 +10,6 @@ import {
 	LanguageClient,
 	LanguageClientOptions,
 	ServerOptions,
-	TransportKind
 } from 'vscode-languageclient';
 
 let client: LanguageClient;
@@ -21,32 +20,17 @@ export function activate(context: ExtensionContext) {
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used
 	let serverOptions: ServerOptions = {
-		run: {
-			command: context.asAbsolutePath(
-				path.join('server', 'bin', 'lua-language-server')
-			),
-			args: [
-				'-E',
-				'-e',
-				'LANG="' + language + '"',
-				context.asAbsolutePath(
-					path.join('server', 'main.lua')
-				)
-			]
-		},
-		debug: {
-			command: context.asAbsolutePath(
-				path.join('server', 'bin', 'lua-language-server')
-			),
-			args: [
-				'-E',
-				'-e',
-				'LANG="' + language + '"',
-				context.asAbsolutePath(
-					path.join('server', 'main.lua')
-				)
-			]
-		}
+		command: context.asAbsolutePath(
+			path.join('server', 'Windows', 'bin', 'lua-language-server')
+		),
+		args: [
+			'-E',
+			'-e',
+			'LANG="' + language + '"',
+			context.asAbsolutePath(
+				path.join('server', 'main.lua')
+			)
+		]
 	};
 
 	// Options to control the language client