Skip to content

Commit 62b9ff2

Browse files
aeschliaeschli
committed
[clojure] update grammar
1 parent 4d329cc commit 62b9ff2

3 files changed

Lines changed: 153 additions & 21 deletions

File tree

‎extensions/clojure/syntaxes/clojure.tmLanguage.json‎

Lines changed: 4 additions & 4 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/atom/language-clojure/commit/71068a45499cace7a69c45e337860ebbc9b7fccc",
7+
"version": "https://github.com/atom/language-clojure/commit/ecc790326bc8e14220e4d2d72a392a30876c3219",
88
"scopeName": "source.clojure",
99
"fileTypes": [
1010
"boot",
@@ -326,7 +326,7 @@
326326
"include": "#dynamic-variables"
327327
},
328328
{
329-
"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
329+
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
330330
"name": "entity.global.clojure"
331331
},
332332
{
@@ -404,7 +404,7 @@
404404
"namespace-symbol": {
405405
"patterns": [
406406
{
407-
"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)/",
407+
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/",
408408
"captures": {
409409
"1": {
410410
"name": "meta.symbol.namespace.clojure"
@@ -416,7 +416,7 @@
416416
"symbol": {
417417
"patterns": [
418418
{
419-
"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
419+
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
420420
"name": "meta.symbol.clojure"
421421
}
422422
]

‎extensions/clojure/test/colorize-results/test_clj.json‎

Lines changed: 145 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@
199199
},
200200
{
201201
"c": "42",
202-
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
202+
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure constant.numeric.long.clojure",
203203
"r": {
204-
"dark_plus": "default: #D4D4D4",
205-
"light_plus": "default: #000000",
206-
"dark_vs": "default: #D4D4D4",
207-
"light_vs": "default: #000000",
208-
"hc_black": "default: #FFFFFF"
204+
"dark_plus": "constant.numeric: #B5CEA8",
205+
"light_plus": "constant.numeric: #09885A",
206+
"dark_vs": "constant.numeric: #B5CEA8",
207+
"light_vs": "constant.numeric: #09885A",
208+
"hc_black": "constant.numeric: #B5CEA8"
209209
}
210210
},
211211
{
@@ -1342,7 +1342,18 @@
13421342
}
13431343
},
13441344
{
1345-
"c": "+ ",
1345+
"c": "+",
1346+
"t": "source.clojure meta.quoted-expression.clojure meta.symbol.clojure",
1347+
"r": {
1348+
"dark_plus": "default: #D4D4D4",
1349+
"light_plus": "default: #000000",
1350+
"dark_vs": "default: #D4D4D4",
1351+
"light_vs": "default: #000000",
1352+
"hc_black": "default: #FFFFFF"
1353+
}
1354+
},
1355+
{
1356+
"c": " ",
13461357
"t": "source.clojure meta.quoted-expression.clojure",
13471358
"r": {
13481359
"dark_plus": "default: #D4D4D4",
@@ -1870,7 +1881,29 @@
18701881
}
18711882
},
18721883
{
1873-
"c": " v ",
1884+
"c": " ",
1885+
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
1886+
"r": {
1887+
"dark_plus": "default: #D4D4D4",
1888+
"light_plus": "default: #000000",
1889+
"dark_vs": "default: #D4D4D4",
1890+
"light_vs": "default: #000000",
1891+
"hc_black": "default: #FFFFFF"
1892+
}
1893+
},
1894+
{
1895+
"c": "v",
1896+
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
1897+
"r": {
1898+
"dark_plus": "default: #D4D4D4",
1899+
"light_plus": "default: #000000",
1900+
"dark_vs": "default: #D4D4D4",
1901+
"light_vs": "default: #000000",
1902+
"hc_black": "default: #FFFFFF"
1903+
}
1904+
},
1905+
{
1906+
"c": " ",
18741907
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
18751908
"r": {
18761909
"dark_plus": "default: #D4D4D4",
@@ -2134,7 +2167,29 @@
21342167
}
21352168
},
21362169
{
2137-
"c": " v ",
2170+
"c": " ",
2171+
"t": "source.clojure meta.expression.clojure",
2172+
"r": {
2173+
"dark_plus": "default: #D4D4D4",
2174+
"light_plus": "default: #000000",
2175+
"dark_vs": "default: #D4D4D4",
2176+
"light_vs": "default: #000000",
2177+
"hc_black": "default: #FFFFFF"
2178+
}
2179+
},
2180+
{
2181+
"c": "v",
2182+
"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
2183+
"r": {
2184+
"dark_plus": "default: #D4D4D4",
2185+
"light_plus": "default: #000000",
2186+
"dark_vs": "default: #D4D4D4",
2187+
"light_vs": "default: #000000",
2188+
"hc_black": "default: #FFFFFF"
2189+
}
2190+
},
2191+
{
2192+
"c": " ",
21382193
"t": "source.clojure meta.expression.clojure",
21392194
"r": {
21402195
"dark_plus": "default: #D4D4D4",
@@ -2310,7 +2365,18 @@
23102365
}
23112366
},
23122367
{
2313-
"c": "v ",
2368+
"c": "v",
2369+
"t": "source.clojure meta.symbol.clojure",
2370+
"r": {
2371+
"dark_plus": "default: #D4D4D4",
2372+
"light_plus": "default: #000000",
2373+
"dark_vs": "default: #D4D4D4",
2374+
"light_vs": "default: #000000",
2375+
"hc_black": "default: #FFFFFF"
2376+
}
2377+
},
2378+
{
2379+
"c": " ",
23142380
"t": "source.clojure",
23152381
"r": {
23162382
"dark_plus": "default: #D4D4D4",
@@ -2431,7 +2497,29 @@
24312497
}
24322498
},
24332499
{
2434-
"c": " m ",
2500+
"c": " ",
2501+
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
2502+
"r": {
2503+
"dark_plus": "default: #D4D4D4",
2504+
"light_plus": "default: #000000",
2505+
"dark_vs": "default: #D4D4D4",
2506+
"light_vs": "default: #000000",
2507+
"hc_black": "default: #FFFFFF"
2508+
}
2509+
},
2510+
{
2511+
"c": "m",
2512+
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
2513+
"r": {
2514+
"dark_plus": "default: #D4D4D4",
2515+
"light_plus": "default: #000000",
2516+
"dark_vs": "default: #D4D4D4",
2517+
"light_vs": "default: #000000",
2518+
"hc_black": "default: #FFFFFF"
2519+
}
2520+
},
2521+
{
2522+
"c": " ",
24352523
"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
24362524
"r": {
24372525
"dark_plus": "default: #D4D4D4",
@@ -2574,7 +2662,29 @@
25742662
}
25752663
},
25762664
{
2577-
"c": " m ",
2665+
"c": " ",
2666+
"t": "source.clojure meta.expression.clojure",
2667+
"r": {
2668+
"dark_plus": "default: #D4D4D4",
2669+
"light_plus": "default: #000000",
2670+
"dark_vs": "default: #D4D4D4",
2671+
"light_vs": "default: #000000",
2672+
"hc_black": "default: #FFFFFF"
2673+
}
2674+
},
2675+
{
2676+
"c": "m",
2677+
"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
2678+
"r": {
2679+
"dark_plus": "default: #D4D4D4",
2680+
"light_plus": "default: #000000",
2681+
"dark_vs": "default: #D4D4D4",
2682+
"light_vs": "default: #000000",
2683+
"hc_black": "default: #FFFFFF"
2684+
}
2685+
},
2686+
{
2687+
"c": " ",
25782688
"t": "source.clojure meta.expression.clojure",
25792689
"r": {
25802690
"dark_plus": "default: #D4D4D4",
@@ -2684,7 +2794,29 @@
26842794
}
26852795
},
26862796
{
2687-
"c": " m ",
2797+
"c": " ",
2798+
"t": "source.clojure meta.expression.clojure",
2799+
"r": {
2800+
"dark_plus": "default: #D4D4D4",
2801+
"light_plus": "default: #000000",
2802+
"dark_vs": "default: #D4D4D4",
2803+
"light_vs": "default: #000000",
2804+
"hc_black": "default: #FFFFFF"
2805+
}
2806+
},
2807+
{
2808+
"c": "m",
2809+
"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
2810+
"r": {
2811+
"dark_plus": "default: #D4D4D4",
2812+
"light_plus": "default: #000000",
2813+
"dark_vs": "default: #D4D4D4",
2814+
"light_vs": "default: #000000",
2815+
"hc_black": "default: #FFFFFF"
2816+
}
2817+
},
2818+
{
2819+
"c": " ",
26882820
"t": "source.clojure meta.expression.clojure",
26892821
"r": {
26902822
"dark_plus": "default: #D4D4D4",

‎extensions/cpp/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"publisher": "vscode",
55
"engines": { "vscode": "*" },
66
"scripts": {
7-
"update-grammar": "node ../../build/npm/update-grammar.js atom/language-c grammars/c.cson ./syntaxes/c.json grammars/c%2B%2B.cson ./syntaxes/c++.json"
7+
"update-grammar": "node ./build/update-grammars.js"
88
},
99
"contributes": {
1010
"languages": [{
@@ -22,16 +22,16 @@
2222
"grammars": [{
2323
"language": "c",
2424
"scopeName": "source.c",
25-
"path": "./syntaxes/c.json"
25+
"path": "./syntaxes/c.tmLanguage.json"
2626
},
2727
{
2828
"language": "cpp",
2929
"scopeName": "source.cpp",
30-
"path": "./syntaxes/c++.json"
30+
"path": "./syntaxes/cpp.tmLanguage.json"
3131
},
3232
{
3333
"scopeName": "source.c.platform",
34-
"path": "./syntaxes/Platform.tmLanguage"
34+
"path": "./syntaxes/platform.tmLanguage.json"
3535
}],
3636
"snippets": [{
3737
"language": "c",

0 commit comments

Comments
 (0)