Skip to content

Commit 184733c

Browse files
committed
Add emmylua.language.completeAnnotation to config renames spec
1 parent 7f415b3 commit 184733c

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,12 @@
994994
"type": "boolean",
995995
"default": true,
996996
"markdownDescription": "%config.emmylua.language.completeAnnotation.description%"
997+
},
998+
"emmylua.misc.autoInsertTripleDash": {
999+
"type": "boolean",
1000+
"default": true,
1001+
"markdownDescription": "%config.emmylua.language.completeAnnotation.description%",
1002+
"deprecationMessage": "Use `emmylua.language.completeAnnotation` instead"
9971003
}
9981004
}
9991005
},
@@ -1217,4 +1223,4 @@
12171223
"vscode-languageclient": "9.0.1",
12181224
"concat-map": "0.0.2"
12191225
}
1220-
}
1226+
}

src/configRenames.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const RENAMES: Record<string, string> = {
44
"emmylua.colors.mutableUnderline": "emmylua.colors.mutable_underline",
55
"emmylua.ls.executablePath": "emmylua.misc.executablePath",
66
"emmylua.ls.globalConfigPath": "emmylua.misc.globalConfigPath",
7+
"emmylua.language.completeAnnotation": "emmylua.misc.autoInsertTripleDash",
78
};
89

910
export function get<T>(

src/languageConfiguration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { LanguageConfiguration, IndentAction, IndentationRule } from "vscode";
22
import { workspace } from "vscode";
3+
import { get } from "./configRenames";
34
export class LuaLanguageConfiguration implements LanguageConfiguration {
45
public onEnterRules: any[];
56

@@ -36,7 +37,7 @@ export class LuaLanguageConfiguration implements LanguageConfiguration {
3637
undefined,
3738
workspace.workspaceFolders?.[0]
3839
);
39-
const completeAnnotation = config.get<boolean>('emmylua.language.completeAnnotation', true);
40+
const completeAnnotation = get<boolean>(config, 'emmylua.language.completeAnnotation') ?? true;
4041
// 第二个参数是默认值(当配置不存在时使用)
4142
if (completeAnnotation) {
4243
this.onEnterRules = [

0 commit comments

Comments
 (0)