Skip to content

Commit c676c69

Browse files
committed
fix(package.json): pattern properties for css/scss
fix(package.nls.json): amended key and description
1 parent c0f021b commit c676c69

2 files changed

Lines changed: 23 additions & 25 deletions

File tree

extensions/css-language-features/package.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,19 @@
6666
"default": true,
6767
"description": "%css.validate.desc%"
6868
},
69-
"css.alias.paths": {
69+
"css.importAliases": {
7070
"type": "object",
7171
"additionalProperties": false,
7272
"patternProperties": {
73-
"[^/]$": {
73+
"^[^/]+(/)?$": {
7474
"type": "string",
75-
"pattern": "((\\.css)|/\\*)$",
76-
"patternErrorMessage": "Path must end with stylesheet filetype or folder glob '/*'"
77-
},
78-
"patternErrorMessage": "Alias must not end with forward slash"
75+
"pattern": "((\\.css)|/)$",
76+
"patternErrorMessage": "Path must end with stylesheet filetype or forward slash"
77+
}
7978
},
8079
"scope": "resource",
8180
"default": null,
82-
"description": "%css.alias.paths%"
81+
"description": "%css.importAliases%"
8382
},
8483
"css.hover.documentation": {
8584
"type": "boolean",
@@ -397,20 +396,19 @@
397396
"default": true,
398397
"description": "%scss.validate.desc%"
399398
},
400-
"scss.alias.paths": {
399+
"scss.importAliases": {
401400
"type": "object",
402401
"additionalProperties": false,
403402
"patternProperties": {
404-
"[^/]$": {
403+
"^[^/]+(/)?$": {
405404
"type": "string",
406-
"pattern": "((\\.s?css)|/\\*)$",
407-
"patternErrorMessage": "Path must end with stylesheet filetype or folder glob '/*'"
408-
},
409-
"patternErrorMessage": "Alias must not end with forward slash"
405+
"pattern": "((\\.s?css)|/)$",
406+
"patternErrorMessage": "Path must end with stylesheet filetype or forward slash"
407+
}
410408
},
411409
"scope": "resource",
412410
"default": null,
413-
"description": "%scss.alias.paths%"
411+
"description": "%scss.importAliases%"
414412
},
415413
"scss.hover.documentation": {
416414
"type": "boolean",

extensions/css-language-features/package.nls.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"displayName": "CSS Language Features",
33
"description": "Provides rich language support for CSS, LESS and SCSS files.",
44
"css.title": "CSS",
5-
"css.alias.paths": "A series of entries which map imports to lookup locations within CSS files. \n Single file reference: \"Stylesheet\": \"src/css/styles.css\". \n Reference folder: \"StylesDir/*\": \"src/css/*\". \n @import 'Stylesheet' \n @import 'StylesDir/styles.css",
5+
"css.importAliases": "Key-value pairs which can be used to map @import file references to predefined locations. Each key represents an alias and each value a specific file or a folder path; paths are relative to the current project root folder.",
66
"css.customData.desc": "A list of relative file paths pointing to JSON files following the [custom data format](https://github.com/microsoft/vscode-css-languageservice/blob/master/docs/customData.md).\n\nVS Code loads custom data on startup to enhance its CSS support for the custom CSS properties, at directives, pseudo classes and pseudo elements you specify in the JSON files.\n\nThe file paths are relative to workspace and only workspace folder settings are considered.",
77
"css.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
88
"css.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
@@ -13,7 +13,7 @@
1313
"css.lint.emptyRules.desc": "Do not use empty rulesets.",
1414
"css.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
1515
"css.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
16-
"css.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
16+
"css.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
1717
"css.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
1818
"css.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
1919
"css.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
@@ -29,14 +29,14 @@
2929
"css.trace.server.desc": "Traces the communication between VS Code and the CSS language server.",
3030
"css.validate.title": "Controls CSS validation and problem severities.",
3131
"css.validate.desc": "Enables or disables all validations.",
32-
"css.hover.documentation": "Show property and value documentation in CSS hovers.",
32+
"css.hover.documentation": "Show tag and attribute documentation in CSS hovers.",
3333
"css.hover.references": "Show references to MDN in CSS hovers.",
3434
"css.format.enable.desc": "Enable/disable default CSS formatter.",
3535
"css.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
3636
"css.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
3737
"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
3838
"css.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
39-
"css.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
39+
"css.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
4040
"css.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#css.format.preserveNewLines#` is enabled.",
4141
"less.title": "LESS",
4242
"less.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
@@ -48,7 +48,7 @@
4848
"less.lint.emptyRules.desc": "Do not use empty rulesets.",
4949
"less.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
5050
"less.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
51-
"less.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
51+
"less.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
5252
"less.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
5353
"less.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
5454
"less.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
@@ -63,17 +63,17 @@
6363
"less.lint.zeroUnits.desc": "No unit for zero needed.",
6464
"less.validate.title": "Controls LESS validation and problem severities.",
6565
"less.validate.desc": "Enables or disables all validations.",
66-
"less.hover.documentation": "Show property and value documentation in LESS hovers.",
66+
"less.hover.documentation": "Show tag and attribute documentation in LESS hovers.",
6767
"less.hover.references": "Show references to MDN in LESS hovers.",
6868
"less.format.enable.desc": "Enable/disable default LESS formatter.",
6969
"less.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
7070
"less.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
7171
"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
7272
"less.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
73-
"less.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
73+
"less.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
7474
"less.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#less.format.preserveNewLines#` is enabled.",
7575
"scss.title": "SCSS (Sass)",
76-
"scss.alias.paths": "A series of entries which map imports to lookup locations within SCSS files. \n Single file reference: \"Stylesheet\": \"src/scss/styles.scss\". \n Reference folder: \"StylesDir/*\": \"src/scss/*\". \n @import 'Stylesheet' \n @import 'StylesDir/styles.scss",
76+
"scss.importAliases": "Key-value pairs which can be used to map @import file references to predefined locations. Each key represents an alias and each value a specific file or a folder path; paths are relative to the current project root folder.",
7777
"scss.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
7878
"scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.",
7979
"scss.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
@@ -83,7 +83,7 @@
8383
"scss.lint.emptyRules.desc": "Do not use empty rulesets.",
8484
"scss.lint.float.desc": "Avoid using `float`. Floats lead to fragile CSS that is easy to break if one aspect of the layout changes.",
8585
"scss.lint.fontFaceProperties.desc": "`@font-face` rule must define `src` and `font-family` properties.",
86-
"scss.lint.hexColorLength.desc": "Hex colors must consist of 3, 4, 6 or 8 hex numbers.",
86+
"scss.lint.hexColorLength.desc": "Hex colors must consist of three or six hex numbers.",
8787
"scss.lint.idSelector.desc": "Selectors should not contain IDs because these rules are too tightly coupled with the HTML.",
8888
"scss.lint.ieHack.desc": "IE hacks are only necessary when supporting IE7 and older.",
8989
"scss.lint.important.desc": "Avoid using `!important`. It is an indication that the specificity of the entire CSS has gotten out of control and needs to be refactored.",
@@ -98,14 +98,14 @@
9898
"scss.lint.zeroUnits.desc": "No unit for zero needed.",
9999
"scss.validate.title": "Controls SCSS validation and problem severities.",
100100
"scss.validate.desc": "Enables or disables all validations.",
101-
"scss.hover.documentation": "Show property and value documentation in SCSS hovers.",
101+
"scss.hover.documentation": "Show tag and attribute documentation in SCSS hovers.",
102102
"scss.hover.references": "Show references to MDN in SCSS hovers.",
103103
"scss.format.enable.desc": "Enable/disable default SCSS formatter.",
104104
"scss.format.newlineBetweenSelectors.desc": "Separate selectors with a new line.",
105105
"scss.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
106106
"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
107107
"scss.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
108-
"scss.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
108+
"scss.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
109109
"scss.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#scss.format.preserveNewLines#` is enabled.",
110110
"css.colorDecorators.enable.deprecationMessage": "The setting `css.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
111111
"scss.colorDecorators.enable.deprecationMessage": "The setting `scss.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",

0 commit comments

Comments
 (0)