daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[html] rename setting to 'html.autoClosingTags'

pull/33317/merge
Martin Aeschlimann 2017-08-29 08:08:57 +02:00
parent 931992aea8
commit 2059716397
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/html/client/src/htmlMain.ts
View File

@ -100,7 +100,7 @@ export function activate(context: ExtensionContext) {
let param = client.code2ProtocolConverter.asTextDocumentPositionParams(document, position);
return client.sendRequest(TagCloseRequest.type, param);
};
disposable = activateTagClosing(tagRequestor, { html: true, handlebars: true, razor: true }, 'html.autoClosingTags.enable');
disposable = activateTagClosing(tagRequestor, { html: true, handlebars: true, razor: true }, 'html.autoClosingTags');
toDispose.push(disposable);
disposable = client.onTelemetry(e => {

4
extensions/html/package.json
View File

@ -194,11 +194,11 @@
"default": true,
"description": "%html.validate.styles%"
},
"html.autoClosingTags.enable": {
"html.autoClosingTags": {
"type": "boolean",
"scope": "resource",
"default": true,
"description": "%html.autoClosingTags.enable%"
"description": "%html.autoClosingTags%"
},
"html.trace.server": {
"type": "string",

2
extensions/html/package.nls.json
View File

@ -20,5 +20,5 @@
"html.trace.server.desc": "Traces the communication between VS Code and the HTML language server.",
"html.validate.scripts": "Configures if the built-in HTML language support validates embedded scripts.",
"html.validate.styles": "Configures if the built-in HTML language support validates embedded styles.",
"html.autoClosingTags.enable": "Enable/disable autoclosing of HTML tags."
"html.autoClosingTags": "Enable/disable autoclosing of HTML tags."
}

2
extensions/html/server/src/modes/htmlMode.ts
View File

@ -21,7 +21,7 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService): LanguageM
},
doComplete(document: TextDocument, position: Position, settings: Settings = globalSettings) {
let options = settings && settings.html && settings.html.suggest;
let doAutoComplete = settings && settings.html && settings.html.autoClosingTags.enable;
let doAutoComplete = settings && settings.html && settings.html.autoClosingTags;
if (doAutoComplete) {
options.hideAutoCompleteProposals = true;
}