Skip to content

Commit d7a9ebf

Browse files
committed
support emmylua_ls
1 parent b7d7c73 commit d7a9ebf

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

src/debugger/base/EmmyDebugData.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as proto from "./EmmyDebugProto";
22
import { DebugProtocol } from "@vscode/debugprotocol";
33
import { Handles } from "@vscode/debugadapter";
4-
import iconv = require('iconv-lite');
4+
// import iconv = require('iconv-lite');
55

66
export interface IEmmyStackContext {
77
handles: Handles<IEmmyStackNode>;

src/extension.ts

+21-12
Original file line numberDiff line numberDiff line change
@@ -138,33 +138,42 @@ async function doStartServer() {
138138
command = path.join(
139139
context.extensionPath,
140140
'server',
141-
'EmmyLua.LanguageServer-win32-x64',
142-
'EmmyLua.LanguageServer.exe'
141+
'emmylua_ls-win32-x64',
142+
'emmylua_ls.exe'
143143
)
144144
break;
145145
case "linux":
146-
command = path.join(
147-
context.extensionPath,
148-
'server',
149-
'EmmyLua.LanguageServer-linux-x64',
150-
'EmmyLua.LanguageServer'
151-
)
146+
if (os.arch() === "arm64") {
147+
command = path.join(
148+
context.extensionPath,
149+
'server',
150+
'emmylua_ls-linux-arm64',
151+
'emmylua_ls'
152+
);
153+
} else {
154+
command = path.join(
155+
context.extensionPath,
156+
'server',
157+
'emmylua_ls-linux-x64',
158+
'emmylua_ls'
159+
);
160+
}
152161
fs.chmodSync(command, '777');
153162
break;
154163
case "darwin":
155164
if (os.arch() === "arm64") {
156165
command = path.join(
157166
context.extensionPath,
158167
'server',
159-
'EmmyLua.LanguageServer-darwin-arm64',
160-
'EmmyLua.LanguageServer'
168+
'emmylua_ls-darwin-arm64',
169+
'emmylua_ls'
161170
);
162171
} else {
163172
command = path.join(
164173
context.extensionPath,
165174
'server',
166-
'EmmyLua.LanguageServer-darwin-x64',
167-
'EmmyLua.LanguageServer'
175+
'emmylua_ls-darwin-x64',
176+
'emmylua_ls'
168177
);
169178
}
170179
fs.chmodSync(command, '777');

0 commit comments

Comments
 (0)