diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts index bb391d50d3e..44138ce758a 100644 --- a/extensions/html/client/src/htmlMain.ts +++ b/extensions/html/client/src/htmlMain.ts @@ -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 => { diff --git a/extensions/html/package.json b/extensions/html/package.json index f68409d0f60..3f4871ce158 100644 --- a/extensions/html/package.json +++ b/extensions/html/package.json @@ -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", diff --git a/extensions/html/package.nls.json b/extensions/html/package.nls.json index b3fa8adadd0..c09d8d337bd 100644 --- a/extensions/html/package.nls.json +++ b/extensions/html/package.nls.json @@ -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." } \ No newline at end of file diff --git a/extensions/html/server/src/modes/htmlMode.ts b/extensions/html/server/src/modes/htmlMode.ts index c4471fddc25..ccfc76adf6c 100644 --- a/extensions/html/server/src/modes/htmlMode.ts +++ b/extensions/html/server/src/modes/htmlMode.ts @@ -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; }