Skip to content

Commit bc405e9

Browse files
alexr00alexr00
committed
Try new CSS grammar
Fixes #115480
1 parent 244428d commit bc405e9

File tree

5 files changed

+106
-84
lines changed

5 files changed

+106
-84
lines changed

‎extensions/css/cgmanifest.json

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,47 @@
44
"component": {
55
"type": "git",
66
"git": {
7-
"name": "octref/language-css",
8-
"repositoryUrl": "https://github.com/octref/language-css",
9-
"commitHash": "dcdc1cb4403266f4ebdb1a4f526f8b6d09fd39d6"
7+
"name": "atom/language-css",
8+
"repositoryUrl": "https://github.com/atom/language-css",
9+
"commitHash": "339e9600ce4e024fa97a711d6330e3b5344fcbdc"
1010
}
1111
},
12-
"license": "MIT",
13-
"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.",
14-
"version": "0.42.11"
12+
"licenseDetail": [
13+
"Copyright (c) 2014 GitHub Inc.",
14+
"",
15+
"Permission is hereby granted, free of charge, to any person obtaining",
16+
"a copy of this software and associated documentation files (the",
17+
"\"Software\"), to deal in the Software without restriction, including",
18+
"without limitation the rights to use, copy, modify, merge, publish,",
19+
"distribute, sublicense, and/or sell copies of the Software, and to",
20+
"permit persons to whom the Software is furnished to do so, subject to",
21+
"the following conditions:",
22+
"",
23+
"The above copyright notice and this permission notice shall be",
24+
"included in all copies or substantial portions of the Software.",
25+
"",
26+
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
27+
"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
28+
"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
29+
"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
30+
"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
31+
"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
32+
"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
33+
"",
34+
"--------------------------------------------------------------------",
35+
"",
36+
"This package was derived from a TextMate bundle located at",
37+
"https://github.com/textmate/css.tmbundle and distributed under the following",
38+
"license, located in `README.mdown`:",
39+
"",
40+
"Permission to copy, use, modify, sell and distribute this",
41+
"software is granted. This software is provided \"as is\" without",
42+
"express or implied warranty, and with no claim as to its",
43+
"suitability for any purpose."
44+
],
45+
"license": "GitHub License",
46+
"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.",
47+
"version": "0.44.4"
1548
}
1649
],
1750
"version": 1

‎extensions/css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"vscode": "0.10.x"
1010
},
1111
"scripts": {
12-
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin octref/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
12+
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
1313
},
1414
"contributes": {
1515
"languages": [

‎extensions/css/syntaxes/css.tmLanguage.json

Lines changed: 11 additions & 11 deletions
Large diffs are not rendered by default.

‎extensions/vscode-colorize-tests/test/colorize-results/14119_less.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@
155155
},
156156
{
157157
"c": "content",
158-
"t": "source.css.less meta.property-list.css entity.name.tag.css",
158+
"t": "source.css.less meta.property-list.css support.type.property-name.css",
159159
"r": {
160-
"dark_plus": "entity.name.tag.css: #D7BA7D",
161-
"light_plus": "entity.name.tag: #800000",
162-
"dark_vs": "entity.name.tag.css: #D7BA7D",
163-
"light_vs": "entity.name.tag: #800000",
164-
"hc_black": "entity.name.tag.css: #D7BA7D"
160+
"dark_plus": "support.type.property-name: #9CDCFE",
161+
"light_plus": "support.type.property-name: #FF0000",
162+
"dark_vs": "support.type.property-name: #9CDCFE",
163+
"light_vs": "support.type.property-name: #FF0000",
164+
"hc_black": "support.type.property-name: #D4D4D4"
165165
}
166166
},
167167
{

‎extensions/vscode-colorize-tests/test/colorize-results/test_scss.json

Lines changed: 49 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,13 +1299,13 @@
12991299
},
13001300
{
13011301
"c": "font",
1302-
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
1302+
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
13031303
"r": {
1304-
"dark_plus": "entity.name.tag.css: #D7BA7D",
1305-
"light_plus": "entity.name.tag: #800000",
1306-
"dark_vs": "entity.name.tag.css: #D7BA7D",
1307-
"light_vs": "entity.name.tag: #800000",
1308-
"hc_black": "entity.name.tag.css: #D7BA7D"
1304+
"dark_plus": "support.type.property-name: #9CDCFE",
1305+
"light_plus": "support.type.property-name: #FF0000",
1306+
"dark_vs": "support.type.property-name: #9CDCFE",
1307+
"light_vs": "support.type.property-name: #FF0000",
1308+
"hc_black": "support.type.property-name: #D4D4D4"
13091309
}
13101310
},
13111311
{
@@ -1419,7 +1419,7 @@
14191419
}
14201420
},
14211421
{
1422-
"c": ": ",
1422+
"c": ": fantasy",
14231423
"t": "source.css.scss meta.property-list.scss meta.property-value.scss",
14241424
"r": {
14251425
"dark_plus": "default: #D4D4D4",
@@ -1429,17 +1429,6 @@
14291429
"hc_black": "default: #FFFFFF"
14301430
}
14311431
},
1432-
{
1433-
"c": "fantasy",
1434-
"t": "source.css.scss meta.property-list.scss meta.property-value.scss support.constant.font-name.css",
1435-
"r": {
1436-
"dark_plus": "support.constant.font-name: #CE9178",
1437-
"light_plus": "support.constant.font-name: #0451A5",
1438-
"dark_vs": "default: #D4D4D4",
1439-
"light_vs": "support.constant.font-name: #0451A5",
1440-
"hc_black": "support.constant.font-name: #CE9178"
1441-
}
1442-
},
14431432
{
14441433
"c": ";",
14451434
"t": "source.css.scss meta.property-list.scss punctuation.terminator.rule.scss",
@@ -3367,13 +3356,13 @@
33673356
},
33683357
{
33693358
"c": "font",
3370-
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
3359+
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
33713360
"r": {
3372-
"dark_plus": "entity.name.tag.css: #D7BA7D",
3373-
"light_plus": "entity.name.tag: #800000",
3374-
"dark_vs": "entity.name.tag.css: #D7BA7D",
3375-
"light_vs": "entity.name.tag: #800000",
3376-
"hc_black": "entity.name.tag.css: #D7BA7D"
3361+
"dark_plus": "support.type.property-name: #9CDCFE",
3362+
"light_plus": "support.type.property-name: #FF0000",
3363+
"dark_vs": "support.type.property-name: #9CDCFE",
3364+
"light_vs": "support.type.property-name: #FF0000",
3365+
"hc_black": "support.type.property-name: #D4D4D4"
33773366
}
33783367
},
33793368
{
@@ -4742,13 +4731,13 @@
47424731
},
47434732
{
47444733
"c": "content",
4745-
"t": "source.css.scss meta.property-list.scss entity.name.tag.css",
4734+
"t": "source.css.scss meta.property-list.scss meta.property-name.scss support.type.property-name.css",
47464735
"r": {
4747-
"dark_plus": "entity.name.tag.css: #D7BA7D",
4748-
"light_plus": "entity.name.tag: #800000",
4749-
"dark_vs": "entity.name.tag.css: #D7BA7D",
4750-
"light_vs": "entity.name.tag: #800000",
4751-
"hc_black": "entity.name.tag.css: #D7BA7D"
4736+
"dark_plus": "support.type.property-name: #9CDCFE",
4737+
"light_plus": "support.type.property-name: #FF0000",
4738+
"dark_vs": "support.type.property-name: #9CDCFE",
4739+
"light_vs": "support.type.property-name: #FF0000",
4740+
"hc_black": "support.type.property-name: #D4D4D4"
47524741
}
47534742
},
47544743
{
@@ -12893,13 +12882,13 @@
1289312882
},
1289412883
{
1289512884
"c": "font",
12896-
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.name.tag.css",
12885+
"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",
1289712886
"r": {
12898-
"dark_plus": "entity.name.tag.css: #D7BA7D",
12899-
"light_plus": "entity.name.tag: #800000",
12900-
"dark_vs": "entity.name.tag.css: #D7BA7D",
12901-
"light_vs": "entity.name.tag: #800000",
12902-
"hc_black": "entity.name.tag.css: #D7BA7D"
12887+
"dark_plus": "support.type.property-name: #9CDCFE",
12888+
"light_plus": "support.type.property-name: #FF0000",
12889+
"dark_vs": "support.type.property-name: #9CDCFE",
12890+
"light_vs": "support.type.property-name: #FF0000",
12891+
"hc_black": "support.type.property-name: #D4D4D4"
1290312892
}
1290412893
},
1290512894
{
@@ -13828,13 +13817,13 @@
1382813817
},
1382913818
{
1383013819
"c": "style",
13831-
"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",
13820+
"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",
1383213821
"r": {
13833-
"dark_plus": "entity.name.tag.css: #D7BA7D",
13834-
"light_plus": "entity.name.tag: #800000",
13835-
"dark_vs": "entity.name.tag.css: #D7BA7D",
13836-
"light_vs": "entity.name.tag: #800000",
13837-
"hc_black": "entity.name.tag.css: #D7BA7D"
13822+
"dark_plus": "support.type.property-name: #9CDCFE",
13823+
"light_plus": "support.type.property-name: #FF0000",
13824+
"dark_vs": "support.type.property-name: #9CDCFE",
13825+
"light_vs": "support.type.property-name: #FF0000",
13826+
"hc_black": "support.type.property-name: #D4D4D4"
1383813827
}
1383913828
},
1384013829
{
@@ -16325,13 +16314,13 @@
1632516314
},
1632616315
{
1632716316
"c": "content",
16328-
"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss entity.name.tag.css",
16317+
"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",
1632916318
"r": {
16330-
"dark_plus": "entity.name.tag.css: #D7BA7D",
16331-
"light_plus": "entity.name.tag: #800000",
16332-
"dark_vs": "entity.name.tag.css: #D7BA7D",
16333-
"light_vs": "entity.name.tag: #800000",
16334-
"hc_black": "entity.name.tag.css: #D7BA7D"
16319+
"dark_plus": "support.type.property-name: #9CDCFE",
16320+
"light_plus": "support.type.property-name: #FF0000",
16321+
"dark_vs": "support.type.property-name: #9CDCFE",
16322+
"light_vs": "support.type.property-name: #FF0000",
16323+
"hc_black": "support.type.property-name: #D4D4D4"
1633516324
}
1633616325
},
1633716326
{
@@ -18030,13 +18019,13 @@
1803018019
},
1803118020
{
1803218021
"c": "a",
18033-
"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",
18022+
"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",
1803418023
"r": {
18035-
"dark_plus": "entity.name.tag.css: #D7BA7D",
18036-
"light_plus": "entity.name.tag: #800000",
18037-
"dark_vs": "entity.name.tag.css: #D7BA7D",
18038-
"light_vs": "entity.name.tag: #800000",
18039-
"hc_black": "entity.name.tag.css: #D7BA7D"
18024+
"dark_plus": "default: #D4D4D4",
18025+
"light_plus": "default: #000000",
18026+
"dark_vs": "default: #D4D4D4",
18027+
"light_vs": "default: #000000",
18028+
"hc_black": "default: #FFFFFF"
1804018029
}
1804118030
},
1804218031
{
@@ -18151,13 +18140,13 @@
1815118140
},
1815218141
{
1815318142
"c": "b",
18154-
"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",
18143+
"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",
1815518144
"r": {
18156-
"dark_plus": "entity.name.tag.css: #D7BA7D",
18157-
"light_plus": "entity.name.tag: #800000",
18158-
"dark_vs": "entity.name.tag.css: #D7BA7D",
18159-
"light_vs": "entity.name.tag: #800000",
18160-
"hc_black": "entity.name.tag.css: #D7BA7D"
18145+
"dark_plus": "default: #D4D4D4",
18146+
"light_plus": "default: #000000",
18147+
"dark_vs": "default: #D4D4D4",
18148+
"light_vs": "default: #000000",
18149+
"hc_black": "default: #FFFFFF"
1816118150
}
1816218151
},
1816318152
{

0 commit comments

Comments
 (0)