Switch to settings.html.completion.attributeDefaultValue

microsoft · Aug 19, 2021 · d87602c · d87602c
1 parent aa3f5a4
commit d87602c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
@@ -38,6 +38,22 @@
       "type": "object",
       "title": "HTML",
       "properties": {
+        "html.completion.attributeDefaultValue": {
+          "type": "string",
+          "scope": "resource",
+          "enum": [
+            "doubleQuotes",
+            "singleQuotes",
+            "empty"
+          ],
+          "enumDescriptions": [
+            "%html.completion.attributeDefaultValue.doubleQuotes%",
+            "%html.completion.attributeDefaultValue.singleQuotes%",
+            "%html.completion.attributeDefaultValue.empty%"
+          ],
+          "default": "doubleQuotes",
+          "description": "%html.completion.attributeDefaultValue%"
+        },
         "html.customData": {
           "type": "array",
           "markdownDescription": "%html.customData.desc%",
@@ -188,12 +204,6 @@
           "default": true,
           "description": "%html.autoClosingTags%"
         },
-        "html.doNotAddAttributeQuotes": {
-          "type": "boolean",
-          "scope": "resource",
-          "default": false,
-          "description": "%html.doNotAddAttributeQuotes%"
-        },
         "html.hover.documentation": {
           "type": "boolean",
           "scope": "resource",

diff --git a/extensions/html-language-features/package.nls.json b/extensions/html-language-features/package.nls.json
@@ -28,7 +28,10 @@
 	"html.validate.scripts": "Controls whether the built-in HTML language support validates embedded scripts.",
 	"html.validate.styles": "Controls whether the built-in HTML language support validates embedded styles.",
 	"html.autoClosingTags": "Enable/disable autoclosing of HTML tags.",
-	"html.doNotAddAttributeQuotes": "Controls whether quotes are automatically added when completing an attribute.",
+	"html.completion.attributeDefaultValue": "Controls the default value for attributes when completion is accepted.",
+	"html.completion.attributeDefaultValue.doubleQuotes": "Attribute value is set to \"\".",
+	"html.completion.attributeDefaultValue.singleQuotes": "Attribute value is set to ''.",
+	"html.completion.attributeDefaultValue.empty": "Attribute value is not set.",
 	"html.mirrorCursorOnMatchingTag": "Enable/disable mirroring cursor on matching HTML tag.",
 	"html.mirrorCursorOnMatchingTagDeprecationMessage": "Deprecated in favor of `editor.linkedEditing`",
 	"html.hover.documentation": "Show tag and attribute documentation in hover.",

diff --git a/extensions/html-language-features/server/src/modes/htmlMode.ts b/extensions/html-language-features/server/src/modes/htmlMode.ts
@@ -26,9 +26,11 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
 			if (doAutoComplete) {
 				options.hideAutoCompleteProposals = true;
 			}
-			let doNotAddAttributeQuotes = settings && settings.html && settings.html.doNotAddAttributeQuotes;
-			if (doNotAddAttributeQuotes) {
-				options.doNotAddAttributeQuotes = true;
+			let attributeDefaultValue = settings && settings.html && settings.html.completion.attributeDefaultValue;
+			if (attributeDefaultValue === 'empty') {
+				options.useEmptyAttrValue = true;
+			} else if (attributeDefaultValue === 'singleQuotes') {
+				options.useSingleQuotesForAttrs = true;
 			}
 
 			const htmlDocument = htmlDocuments.get(document);