Skip to content

Commit 8998f7a

Browse files
alexdimaalexdima
committed
Adopt new vscode textmate
1 parent 9cebde9 commit 8998f7a

9 files changed

Lines changed: 299 additions & 72 deletions

File tree

‎extensions/markdown/syntaxes/markdown.tmLanguage‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@
294294
<string>(^|\G)\s*(&lt;!--)</string>
295295
<key>end</key>
296296
<string>(--&gt;)</string>
297-
<key>contentName</key>
298-
<string>block.comment.html</string>
297+
<key>name</key>
298+
<string>comment.block.html</string>
299299
<key>captures</key>
300300
<dict>
301301
<key>1</key>
@@ -1902,7 +1902,7 @@
19021902
<key>match</key>
19031903
<string>(`+)([^`]|(?!(?&lt;!`)\1(?!`))`)*+(\1)</string>
19041904
<key>name</key>
1905-
<string>markup.raw.inline.markdown</string>
1905+
<string>markup.inline.raw.markdown</string>
19061906
</dict>
19071907
</dict>
19081908
</dict>

‎extensions/theme-defaults/themes/dark_plus.json‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,28 @@
1919
"support.class",
2020
"support.type",
2121
"entity.name.type",
22+
"entity.name.class",
23+
2224
"storage.type.cs",
25+
"storage.type.generic.cs",
26+
"storage.type.modifier.cs",
27+
"storage.type.variable.cs",
28+
29+
"storage.type.annotation.java",
30+
"storage.type.generic.java",
2331
"storage.type.java",
24-
"entity.other.inherited-class"
32+
"storage.type.object.array.java",
33+
"storage.type.primitive.array.java",
34+
"storage.type.primitive.java",
35+
"storage.type.token.java",
36+
37+
"storage.type.groovy",
38+
"storage.type.annotation.groovy",
39+
"storage.type.parameters.groovy",
40+
"storage.type.generic.groovy",
41+
"storage.type.object.array.groovy",
42+
"storage.type.primitive.array.groovy",
43+
"storage.type.primitive.groovy"
2544
],
2645
"settings": {
2746
"foreground": "#4EC9B0"
@@ -51,40 +70,40 @@
5170
{
5271
"name": "Variable and parameter name",
5372
"scope": [
54-
"variable.parameter",
5573
"variable",
56-
"variable.name",
74+
"meta.definition.variable.name",
5775
"support.variable"
5876
],
5977
"settings": {
6078
"foreground": "#9CDCFE"
6179
}
6280
},
6381
{
64-
"name": "Object keys, TS gammar specific",
65-
"scope": "object-literal.member.key",
82+
"name": "Object keys, TS grammar specific",
83+
"scope": [
84+
"meta.object-literal.key",
85+
"meta.object-literal.key entity.name.function"
86+
],
6687
"settings": {
6788
"foreground": "#9CDCFE"
6889
}
6990
},
7091
{
7192
"name": "CSS property value",
7293
"scope": [
73-
"support.property-value",
74-
"constant.rgb-value",
75-
"support.property-value.scss",
76-
"constant.rgb-value.scss"
94+
"constant.other.color.rgb-value.css",
95+
"constant.other.rgb-value.css",
96+
"meta.property-value.css support.function",
97+
"meta.property-value.css support",
98+
99+
"constant.numeric.color.rgb-value.scss",
100+
"constant.rgb-value.scss",
101+
"meta.property-value.scss support.function",
102+
"meta.property-value.scss support"
77103
],
78104
"settings": {
79105
"foreground": "#CE9178"
80106
}
81-
},
82-
{
83-
"name": "JSX Tag names, workaround for flattening match with function",
84-
"scope": "entity.name.function.tag",
85-
"settings": {
86-
"foreground": "#569cd6"
87-
}
88107
}
89108
]
90109
}

‎extensions/theme-defaults/themes/dark_vs.json‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"name": "Dark Visual Studio",
33
"settings": [
4+
{
5+
"settings": {
6+
"foreground": "#D4D4D4",
7+
"background": "#1E1E1E"
8+
}
9+
},
410
{
511
"scope": "emphasis",
612
"settings": {
@@ -45,7 +51,11 @@
4551
}
4652
},
4753
{
48-
"scope": "constant.rgb-value",
54+
"scope": [
55+
"constant.other.color.rgb-value.css",
56+
"constant.numeric.color.rgb-value.scss",
57+
"constant.other.rgb-value.css"
58+
],
4959
"settings": {
5060
"foreground": "#d4d4d4"
5161
}
@@ -57,7 +67,7 @@
5767
}
5868
},
5969
{
60-
"scope": "entity.name.selector",
70+
"scope": "entity.name.tag.css",
6171
"settings": {
6272
"foreground": "#d7ba7d"
6373
}
@@ -69,7 +79,19 @@
6979
}
7080
},
7181
{
72-
"scope": "entity.other.attribute-name.css",
82+
"scope": [
83+
"entity.other.attribute-name.class.css",
84+
"entity.other.attribute-name.class.mixin.css",
85+
"entity.other.attribute-name.id.css",
86+
"entity.other.attribute-name.parent-selector.css",
87+
"entity.other.attribute-name.pseudo-class.css",
88+
"entity.other.attribute-name.pseudo-element.css",
89+
90+
"source.css.less entity.other.attribute-name.id",
91+
92+
"entity.other.attribute-name.attribute.scss",
93+
"entity.other.attribute-name.scss"
94+
],
7395
"settings": {
7496
"foreground": "#d7ba7d"
7597
}
@@ -125,13 +147,13 @@
125147
}
126148
},
127149
{
128-
"scope": "markup.punctuation.quote.beginning",
150+
"scope": "beginning.punctuation.definition.quote.markdown",
129151
"settings": {
130152
"foreground": "#608b4e"
131153
}
132154
},
133155
{
134-
"scope": "markup.punctuation.list.beginning",
156+
"scope": "beginning.punctuation.definition.list.markdown",
135157
"settings": {
136158
"foreground": "#6796e6"
137159
}
@@ -180,7 +202,7 @@
180202
}
181203
},
182204
{
183-
"scope": "meta.header.diff",
205+
"scope": "meta.diff.header",
184206
"settings": {
185207
"foreground": "#569cd6"
186208
}
@@ -229,7 +251,10 @@
229251
},
230252
{
231253
"name": "JavaScript string interpolation ${}",
232-
"scope": "string.template-expression",
254+
"scope": [
255+
"punctuation.definition.template-expression.begin.ts",
256+
"punctuation.definition.template-expression.end.ts"
257+
],
233258
"settings": {
234259
"foreground": "#569cd6"
235260
}
@@ -271,8 +296,10 @@
271296
}
272297
},
273298
{
274-
"name": "coloring of the PHP start and end tag (<?php and ?>)",
275-
"scope": ["punctuation.section.embedded.begin.metatag.php", "punctuation.section.embedded.end.metatag.php"],
299+
"scope": [
300+
"punctuation.section.embedded.metatag.begin.php",
301+
"punctuation.section.embedded.metatag.end.php"
302+
],
276303
"settings": {
277304
"foreground": "#569cd6"
278305
}

‎extensions/theme-defaults/themes/hc_black.json‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"name": "Dark Visual Studio",
33
"settings": [
4+
{
5+
"settings": {
6+
"foreground": "#FFFFFF",
7+
"background": "#000000"
8+
}
9+
},
410
{
511
"scope": "emphasis",
612
"settings": {
@@ -14,7 +20,7 @@
1420
}
1521
},
1622
{
17-
"scope": "header",
23+
"scope": "meta.diff.header",
1824
"settings": {
1925
"foreground": "#000080"
2026
}
@@ -45,7 +51,11 @@
4551
}
4652
},
4753
{
48-
"scope": "constant.rgb-value",
54+
"scope": [
55+
"constant.other.color.rgb-value.css",
56+
"constant.numeric.color.rgb-value.scss",
57+
"constant.other.rgb-value.css"
58+
],
4959
"settings": {
5060
"foreground": "#d4d4d4"
5161
}
@@ -57,7 +67,7 @@
5767
}
5868
},
5969
{
60-
"scope": "entity.name.selector",
70+
"scope": "entity.name.tag.css",
6171
"settings": {
6272
"foreground": "#d7ba7d"
6373
}
@@ -69,7 +79,19 @@
6979
}
7080
},
7181
{
72-
"scope": "entity.other.attribute-name.css",
82+
"scope": [
83+
"entity.other.attribute-name.class.css",
84+
"entity.other.attribute-name.class.mixin.css",
85+
"entity.other.attribute-name.id.css",
86+
"entity.other.attribute-name.parent-selector.css",
87+
"entity.other.attribute-name.pseudo-class.css",
88+
"entity.other.attribute-name.pseudo-element.css",
89+
90+
"source.css.less entity.other.attribute-name.id",
91+
92+
"entity.other.attribute-name.attribute.scss",
93+
"entity.other.attribute-name.scss"
94+
],
7395
"settings": {
7496
"foreground": "#d7ba7d"
7597
}
@@ -130,7 +152,9 @@
130152
},
131153
{
132154
"name": "brackets of XML/HTML tags",
133-
"scope": "punctuation.definition.tag",
155+
"scope": [
156+
"punctuation.definition.tag"
157+
],
134158
"settings": {
135159
"foreground": "#808080"
136160
}
@@ -203,7 +227,10 @@
203227
},
204228
{
205229
"name": "JavaScript string interpolation ${}",
206-
"scope": "string.template-expression",
230+
"scope": [
231+
"punctuation.definition.template-expression.begin.ts",
232+
"punctuation.definition.template-expression.end.ts"
233+
],
207234
"settings": {
208235
"foreground": "#569cd6"
209236
}
@@ -265,7 +292,7 @@
265292
},
266293
{
267294
"name": "coloring of the TS this",
268-
"scope": "variable.this",
295+
"scope": "variable.language.this",
269296
"settings": {
270297
"foreground": "#569cd6"
271298
}

‎extensions/theme-defaults/themes/light_plus.json‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,28 @@
1919
"support.class",
2020
"support.type",
2121
"entity.name.type",
22+
"entity.name.class",
23+
2224
"storage.type.cs",
25+
"storage.type.generic.cs",
26+
"storage.type.modifier.cs",
27+
"storage.type.variable.cs",
28+
29+
"storage.type.annotation.java",
30+
"storage.type.generic.java",
2331
"storage.type.java",
24-
"entity.other.inherited-class"
32+
"storage.type.object.array.java",
33+
"storage.type.primitive.array.java",
34+
"storage.type.primitive.java",
35+
"storage.type.token.java",
36+
37+
"storage.type.groovy",
38+
"storage.type.annotation.groovy",
39+
"storage.type.parameters.groovy",
40+
"storage.type.generic.groovy",
41+
"storage.type.object.array.groovy",
42+
"storage.type.primitive.array.groovy",
43+
"storage.type.primitive.groovy"
2544
],
2645
"settings": {
2746
"foreground": "#267f99"
@@ -51,40 +70,40 @@
5170
{
5271
"name": "Variable and parameter name",
5372
"scope": [
54-
"variable.parameter",
5573
"variable",
56-
"variable.name",
74+
"meta.definition.variable.name",
5775
"support.variable"
5876
],
5977
"settings": {
6078
"foreground": "#001080"
6179
}
6280
},
6381
{
64-
"name": "Object keys, TS gammar specific",
65-
"scope": "object-literal.member.key",
82+
"name": "Object keys, TS grammar specific",
83+
"scope": [
84+
"meta.object-literal.key",
85+
"meta.object-literal.key entity.name.function"
86+
],
6687
"settings": {
6788
"foreground": "#001080"
6889
}
6990
},
7091
{
7192
"name": "CSS property value",
7293
"scope": [
73-
"support.property-value",
74-
"constant.rgb-value",
75-
"support.property-value.scss",
76-
"constant.rgb-value.scss"
94+
"constant.other.color.rgb-value.css",
95+
"constant.other.rgb-value.css",
96+
"meta.property-value.css support.function",
97+
"meta.property-value.css support",
98+
99+
"constant.numeric.color.rgb-value.scss",
100+
"constant.rgb-value.scss",
101+
"meta.property-value.scss support.function",
102+
"meta.property-value.scss support"
77103
],
78104
"settings": {
79105
"foreground": "#0451a5"
80106
}
81-
},
82-
{
83-
"name": "JSX Tag names, workaround for flattening match with function",
84-
"scope": "entity.name.function.tag",
85-
"settings": {
86-
"foreground": "#800000"
87-
}
88107
}
89108
]
90109
}

0 commit comments

Comments
 (0)