#39 不再依赖 CWD

3 files changed, 7 insertions, 23 deletions

diff --git a/client/out/extension.js b/client/out/extension.js
index 533791ba..af5c2bf9 100644
--- a/client/out/extension.js
+++ b/client/out/extension.js
@@ -20,10 +20,7 @@ function activate(context) {
                 '-e',
                 'LANG="' + language + '"',
                 context.asAbsolutePath(path.join('server', 'main.lua'))
-            ],
-            options: {
-                cwd: context.asAbsolutePath(path.join('server')),
-            }
+            ]
         },
         debug: {
             command: context.asAbsolutePath(path.join('server', 'bin', 'lua-language-server')),
@@ -32,10 +29,7 @@ function activate(context) {
                 '-e',
                 'LANG="' + language + '"',
                 context.asAbsolutePath(path.join('server', 'main.lua'))
-            ],
-            options: {
-                cwd: context.asAbsolutePath(path.join('server')),
-            }
+            ]
         }
     };
     // Options to control the language client
@@ -48,7 +42,7 @@ function activate(context) {
         }
     };
     // Create the language client and start the client.
-    client = new vscode_languageclient_1.LanguageClient('sumneko.lua-lsp', 'sumneko.lua-lsp', serverOptions, clientOptions);
+    client = new vscode_languageclient_1.LanguageClient('Lua Language Server', 'Lua Language Client', serverOptions, clientOptions);
     // Start the client. This will also launch the server
     client.start();
 }
@@ -60,4 +54,4 @@ function deactivate() {
     return client.stop();
 }
 exports.deactivate = deactivate;
-//# sourceMappingURL=extension.js.map
+//# sourceMappingURL=extension.js.map
\ No newline at end of file
diff --git a/client/out/extension.js.map b/client/out/extension.js.map
index e7492e81..44809556 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,SAAS,CAAC,CACrC;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;YACD,OAAO,EAAE;gBACR,GAAG,EAAE,OAAO,CAAC,cAAc,CAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CACnB;aACD;SACD;QACD,KAAK,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,cAAc,CAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,CACrC;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;YACD,OAAO,EAAE;gBACR,GAAG,EAAE,OAAO,CAAC,cAAc,CAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CACnB;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,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,CACb,CAAC;IAEF,qDAAqD;IACrD,MAAM,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAhED,4BAgEC;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,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
diff --git a/client/src/extension.ts b/client/src/extension.ts
index 61b14f18..c6aba572 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -32,12 +32,7 @@ export function activate(context: ExtensionContext) {
 				context.asAbsolutePath(
 					path.join('server', 'main.lua')
 				)
-			],
-			options: {
-				cwd: context.asAbsolutePath(
-					path.join('server')
-				),
-			}
+			]
 		},
 		debug: {
 			command: context.asAbsolutePath(
@@ -50,12 +45,7 @@ export function activate(context: ExtensionContext) {
 				context.asAbsolutePath(
 					path.join('server', 'main.lua')
 				)
-			],
-			options: {
-				cwd: context.asAbsolutePath(
-					path.join('server')
-				),
-			}
+			]
 		}
 	};