Skip to content

Commit 45db52b

Browse files
committed
Update grammars
1 parent 40ae7f0 commit 45db52b

17 files changed

Lines changed: 1429 additions & 482 deletions

File tree

extensions/clojure/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "atom/language-clojure",
88
"repositoryUrl": "https://github.com/atom/language-clojure",
9-
"commitHash": "ecc790326bc8e14220e4d2d72a392a30876c3219"
9+
"commitHash": "de877502aa4a77ccdc2c7f0c9180436aea3effff"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "0.22.6",
13+
"version": "0.22.7",
1414
"description": "The file syntaxes/clojure.tmLanguage.json was derived from the Atom package https://github.com/atom/language-clojure which was originally converted from the TextMate bundle https://github.com/mmcgrana/textmate-clojure."
1515
}
1616
],

extensions/clojure/syntaxes/clojure.tmLanguage.json

Lines changed: 9 additions & 9 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/ecc790326bc8e14220e4d2d72a392a30876c3219",
7+
"version": "https://github.com/atom/language-clojure/commit/de877502aa4a77ccdc2c7f0c9180436aea3effff",
88
"name": "Clojure",
99
"scopeName": "source.clojure",
1010
"patterns": [
@@ -83,7 +83,7 @@
8383
"name": "constant.numeric.ratio.clojure"
8484
},
8585
{
86-
"match": "(-?\\d+[rR][0-9a-zA-Z]+)",
86+
"match": "(-?\\d+[rR]\\w+)",
8787
"name": "constant.numeric.arbitrary-radix.clojure"
8888
},
8989
{
@@ -116,17 +116,17 @@
116116
]
117117
},
118118
"keyword": {
119-
"match": "(?<=(\\s|\\(|\\[|\\{)):[a-zA-Z0-9\\#\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}|\\,))",
119+
"match": "(?<=(\\s|\\(|\\[|\\{)):[\\w\\#\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}|\\,))",
120120
"name": "constant.keyword.clojure"
121121
},
122122
"keyfn": {
123123
"patterns": [
124124
{
125-
"match": "(?<=(\\s|\\(|\\[|\\{))(if(-[-a-z\\?]*)?|when(-[-a-z]*)?|for(-[-a-z]*)?|cond|do|let(-[-a-z\\?]*)?|binding|loop|recur|fn|throw[a-z\\-]*|try|catch|finally|([a-z]*case))(?=(\\s|\\)|\\]|\\}))",
125+
"match": "(?<=(\\s|\\(|\\[|\\{))(if(-[-\\p{Ll}\\?]*)?|when(-[-\\p{Ll}]*)?|for(-[-\\p{Ll}]*)?|cond|do|let(-[-\\p{Ll}\\?]*)?|binding|loop|recur|fn|throw[\\p{Ll}\\-]*|try|catch|finally|([\\p{Ll}]*case))(?=(\\s|\\)|\\]|\\}))",
126126
"name": "storage.control.clojure"
127127
},
128128
{
129-
"match": "(?<=(\\s|\\(|\\[|\\{))(declare-?|(in-)?ns|import|use|require|load|compile|(def[a-z\\-]*))(?=(\\s|\\)|\\]|\\}))",
129+
"match": "(?<=(\\s|\\(|\\[|\\{))(declare-?|(in-)?ns|import|use|require|load|compile|(def[\\p{Ll}\\-]*))(?=(\\s|\\)|\\]|\\}))",
130130
"name": "keyword.control.clojure"
131131
}
132132
]
@@ -309,7 +309,7 @@
309309
"include": "#dynamic-variables"
310310
},
311311
{
312-
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
312+
"match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
313313
"name": "entity.global.clojure"
314314
},
315315
{
@@ -387,7 +387,7 @@
387387
"namespace-symbol": {
388388
"patterns": [
389389
{
390-
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/",
390+
"match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/",
391391
"captures": {
392392
"1": {
393393
"name": "meta.symbol.namespace.clojure"
@@ -399,13 +399,13 @@
399399
"symbol": {
400400
"patterns": [
401401
{
402-
"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
402+
"match": "([\\p{L}\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
403403
"name": "meta.symbol.clojure"
404404
}
405405
]
406406
},
407407
"var": {
408-
"match": "(?<=(\\s|\\(|\\[|\\{)\\#)'[a-zA-Z0-9\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}))",
408+
"match": "(?<=(\\s|\\(|\\[|\\{)\\#)'[\\w\\.\\-\\_\\:\\+\\=\\>\\<\\/\\!\\?\\*]+(?=(\\s|\\)|\\]|\\}))",
409409
"name": "meta.var.clojure"
410410
},
411411
"vector": {

extensions/cpp/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "3fa2a8862b6a06ca381f8e46eb782e5dd014d426"
9+
"commitHash": "dc404ccf4eb08a5f76434e759b519f59051a32e5"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.8.8",
13+
"version": "1.8.13",
1414
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
1515
},
1616
{

0 commit comments

Comments
 (0)