Skip to content

Commit 6b40c06

Browse files
committed
0.9.1
1 parent 45b6276 commit 6b40c06

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
[中文Log](CHANGELOG_CN.md)
44

5+
# 0.9.1
6+
7+
`FIX` Fixed a crash issue
8+
9+
`CHG` Refactored the logic related to excluding files
10+
511
# 0.9.0
612

713
`CHG` use `emmylua-analyzer-rust` as the language server

CHANGELOG_CN.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
# 0.9.1
4+
5+
`FIX` 修复一个崩溃问题
6+
7+
`CHG` 重构了排除文件相关的逻辑
8+
39
# 0.9.0
410

511
`CHG` 使用rust重写

build/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
exports.default = {
22
emmyDebuggerVersion: '1.8.2',
33
emmyDebuggerUrl: 'https://github.com/EmmyLua/EmmyLuaDebugger/releases/download',
4-
newLanguageServerVersion: "0.2.4",
4+
newLanguageServerVersion: "0.2.5",
55
newLanguageServerUrl: "https://github.com/CppCXY/emmylua-analyzer-rust/releases/download"
66
}

package.json

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "emmylua",
33
"displayName": "EmmyLua",
44
"description": "EmmyLua for vscode",
5-
"version": "0.9.0",
5+
"version": "0.9.1",
66
"icon": "res/icon.png",
77
"publisher": "tangzx",
88
"engines": {
@@ -275,6 +275,11 @@
275275
"emmylua.colors.local": {
276276
"type": "string",
277277
"default": ""
278+
},
279+
"emmylua.ls.start_parameters": {
280+
"type": "array",
281+
"default": [
282+
]
278283
}
279284
}
280285
},
@@ -288,24 +293,12 @@
288293
}
289294
},
290295
"jsonValidation": [
291-
{
292-
"fileMatch": "emmy.config.json",
293-
"url": "./syntaxes/emmy.config.schema.json"
294-
},
295296
{
296297
"fileMatch": ".emmyrc.json",
297298
"url": "./syntaxes/schema.json"
298299
}
299300
],
300-
"colors": [],
301-
"views": {
302-
"explorer": [
303-
{
304-
"id": "emmylua.syntax.tree",
305-
"name": "Syntax Tree"
306-
}
307-
]
308-
}
301+
"colors": []
309302
},
310303
"scripts": {
311304
"vscode:prepublish": "npm run compile",

src/extension.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,20 @@ async function doStartServer() {
157157
return;
158158
}
159159

160-
const command = path.join(context.extensionPath, 'server', serverDir, executableName);
160+
const exe = path.join(context.extensionPath, 'server', serverDir, executableName);
161161

162162
if (platform !== 'win32') {
163-
fs.chmodSync(command, '777');
163+
fs.chmodSync(exe, '777');
164164
}
165165
serverOptions = {
166-
command: command,
166+
command: exe,
167167
args: []
168168
};
169+
170+
let parameters = vscode.workspace.getConfiguration("emmylua").get<string[]>("ls.start_parameters");
171+
if (parameters && parameters.length > 0) {
172+
serverOptions.args = parameters;
173+
}
169174
}
170175

171176
ctx.client = new LanguageClient(ctx.LANGUAGE_ID, "EmmyLua plugin for vscode.", serverOptions, clientOptions);

0 commit comments

Comments
 (0)