[html] rename setting to 'html.autoClosingTags'

aeschli · aeschli · commit 205971639712 · 2017-08-29T08:09:02.000+02:00
diff --git 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
@@ -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
@@ -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."
 }
diff --git 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;
 			}

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`"html.trace.server.desc": "Traces the communication between VS Code and the HTML language server.",`
`21`	`21`	`"html.validate.scripts": "Configures if the built-in HTML language support validates embedded scripts.",`
`22`	`22`	`"html.validate.styles": "Configures if the built-in HTML language support validates embedded styles.",`
`23`		`- "html.autoClosingTags.enable": "Enable/disable autoclosing of HTML tags."`
	`23`	`+ "html.autoClosingTags": "Enable/disable autoclosing of HTML tags."`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService): LanguageM`
`21`	`21`	`},`
`22`	`22`	`doComplete(document: TextDocument, position: Position, settings: Settings = globalSettings) {`
`23`	`23`	`let options = settings && settings.html && settings.html.suggest;`
`24`		`- let doAutoComplete = settings && settings.html && settings.html.autoClosingTags.enable;`
	`24`	`+ let doAutoComplete = settings && settings.html && settings.html.autoClosingTags;`
`25`	`25`	`if (doAutoComplete) {`
`26`	`26`	`options.hideAutoCompleteProposals = true;`
`27`	`27`	`}`