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

Update to match new enum

This commit is contained in:
Stephen Sigwart 2021-09-29 23:16:07 -04:00
parent c5d3ad08f0
commit ba48f5c1f0
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/html-language-features/package.json
View File

@ -42,16 +42,16 @@
"type": "string",
"scope": "resource",
"enum": [
"doubleQuotes",
"singleQuotes",
"doublequotes",
"singlequotes",
"empty"
],
"enumDescriptions": [
"%html.completion.attributeDefaultValue.doubleQuotes%",
"%html.completion.attributeDefaultValue.singleQuotes%",
"%html.completion.attributeDefaultValue.doublequotes%",
"%html.completion.attributeDefaultValue.singlequotes%",
"%html.completion.attributeDefaultValue.empty%"
],
"default": "doubleQuotes",
"default": "doublequotes",
"description": "%html.completion.attributeDefaultValue%"
},
"html.customData": {

4
extensions/html-language-features/package.nls.json
View File

@ -29,8 +29,8 @@
"html.validate.styles": "Controls whether the built-in HTML language support validates embedded styles.",
"html.autoClosingTags": "Enable/disable autoclosing of HTML tags.",
"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.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`",

7
extensions/html-language-features/server/src/modes/htmlMode.ts
View File

@ -26,12 +26,7 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
if (doAutoComplete) {
options.hideAutoCompleteProposals = true;
}
let attributeDefaultValue = settings && settings.html && settings.html.completion.attributeDefaultValue;
if (attributeDefaultValue === 'empty') {
options.useEmptyAttrValue = true;
} else if (attributeDefaultValue === 'singleQuotes') {
options.useSingleQuotesForAttrs = true;
}
options.attributeDefaultValue = settings.html.completion.attributeDefaultValue ?? 'doublequotes';
const htmlDocument = htmlDocuments.get(document);
let completionList = htmlLanguageService.doComplete2(document, position, htmlDocument, documentContext, options);