summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2018-12-30 19:30:49 +0800
committer最萌小汐 <sumneko@hotmail.com>2018-12-30 19:30:49 +0800
commit6bb4eb555a8dae41da178f8fcec2e32b31848bda (patch)
tree49bd0561fc4c11f325b7a6e0c35973b5435a712a
parentdfbdcbd3f01602307f49f1af098899264d0162e7 (diff)
downloadlua-language-server-6bb4eb555a8dae41da178f8fcec2e32b31848bda.zip
改个名字
-rw-r--r--.gitignore3
-rw-r--r--client/out/extension.js6
-rw-r--r--client/src/extension.ts4
-rw-r--r--server/bin/lua-language-server.exe (renamed from server/bin/lua.exe)bin15872 -> 15872 bytes
-rw-r--r--server/compile.lua12
5 files changed, 17 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 5d7db3cb..d555d6e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
node_modules
-client/server
+/client/server
.vscode-test
/server/log
/publish
+!*.exe
diff --git a/client/out/extension.js b/client/out/extension.js
index e8bf742b..8210160e 100644
--- a/client/out/extension.js
+++ b/client/out/extension.js
@@ -14,7 +14,7 @@ function activate(context) {
// Otherwise the run options are used
let serverOptions = {
run: {
- command: context.asAbsolutePath(path.join('server', 'bin', 'lua.exe')),
+ command: context.asAbsolutePath(path.join('server', 'bin', 'lua-language-server.exe')),
args: [
'-E',
'-e',
@@ -26,7 +26,7 @@ function activate(context) {
}
},
debug: {
- command: context.asAbsolutePath(path.join('server', 'bin', 'lua.exe')),
+ command: context.asAbsolutePath(path.join('server', 'bin', 'lua-language-server.exe')),
args: [
'-E',
'-e',
@@ -60,4 +60,4 @@ function deactivate() {
return client.stop();
}
exports.deactivate = deactivate;
-//# sourceMappingURL=extension.js.map \ No newline at end of file
+//# sourceMappingURL=extension.js.map
diff --git a/client/src/extension.ts b/client/src/extension.ts
index e2c0b089..b46b5c2d 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -23,7 +23,7 @@ export function activate(context: ExtensionContext) {
let serverOptions: ServerOptions = {
run: {
command: context.asAbsolutePath(
- path.join('server', 'bin', 'lua.exe')
+ path.join('server', 'bin', 'lua-language-server.exe')
),
args: [
'-E',
@@ -41,7 +41,7 @@ export function activate(context: ExtensionContext) {
},
debug: {
command: context.asAbsolutePath(
- path.join('server', 'bin', 'lua.exe')
+ path.join('server', 'bin', 'lua-language-server.exe')
),
args: [
'-E',
diff --git a/server/bin/lua.exe b/server/bin/lua-language-server.exe
index 85bf7994..85bf7994 100644
--- a/server/bin/lua.exe
+++ b/server/bin/lua-language-server.exe
Binary files differ
diff --git a/server/compile.lua b/server/compile.lua
index 882ff232..0dc700af 100644
--- a/server/compile.lua
+++ b/server/compile.lua
@@ -17,8 +17,16 @@ end
local function copyFile()
local source = root / 'bee.lua' / 'bin' / 'msvc_x86_Release'
local target = root / 'bin'
- for _, name in ipairs {'bee.dll', 'lua.exe', 'lua54.dll'} do
- fs.copy_file(source / name, target / name, true)
+ for _, name in ipairs {
+ 'bee.dll',
+ {'lua.exe', 'lua-language-server.exe'},
+ 'lua54.dll',
+ } do
+ if type(name) == 'string' then
+ fs.copy_file(source / name, target / name, true)
+ else
+ fs.copy_file(source / name[1], target / name[2], true)
+ end
end
end