Skip to content

Commit b88f1ed

Browse files
committed
Emmet polish and updateExtensionsPath changes
Fixes microsoft#117515, fixes microsoft#120435
1 parent 7cd615c commit b88f1ed

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

extensions/emmet/package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -69,125 +69,125 @@
6969
}
7070
},
7171
"default": {},
72-
"description": "%emmetVariables%"
72+
"markdownDescription": "%emmetVariables%"
7373
},
7474
"emmet.syntaxProfiles": {
7575
"type": "object",
7676
"default": {},
77-
"description": "%emmetSyntaxProfiles%"
77+
"markdownDescription": "%emmetSyntaxProfiles%"
7878
},
7979
"emmet.excludeLanguages": {
8080
"type": "array",
8181
"default": [
8282
"markdown"
8383
],
84-
"description": "%emmetExclude%"
84+
"markdownDescription": "%emmetExclude%"
8585
},
8686
"emmet.extensionsPath": {
8787
"type": "array",
8888
"items": {
8989
"type": "string",
90-
"description": "%emmetExtensionsPathItem%"
90+
"markdownDescription": "%emmetExtensionsPathItem%"
9191
},
9292
"default": [],
93-
"description": "%emmetExtensionsPath%"
93+
"markdownDescription": "%emmetExtensionsPath%"
9494
},
9595
"emmet.triggerExpansionOnTab": {
9696
"type": "boolean",
9797
"default": false,
98-
"description": "%emmetTriggerExpansionOnTab%"
98+
"markdownDescription": "%emmetTriggerExpansionOnTab%"
9999
},
100100
"emmet.preferences": {
101101
"type": "object",
102102
"default": {},
103-
"description": "%emmetPreferences%",
103+
"markdownDescription": "%emmetPreferences%",
104104
"properties": {
105105
"css.intUnit": {
106106
"type": "string",
107107
"default": "px",
108-
"description": "%emmetPreferencesIntUnit%"
108+
"markdownDescription": "%emmetPreferencesIntUnit%"
109109
},
110110
"css.floatUnit": {
111111
"type": "string",
112112
"default": "em",
113-
"description": "%emmetPreferencesFloatUnit%"
113+
"markdownDescription": "%emmetPreferencesFloatUnit%"
114114
},
115115
"css.propertyEnd": {
116116
"type": "string",
117117
"default": ";",
118-
"description": "%emmetPreferencesCssAfter%"
118+
"markdownDescription": "%emmetPreferencesCssAfter%"
119119
},
120120
"sass.propertyEnd": {
121121
"type": "string",
122122
"default": "",
123-
"description": "%emmetPreferencesSassAfter%"
123+
"markdownDescription": "%emmetPreferencesSassAfter%"
124124
},
125125
"stylus.propertyEnd": {
126126
"type": "string",
127127
"default": "",
128-
"description": "%emmetPreferencesStylusAfter%"
128+
"markdownDescription": "%emmetPreferencesStylusAfter%"
129129
},
130130
"css.valueSeparator": {
131131
"type": "string",
132132
"default": ": ",
133-
"description": "%emmetPreferencesCssBetween%"
133+
"markdownDescription": "%emmetPreferencesCssBetween%"
134134
},
135135
"sass.valueSeparator": {
136136
"type": "string",
137137
"default": ": ",
138-
"description": "%emmetPreferencesSassBetween%"
138+
"markdownDescription": "%emmetPreferencesSassBetween%"
139139
},
140140
"stylus.valueSeparator": {
141141
"type": "string",
142142
"default": " ",
143-
"description": "%emmetPreferencesStylusBetween%"
143+
"markdownDescription": "%emmetPreferencesStylusBetween%"
144144
},
145145
"bem.elementSeparator": {
146146
"type": "string",
147147
"default": "__",
148-
"description": "%emmetPreferencesBemElementSeparator%"
148+
"markdownDescription": "%emmetPreferencesBemElementSeparator%"
149149
},
150150
"bem.modifierSeparator": {
151151
"type": "string",
152152
"default": "_",
153-
"description": "%emmetPreferencesBemModifierSeparator%"
153+
"markdownDescription": "%emmetPreferencesBemModifierSeparator%"
154154
},
155155
"filter.commentBefore": {
156156
"type": "string",
157157
"default": "",
158-
"description": "%emmetPreferencesFilterCommentBefore%"
158+
"markdownDescription": "%emmetPreferencesFilterCommentBefore%"
159159
},
160160
"filter.commentAfter": {
161161
"type": "string",
162162
"default": "\n<!-- /[#ID][.CLASS] -->",
163-
"description": "%emmetPreferencesFilterCommentAfter%"
163+
"markdownDescription": "%emmetPreferencesFilterCommentAfter%"
164164
},
165165
"filter.commentTrigger": {
166166
"type": "array",
167167
"default": [
168168
"id",
169169
"class"
170170
],
171-
"description": "%emmetPreferencesFilterCommentTrigger%"
171+
"markdownDescription": "%emmetPreferencesFilterCommentTrigger%"
172172
},
173173
"format.noIndentTags": {
174174
"type": "array",
175175
"default": [
176176
"html"
177177
],
178-
"description": "%emmetPreferencesFormatNoIndentTags%"
178+
"markdownDescription": "%emmetPreferencesFormatNoIndentTags%"
179179
},
180180
"format.forceIndentationForTags": {
181181
"type": "array",
182182
"default": [
183183
"body"
184184
],
185-
"description": "%emmetPreferencesFormatForceIndentTags%"
185+
"markdownDescription": "%emmetPreferencesFormatForceIndentTags%"
186186
},
187187
"profile.allowCompactBoolean": {
188188
"type": "boolean",
189189
"default": false,
190-
"description": "%emmetPreferencesAllowCompactBoolean%"
190+
"markdownDescription": "%emmetPreferencesAllowCompactBoolean%"
191191
},
192192
"css.webkitProperties": {
193193
"type": "string",
@@ -212,27 +212,27 @@
212212
"css.fuzzySearchMinScore": {
213213
"type": "number",
214214
"default": 0.3,
215-
"description": "%emmetPreferencesCssFuzzySearchMinScore%"
215+
"markdownDescription": "%emmetPreferencesCssFuzzySearchMinScore%"
216216
},
217217
"output.inlineBreak": {
218218
"type": "number",
219219
"default": 0,
220-
"description": "%emmetPreferencesOutputInlineBreak%"
220+
"markdownDescription": "%emmetPreferencesOutputInlineBreak%"
221221
},
222222
"output.reverseAttributes": {
223223
"type": "boolean",
224224
"default": false,
225-
"description": "%emmetPreferencesOutputReverseAttributes%"
225+
"markdownDescription": "%emmetPreferencesOutputReverseAttributes%"
226226
},
227227
"output.selfClosingStyle": {
228228
"type": "string",
229229
"default": "html",
230-
"description": "%emmetPreferencesOutputSelfClosingStyle%"
230+
"markdownDescription": "%emmetPreferencesOutputSelfClosingStyle%"
231231
},
232232
"css.color.short": {
233233
"type": "boolean",
234234
"default": true,
235-
"description": "%emmetPreferencesCssColorShort%"
235+
"markdownDescription": "%emmetPreferencesCssColorShort%"
236236
}
237237
}
238238
},

extensions/emmet/package.nls.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@
3030
"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option `\"inMarkupAndStylesheetFilesOnly\"` applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option `\"always\"` applies to all parts of the file regardless of markup/css.",
3131
"emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to `\"never\"`.",
3232
"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and Emmet supported language.\n For example: `{\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}`",
33-
"emmetVariables": "Variables to be used in Emmet snippets",
33+
"emmetVariables": "Variables to be used in Emmet snippets.",
3434
"emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB.",
3535
"emmetPreferences": "Preferences used to modify behavior of some actions and resolvers of Emmet.",
36-
"emmetPreferencesIntUnit": "Default unit for integer values",
37-
"emmetPreferencesFloatUnit": "Default unit for float values",
38-
"emmetPreferencesCssAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations",
39-
"emmetPreferencesSassAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations in Sass files",
40-
"emmetPreferencesStylusAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations in Stylus files",
41-
"emmetPreferencesCssBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations",
42-
"emmetPreferencesSassBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Sass files",
43-
"emmetPreferencesStylusBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Stylus files",
36+
"emmetPreferencesIntUnit": "Default unit for integer values.",
37+
"emmetPreferencesFloatUnit": "Default unit for float values.",
38+
"emmetPreferencesCssAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations.",
39+
"emmetPreferencesSassAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations in Sass files.",
40+
"emmetPreferencesStylusAfter": "Symbol to be placed at the end of CSS property when expanding CSS abbreviations in Stylus files.",
41+
"emmetPreferencesCssBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations.",
42+
"emmetPreferencesSassBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Sass files.",
43+
"emmetPreferencesStylusBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Stylus files.",
4444
"emmetShowSuggestionsAsSnippets": "If `true`, then Emmet suggestions will show up as snippets allowing you to order them as per `#editor.snippetSuggestions#` setting.",
45-
"emmetPreferencesBemElementSeparator": "Element separator used for classes when using the BEM filter",
46-
"emmetPreferencesBemModifierSeparator": "Modifier separator used for classes when using the BEM filter",
45+
"emmetPreferencesBemElementSeparator": "Element separator used for classes when using the BEM filter.",
46+
"emmetPreferencesBemModifierSeparator": "Modifier separator used for classes when using the BEM filter.",
4747
"emmetPreferencesFilterCommentBefore": "A definition of comment that should be placed before matched element when comment filter is applied.",
4848
"emmetPreferencesFilterCommentAfter": "A definition of comment that should be placed after matched element when comment filter is applied.",
49-
"emmetPreferencesFilterCommentTrigger": "A comma-separated list of attribute names that should exist in abbreviation for the comment filter to be applied",
50-
"emmetPreferencesFormatNoIndentTags": "An array of tag names that should not get inner indentation",
51-
"emmetPreferencesFormatForceIndentTags": "An array of tag names that should always get inner indentation",
52-
"emmetPreferencesAllowCompactBoolean": "If `true`, compact notation of boolean attributes are produced",
49+
"emmetPreferencesFilterCommentTrigger": "A comma-separated list of attribute names that should exist in the abbreviation for the comment filter to be applied.",
50+
"emmetPreferencesFormatNoIndentTags": "An array of tag names that should never get inner indentation.",
51+
"emmetPreferencesFormatForceIndentTags": "An array of tag names that should always get inner indentation.",
52+
"emmetPreferencesAllowCompactBoolean": "If `true`, compact notation of boolean attributes are produced.",
5353
"emmetPreferencesCssWebkitProperties": "Comma separated CSS properties that get the 'webkit' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'webkit' prefix.",
5454
"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the 'moz' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'moz' prefix.",
5555
"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
@@ -59,5 +59,5 @@
5959
"emmetPreferencesOutputInlineBreak": "The number of sibling inline elements needed for line breaks to be placed between those elements. If `0`, inline elements are always expanded onto a single line.",
6060
"emmetPreferencesOutputReverseAttributes": "If `true`, reverses attribute merging directions when resolving snippets.",
6161
"emmetPreferencesOutputSelfClosingStyle": "Style of self-closing tags: html (`<br>`), xml (`<br/>`) or xhtml (`<br />`).",
62-
"emmetPreferencesCssColorShort": "If `true`, color values like #f will be expanded to #fff instead of #ffffff."
62+
"emmetPreferencesCssColorShort": "If `true`, color values like `#f` will be expanded to `#fff` instead of `#ffffff`."
6363
}

extensions/emmet/yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ jsonc-parser@^2.3.0:
7777
integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==
7878

7979
vscode-emmet-helper@^2.3.0:
80-
version "2.4.4"
81-
resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.4.4.tgz#f255120de921e2a017c5d48ca2f06e021430af99"
82-
integrity sha512-I7yjgf4vMJRXFD1fN6kWt8WgCidjmcxGa4h+1nO0gSrtoj1/f0FNJ06o64HWt+2rTkwp8eQ9OU3imt5kQkdZ5A==
80+
version "2.5.0"
81+
resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.5.0.tgz#17085b63c504102ee3f502eef9df140c1a089c1d"
82+
integrity sha512-YFNel768f3YOrxmssjt/LVsnPd/gxUWkla0RiHtB0pTgpEi47RAsAzojaSaqY0Xl2jr2tYTLj+65KiHqhdMa4w==
8383
dependencies:
8484
emmet "^2.3.0"
8585
jsonc-parser "^2.3.0"

0 commit comments

Comments
 (0)