Skip to content

Commit 473c57e

Browse files
alexr00alexr00
authored
Update make grammar (microsoft#154789)
1 parent fe5f1ae commit 473c57e

File tree

3 files changed

+195
-11
lines changed

3 files changed

+195
-11
lines changed

‎extensions/make/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "fadeevab/make.tmbundle",
88
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
9-
"commitHash": "91b724d1ad86fa65e4b240a960311a280b92f971"
9+
"commitHash": "ef0c485afc66445a6cf184dc34f7744306304f1f"
1010
}
1111
},
1212
"licenseDetail": [

‎extensions/make/syntaxes/make.tmLanguage.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/fadeevab/make.tmbundle/commit/91b724d1ad86fa65e4b240a960311a280b92f971",
7+
"version": "https://github.com/fadeevab/make.tmbundle/commit/ef0c485afc66445a6cf184dc34f7744306304f1f",
88
"name": "Makefile",
99
"scopeName": "source.makefile",
1010
"patterns": [
@@ -28,8 +28,12 @@
2828
}
2929
],
3030
"repository": {
31+
"comma": {
32+
"match": ",",
33+
"name": "punctuation.separator.delimeter.comma.makefile"
34+
},
3135
"comment": {
32-
"begin": "(^[ ]+)?(?=#)",
36+
"begin": "(^[ ]+)?((?<!\\\\)(\\\\\\\\)*)(?=#)",
3337
"beginCaptures": {
3438
"1": {
3539
"name": "punctuation.whitespace.comment.leading.makefile"
@@ -206,6 +210,9 @@
206210
"end": "^",
207211
"name": "meta.scope.condition.makefile",
208212
"patterns": [
213+
{
214+
"include": "#comma"
215+
},
209216
{
210217
"include": "#variables"
211218
},
@@ -223,6 +230,9 @@
223230
},
224231
"end": "^",
225232
"patterns": [
233+
{
234+
"include": "#comma"
235+
},
226236
{
227237
"include": "#variables"
228238
},
@@ -490,6 +500,9 @@
490500
"end": "(?=\\)|((?<!\\\\)\\n))",
491501
"name": "meta.scope.function-call.makefile",
492502
"patterns": [
503+
{
504+
"include": "#comma"
505+
},
493506
{
494507
"include": "#variables"
495508
},
@@ -520,6 +533,9 @@
520533
"end": "(?=}|((?<!\\\\)\\n))",
521534
"name": "meta.scope.function-call.makefile",
522535
"patterns": [
536+
{
537+
"include": "#comma"
538+
},
523539
{
524540
"include": "#variables"
525541
},

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

Lines changed: 176 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,31 @@
252252
}
253253
},
254254
{
255-
"c": " second,second",
255+
"c": " second",
256+
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile",
257+
"r": {
258+
"dark_plus": "string: #CE9178",
259+
"light_plus": "string: #A31515",
260+
"dark_vs": "string: #CE9178",
261+
"light_vs": "string: #A31515",
262+
"hc_black": "string: #CE9178",
263+
"hc_light": "string: #0F4A85"
264+
}
265+
},
266+
{
267+
"c": ",",
268+
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
269+
"r": {
270+
"dark_plus": "string: #CE9178",
271+
"light_plus": "string: #A31515",
272+
"dark_vs": "string: #CE9178",
273+
"light_vs": "string: #A31515",
274+
"hc_black": "string: #CE9178",
275+
"hc_light": "string: #0F4A85"
276+
}
277+
},
278+
{
279+
"c": "second",
256280
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile",
257281
"r": {
258282
"dark_plus": "string: #CE9178",
@@ -1572,7 +1596,7 @@
15721596
}
15731597
},
15741598
{
1575-
"c": " undefined,",
1599+
"c": " undefined",
15761600
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile",
15771601
"r": {
15781602
"dark_plus": "string: #CE9178",
@@ -1583,6 +1607,18 @@
15831607
"hc_light": "string: #0F4A85"
15841608
}
15851609
},
1610+
{
1611+
"c": ",",
1612+
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
1613+
"r": {
1614+
"dark_plus": "string: #CE9178",
1615+
"light_plus": "string: #A31515",
1616+
"dark_vs": "string: #CE9178",
1617+
"light_vs": "string: #A31515",
1618+
"hc_black": "string: #CE9178",
1619+
"hc_light": "string: #0F4A85"
1620+
}
1621+
},
15861622
{
15871623
"c": "$(",
15881624
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
@@ -1680,7 +1716,43 @@
16801716
}
16811717
},
16821718
{
1683-
"c": ",0,1",
1719+
"c": ",",
1720+
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
1721+
"r": {
1722+
"dark_plus": "string: #CE9178",
1723+
"light_plus": "string: #A31515",
1724+
"dark_vs": "string: #CE9178",
1725+
"light_vs": "string: #A31515",
1726+
"hc_black": "string: #CE9178",
1727+
"hc_light": "string: #0F4A85"
1728+
}
1729+
},
1730+
{
1731+
"c": "0",
1732+
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile",
1733+
"r": {
1734+
"dark_plus": "string: #CE9178",
1735+
"light_plus": "string: #A31515",
1736+
"dark_vs": "string: #CE9178",
1737+
"light_vs": "string: #A31515",
1738+
"hc_black": "string: #CE9178",
1739+
"hc_light": "string: #0F4A85"
1740+
}
1741+
},
1742+
{
1743+
"c": ",",
1744+
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
1745+
"r": {
1746+
"dark_plus": "string: #CE9178",
1747+
"light_plus": "string: #A31515",
1748+
"dark_vs": "string: #CE9178",
1749+
"light_vs": "string: #A31515",
1750+
"hc_black": "string: #CE9178",
1751+
"hc_light": "string: #0F4A85"
1752+
}
1753+
},
1754+
{
1755+
"c": "1",
16841756
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile",
16851757
"r": {
16861758
"dark_plus": "string: #CE9178",
@@ -1800,7 +1872,31 @@
18001872
}
18011873
},
18021874
{
1803-
"c": " defined,TOP_DIR",
1875+
"c": " defined",
1876+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile",
1877+
"r": {
1878+
"dark_plus": "string: #CE9178",
1879+
"light_plus": "string: #A31515",
1880+
"dark_vs": "string: #CE9178",
1881+
"light_vs": "string: #A31515",
1882+
"hc_black": "string: #CE9178",
1883+
"hc_light": "string: #0F4A85"
1884+
}
1885+
},
1886+
{
1887+
"c": ",",
1888+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
1889+
"r": {
1890+
"dark_plus": "string: #CE9178",
1891+
"light_plus": "string: #A31515",
1892+
"dark_vs": "string: #CE9178",
1893+
"light_vs": "string: #A31515",
1894+
"hc_black": "string: #CE9178",
1895+
"hc_light": "string: #0F4A85"
1896+
}
1897+
},
1898+
{
1899+
"c": "TOP_DIR",
18041900
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile",
18051901
"r": {
18061902
"dark_plus": "string: #CE9178",
@@ -1836,7 +1932,19 @@
18361932
}
18371933
},
18381934
{
1839-
"c": ",0)",
1935+
"c": ",",
1936+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile",
1937+
"r": {
1938+
"dark_plus": "default: #D4D4D4",
1939+
"light_plus": "default: #000000",
1940+
"dark_vs": "default: #D4D4D4",
1941+
"light_vs": "default: #000000",
1942+
"hc_black": "default: #FFFFFF",
1943+
"hc_light": "default: #292929"
1944+
}
1945+
},
1946+
{
1947+
"c": "0)",
18401948
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
18411949
"r": {
18421950
"dark_plus": "default: #D4D4D4",
@@ -2076,7 +2184,31 @@
20762184
}
20772185
},
20782186
{
2079-
"c": " defined,CODIT_DIR",
2187+
"c": " defined",
2188+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile",
2189+
"r": {
2190+
"dark_plus": "string: #CE9178",
2191+
"light_plus": "string: #A31515",
2192+
"dark_vs": "string: #CE9178",
2193+
"light_vs": "string: #A31515",
2194+
"hc_black": "string: #CE9178",
2195+
"hc_light": "string: #0F4A85"
2196+
}
2197+
},
2198+
{
2199+
"c": ",",
2200+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile",
2201+
"r": {
2202+
"dark_plus": "string: #CE9178",
2203+
"light_plus": "string: #A31515",
2204+
"dark_vs": "string: #CE9178",
2205+
"light_vs": "string: #A31515",
2206+
"hc_black": "string: #CE9178",
2207+
"hc_light": "string: #0F4A85"
2208+
}
2209+
},
2210+
{
2211+
"c": "CODIT_DIR",
20802212
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile",
20812213
"r": {
20822214
"dark_plus": "string: #CE9178",
@@ -2112,7 +2244,19 @@
21122244
}
21132245
},
21142246
{
2115-
"c": ",0)",
2247+
"c": ",",
2248+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile",
2249+
"r": {
2250+
"dark_plus": "default: #D4D4D4",
2251+
"light_plus": "default: #000000",
2252+
"dark_vs": "default: #D4D4D4",
2253+
"light_vs": "default: #000000",
2254+
"hc_black": "default: #FFFFFF",
2255+
"hc_light": "default: #292929"
2256+
}
2257+
},
2258+
{
2259+
"c": "0)",
21162260
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
21172261
"r": {
21182262
"dark_plus": "default: #D4D4D4",
@@ -2688,7 +2832,31 @@
26882832
}
26892833
},
26902834
{
2691-
"c": "\", \"skip\")",
2835+
"c": "\"",
2836+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
2837+
"r": {
2838+
"dark_plus": "default: #D4D4D4",
2839+
"light_plus": "default: #000000",
2840+
"dark_vs": "default: #D4D4D4",
2841+
"light_vs": "default: #000000",
2842+
"hc_black": "default: #FFFFFF",
2843+
"hc_light": "default: #292929"
2844+
}
2845+
},
2846+
{
2847+
"c": ",",
2848+
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile",
2849+
"r": {
2850+
"dark_plus": "default: #D4D4D4",
2851+
"light_plus": "default: #000000",
2852+
"dark_vs": "default: #D4D4D4",
2853+
"light_vs": "default: #000000",
2854+
"hc_black": "default: #FFFFFF",
2855+
"hc_light": "default: #292929"
2856+
}
2857+
},
2858+
{
2859+
"c": " \"skip\")",
26922860
"t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile",
26932861
"r": {
26942862
"dark_plus": "default: #D4D4D4",

0 commit comments

Comments
 (0)