Skip to content

Commit 2f6da27

Browse files
alexr00alexr00
committed
Update grammars
1 parent 43ca0e3 commit 2f6da27

10 files changed

Lines changed: 213 additions & 176 deletions

File tree

‎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": "5b6f67859e895da83dc242b849480ee04ce7ce38"
9+
"commitHash": "7d3fe7ab806374a3b11ddd8ac4f674cdff20a647"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.14.20",
13+
"version": "1.14.23",
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
{

‎extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json‎

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

‎extensions/cpp/syntaxes/cpp.tmLanguage.json‎

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

‎extensions/fsharp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "ionide/ionide-fsgrammar",
88
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
9-
"commitHash": "b4f43aafa6f843707410fabe9f904ec04fa536dc"
9+
"commitHash": "af2a9a88639f384c6e5d1340d510dc6fb743d514"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/fsharp/syntaxes/fsharp.tmLanguage.json‎

Lines changed: 41 additions & 24 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/ionide/ionide-fsgrammar/commit/b4f43aafa6f843707410fabe9f904ec04fa536dc",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/af2a9a88639f384c6e5d1340d510dc6fb743d514",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -476,7 +476,7 @@
476476
},
477477
"endCaptures": {
478478
"1": {
479-
"name": "keyword.fsharp"
479+
"name": "keyword.symbol.arrow.fsharp"
480480
}
481481
},
482482
"patterns": [
@@ -488,12 +488,12 @@
488488
"end": "\\s*(?=(->))",
489489
"beginCaptures": {
490490
"1": {
491-
"name": "keyword.symbol.fsharp"
491+
"name": "keyword.symbol.arrow.fsharp"
492492
}
493493
},
494494
"endCaptures": {
495495
"1": {
496-
"name": "keyword.symbol.fsharp"
496+
"name": "keyword.symbol.arrow.fsharp"
497497
}
498498
},
499499
"patterns": [
@@ -545,15 +545,6 @@
545545
}
546546
]
547547
},
548-
{
549-
"name": "comment.block.markdown.fsharp.end",
550-
"match": "^(\\s*\\*\\)$)",
551-
"captures": {
552-
"1": {
553-
"name": "comment.block.fsharp"
554-
}
555-
}
556-
},
557548
{
558549
"name": "comment.block.fsharp",
559550
"begin": "(\\(\\*(?!\\)))",
@@ -567,6 +558,20 @@
567558
"1": {
568559
"name": "comment.block.fsharp"
569560
}
561+
},
562+
"patterns": [
563+
{
564+
"include": "#comments"
565+
}
566+
]
567+
},
568+
{
569+
"name": "comment.block.markdown.fsharp.end",
570+
"match": "(\\*\\))",
571+
"captures": {
572+
"1": {
573+
"name": "comment.block.fsharp"
574+
}
570575
}
571576
},
572577
{
@@ -592,15 +597,15 @@
592597
"match": "\\(\\)"
593598
},
594599
{
595-
"name": "constant.numeric.floating-point.fsharp",
600+
"name": "constant.numeric.float.fsharp",
596601
"match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
597602
},
598603
{
599604
"name": "constant.numeric.integer.nativeint.fsharp",
600605
"match": "\\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))"
601606
},
602607
{
603-
"name": "constant.others.fsharp",
608+
"name": "constant.other.fsharp",
604609
"match": "\\b(true|false|null|unit|void)\\b"
605610
}
606611
]
@@ -918,7 +923,7 @@
918923
"name": "support.function.attribute.fsharp"
919924
},
920925
"4": {
921-
"name": "keyword.fsharp"
926+
"name": "storage.modifier.fsharp"
922927
},
923928
"5": {
924929
"name": "variable.fsharp"
@@ -970,7 +975,7 @@
970975
"name": "support.function.attribute.fsharp"
971976
},
972977
"4": {
973-
"name": "keyword.fsharp"
978+
"name": "storage.modifier.fsharp"
974979
},
975980
"5": {
976981
"name": "variable.fsharp"
@@ -1061,9 +1066,21 @@
10611066
},
10621067
"keywords": {
10631068
"patterns": [
1069+
{
1070+
"name": "storage.modifier",
1071+
"match": "\\b(private|public|internal)\\b"
1072+
},
10641073
{
10651074
"name": "keyword.fsharp",
1066-
"match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
1075+
"match": "\\b(private|to|public|internal|function|class|exception|delegate|of|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b"
1076+
},
1077+
{
1078+
"name": "keyword.control",
1079+
"match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b"
1080+
},
1081+
{
1082+
"name": "keyword.symbol.new",
1083+
"match": "\\b(new)\\b"
10671084
},
10681085
{
10691086
"name": "keyword.symbol.fsharp",
@@ -1075,7 +1092,7 @@
10751092
"patterns": [
10761093
{
10771094
"name": "entity.name.section.fsharp",
1078-
"begin": "\\b(namespace global)|(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
1095+
"begin": "\\b(namespace global)|\\b(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
10791096
"end": "(\\s?=|\\s|$)",
10801097
"beginCaptures": {
10811098
"1": {
@@ -1085,7 +1102,7 @@
10851102
"name": "keyword.fsharp"
10861103
},
10871104
"3": {
1088-
"name": "keyword.fsharp"
1105+
"name": "storage.modifier.fsharp"
10891106
},
10901107
"4": {
10911108
"name": "entity.name.section.fsharp"
@@ -1507,7 +1524,7 @@
15071524
"name": "keyword.fsharp"
15081525
},
15091526
"2": {
1510-
"name": "keyword.fsharp"
1527+
"name": "storage.modifier.fsharp"
15111528
}
15121529
},
15131530
"endCaptures": {
@@ -1619,7 +1636,7 @@
16191636
"name": "keyword.symbol.fsharp"
16201637
},
16211638
"2": {
1622-
"name": "keyword.fsharp"
1639+
"name": "storage.modifier.fsharp"
16231640
}
16241641
}
16251642
},
@@ -1770,8 +1787,8 @@
17701787
"compiler_directives": {
17711788
"patterns": [
17721789
{
1773-
"name": "compiler_directive.fsharp",
1774-
"match": "\\s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)",
1790+
"name": "keyword.control.directive.fsharp",
1791+
"match": "\\s?(#if|#elif|#elseif|#else|#endif|#light|#nowarn)",
17751792
"captures": {}
17761793
}
17771794
]

‎extensions/fsharp/test/colorize-results/test_fs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
},
277277
{
278278
"c": "new",
279-
"t": "source.fsharp keyword.fsharp",
279+
"t": "source.fsharp keyword.symbol.new",
280280
"r": {
281281
"dark_plus": "keyword: #569CD6",
282282
"light_plus": "keyword: #0000FF",
@@ -1396,4 +1396,4 @@
13961396
"hc_black": "default: #FFFFFF"
13971397
}
13981398
}
1399-
]
1399+
]

‎extensions/markdown-basics/syntaxes/markdown.tmLanguage.json‎

Lines changed: 3 additions & 3 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/microsoft/vscode-markdown-tm-grammar/commit/8fbbc11a6bb917f287bbe21d0573454020599547",
7+
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/7cf9aa7bb76c55428063383610edc0a631230d58",
88
"name": "Markdown",
99
"scopeName": "text.html.markdown",
1010
"patterns": [
@@ -2267,7 +2267,7 @@
22672267
"name": "meta.other.valid-ampersand.markdown"
22682268
},
22692269
"bold": {
2270-
"begin": "(?x) (\\*\\*(?=\\w)|(?<!\\w)\\*\\*|(?<!\\w)\\b__)(?=\\S) (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whitespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whitespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=__\\b|\\*\\*)\\1 # Close\n)\n",
2270+
"begin": "(?x) (?<open>(\\*\\*(?=\\w)|(?<!\\w)\\*\\*|(?<!\\w)\\b__))(?=\\S) (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whitespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whitespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | (?!(?<=\\S)\\k<open>). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=__\\b|\\*\\*)\\k<open> # Close\n)\n",
22712271
"captures": {
22722272
"1": {
22732273
"name": "punctuation.definition.bold.markdown"
@@ -2412,7 +2412,7 @@
24122412
"name": "meta.image.reference.markdown"
24132413
},
24142414
"italic": {
2415-
"begin": "(?x) (\\*(?=\\w)|(?<!\\w)\\*|(?<!\\w)\\b_)(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whtiespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whtiespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | \\1\\1 # Must be bold closer\n | (?!(?<=\\S)\\1). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=_\\b|\\*)\\1 # Close\n )\n",
2415+
"begin": "(?x) (?<open>(\\*(?=\\w)|(?<!\\w)\\*|(?<!\\w)\\b_))(?=\\S) # Open\n (?=\n (\n <[^>]*+> # HTML tags\n | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n # Raw\n | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+ # Escapes\n | \\[\n (\n (?<square> # Named group\n [^\\[\\]\\\\] # Match most chars\n | \\\\. # Escaped chars\n | \\[ \\g<square>*+ \\] # Nested brackets\n )*+\n \\]\n (\n ( # Reference Link\n [ ]? # Optional space\n \\[[^\\]]*+\\] # Ref name\n )\n | ( # Inline Link\n \\( # Opening paren\n [ \\t]*+ # Optional whtiespace\n <?(.*?)>? # URL\n [ \\t]*+ # Optional whtiespace\n ( # Optional Title\n (?<title>['\"])\n (.*?)\n \\k<title>\n )?\n \\)\n )\n )\n )\n | \\k<open>\\k<open> # Must be bold closer\n | (?!(?<=\\S)\\k<open>). # Everything besides\n # style closer\n )++\n (?<=\\S)(?=_\\b|\\*)\\k<open> # Close\n )\n",
24162416
"captures": {
24172417
"1": {
24182418
"name": "punctuation.definition.italic.markdown"

‎extensions/python/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "MagicStack/MagicPython",
88
"repositoryUrl": "https://github.com/MagicStack/MagicPython",
9-
"commitHash": "c0f8d514bbe6e9d3899f2b002bcd6971aef5e34b"
9+
"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/python/syntaxes/MagicPython.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
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/MagicStack/MagicPython/commit/c0f8d514bbe6e9d3899f2b002bcd6971aef5e34b",
7+
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
88
"name": "MagicPython",
99
"scopeName": "source.python",
1010
"patterns": [

‎extensions/python/syntaxes/MagicRegExp.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
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/MagicStack/MagicPython/commit/361a4964a559481330764a447e7bab88d4f1b01b",
7+
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
88
"name": "MagicRegExp",
99
"scopeName": "source.regexp.python",
1010
"patterns": [

0 commit comments

Comments
 (0)