Skip to content

Commit

Permalink
Try new CSS grammar
Browse files Browse the repository at this point in the history 
Fixes #115480
  • Loading branch information
@alexr00
alexr00 committed Mar 11, 2021
1 parent 244428d commit bc405e9
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 84 deletions.
45 changes: 39 additions & 6 deletions extensions/css/cgmanifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,47 @@
"component": {
"type": "git",
"git": {
"name": "octref/language-css",
"repositoryUrl": "https://github.com/octref/language-css",
"commitHash": "dcdc1cb4403266f4ebdb1a4f526f8b6d09fd39d6"
"name": "atom/language-css",
"repositoryUrl": "https://github.com/atom/language-css",
"commitHash": "339e9600ce4e024fa97a711d6330e3b5344fcbdc"
}
},
"license": "MIT",
"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/octref/language-css which was derived from the Atom package https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
"version": "0.42.11"
"licenseDetail": [
"Copyright (c) 2014 GitHub Inc.",
"",
"Permission is hereby granted, free of charge, to any person obtaining",
"a copy of this software and associated documentation files (the",
"\"Software\"), to deal in the Software without restriction, including",
"without limitation the rights to use, copy, modify, merge, publish,",
"distribute, sublicense, and/or sell copies of the Software, and to",
"permit persons to whom the Software is furnished to do so, subject to",
"the following conditions:",
"",
"The above copyright notice and this permission notice shall be",
"included in all copies or substantial portions of the Software.",
"",
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
"",
"--------------------------------------------------------------------",
"",
"This package was derived from a TextMate bundle located at",
"https://github.com/textmate/css.tmbundle and distributed under the following",
"license, located in `README.mdown`:",
"",
"Permission to copy, use, modify, sell and distribute this",
"software is granted. This software is provided \"as is\" without",
"express or implied warranty, and with no claim as to its",
"suitability for any purpose."
],
"license": "GitHub License",
"description": "The file syntaxes/css.tmLanguage.json was derived from https://github.com/atom/language-css which was originally converted from the TextMate bundle https://github.com/textmate/css.tmbundle.",
"version": "0.44.4"
}
],
"version": 1
Expand Down
2 changes: 1 addition & 1 deletion extensions/css/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"vscode": "0.10.x"
},
"scripts": {
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
},
"contributes": {
"languages": [
Expand Down
22 changes: 11 additions & 11 deletions extensions/css/syntaxes/css.tmLanguage.json
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions extensions/vscode-colorize-tests/test/colorize-results/14119_less.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@
},
{
"c": "content",
"t": "source.css.less meta.property-list.css entity.name.tag.css",
"t": "source.css.less meta.property-list.css support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down
109 changes: 49 additions & 60 deletions extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1299,13 +1299,13 @@
},
{
"c": "font",
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -1419,7 +1419,7 @@
}
},
{
"c": ": ",
"c": ": fantasy",
"t": "source.css.scss meta.property-list.scss meta.property-value.scss",
"r": {
"dark_plus": "default: #D4D4D4",
Expand All @@ -1429,17 +1429,6 @@
"hc_black": "default: #FFFFFF"
}
},
{
"c": "fantasy",
"t": "source.css.scss meta.property-list.scss meta.property-value.scss support.constant.font-name.css",
"r": {
"dark_plus": "support.constant.font-name: #CE9178",
"light_plus": "support.constant.font-name: #0451A5",
"dark_vs": "default: #D4D4D4",
"light_vs": "support.constant.font-name: #0451A5",
"hc_black": "support.constant.font-name: #CE9178"
}
},
{
"c": ";",
"t": "source.css.scss meta.property-list.scss punctuation.terminator.rule.scss",
Expand Down Expand Up @@ -3367,13 +3356,13 @@
},
{
"c": "font",
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -4742,13 +4731,13 @@
},
{
"c": "content",
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -12893,13 +12882,13 @@
},
{
"c": "font",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -13828,13 +13817,13 @@
},
{
"c": "style",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -16325,13 +16314,13 @@
},
{
"c": "content",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "support.type.property-name: #9CDCFE",
"light_plus": "support.type.property-name: #FF0000",
"dark_vs": "support.type.property-name: #9CDCFE",
"light_vs": "support.type.property-name: #FF0000",
"hc_black": "support.type.property-name: #D4D4D4"
}
},
{
Expand Down Expand Up @@ -18030,13 +18019,13 @@
},
{
"c": "a",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
Expand Down Expand Up @@ -18151,13 +18140,13 @@
},
{
"c": "b",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss entity.name.tag.css",
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-name.scss",
"r": {
"dark_plus": "entity.name.tag.css: #D7BA7D",
"light_plus": "entity.name.tag: #800000",
"dark_vs": "entity.name.tag.css: #D7BA7D",
"light_vs": "entity.name.tag: #800000",
"hc_black": "entity.name.tag.css: #D7BA7D"
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
Expand Down

2 comments on commit bc405e9

@cssinate
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexr00 - you asked me to let you know when atom/language-css#173 was accepted. It is now!

@alexr00
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cssinate thanks for the heads up, I just pulled in the latest grammar to get your changes!

Please sign in to comment.