maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update grammars

Browse source
This commit is contained in:
Alex Ross 2020-03-03 16:19:40 +01:00
parent 43ca0e3029
commit 2f6da279c7
10 changed files with 321 additions and 284 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/cpp/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "5b6f67859e895da83dc242b849480ee04ce7ce38"
"commitHash": "7d3fe7ab806374a3b11ddd8ac4f674cdff20a647"
}
},
"license": "MIT",
"version": "1.14.20",
"version": "1.14.23",
"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."
},
{

258
extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

260
extensions/cpp/syntaxes/cpp.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

2
extensions/fsharp/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "ionide/ionide-fsgrammar",
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
"commitHash": "b4f43aafa6f843707410fabe9f904ec04fa536dc"
"commitHash": "af2a9a88639f384c6e5d1340d510dc6fb743d514"
}
},
"license": "MIT",

65
extensions/fsharp/syntaxes/fsharp.tmLanguage.json
View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/ionide/ionide-fsgrammar/commit/b4f43aafa6f843707410fabe9f904ec04fa536dc",
"version": "https://github.com/ionide/ionide-fsgrammar/commit/af2a9a88639f384c6e5d1340d510dc6fb743d514",
"name": "fsharp",
"scopeName": "source.fsharp",
"patterns": [
@ -476,7 +476,7 @@
},
"endCaptures": {
"1": {
"name": "keyword.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"patterns": [
@ -488,12 +488,12 @@
"end": "\\s*(?=(->))",
"beginCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"endCaptures": {
"1": {
"name": "keyword.symbol.fsharp"
"name": "keyword.symbol.arrow.fsharp"
}
},
"patterns": [
@ -545,15 +545,6 @@
}
]
},
{
"name": "comment.block.markdown.fsharp.end",
"match": "^(\\s*\\*\\)$)",
"captures": {
"1": {
"name": "comment.block.fsharp"
}
}
},
{
"name": "comment.block.fsharp",
"begin": "(\\(\\*(?!\\)))",
@ -567,6 +558,20 @@
"1": {
"name": "comment.block.fsharp"
}
},
"patterns": [
{
"include": "#comments"
}
]
},
{
"name": "comment.block.markdown.fsharp.end",
"match": "(\\*\\))",
"captures": {
"1": {
"name": "comment.block.fsharp"
}
}
},
{
@ -592,7 +597,7 @@
"match": "\\(\\)"
},
{
"name": "constant.numeric.floating-point.fsharp",
"name": "constant.numeric.float.fsharp",
"match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
},
{
@ -600,7 +605,7 @@
"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_]*)))"
},
{
"name": "constant.others.fsharp",
"name": "constant.other.fsharp",
"match": "\\b(true|false|null|unit|void)\\b"
}
]
@ -918,7 +923,7 @@
"name": "support.function.attribute.fsharp"
},
"4": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"5": {
"name": "variable.fsharp"
@ -970,7 +975,7 @@
"name": "support.function.attribute.fsharp"
},
"4": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"5": {
"name": "variable.fsharp"
@ -1061,9 +1066,21 @@
},
"keywords": {
"patterns": [
{
"name": "storage.modifier",
"match": "\\b(private|public|internal)\\b"
},
{
"name": "keyword.fsharp",
"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"
"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"
},
{
"name": "keyword.control",
"match": "\\b(match|yield|yield!|with|if|then|else|elif|for|in|return!|return|try|finally|while|do)(?!')\\b"
},
{
"name": "keyword.symbol.new",
"match": "\\b(new)\\b"
},
{
"name": "keyword.symbol.fsharp",
@ -1075,7 +1092,7 @@
"patterns": [
{
"name": "entity.name.section.fsharp",
"begin": "\\b(namespace global)|(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"begin": "\\b(namespace global)|\\b(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]][[:alpha:]0-9'_. ]*)",
"end": "(\\s?=|\\s|$)",
"beginCaptures": {
"1": {
@ -1085,7 +1102,7 @@
"name": "keyword.fsharp"
},
"3": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
},
"4": {
"name": "entity.name.section.fsharp"
@ -1507,7 +1524,7 @@
"name": "keyword.fsharp"
},
"2": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
}
},
"endCaptures": {
@ -1619,7 +1636,7 @@
"name": "keyword.symbol.fsharp"
},
"2": {
"name": "keyword.fsharp"
"name": "storage.modifier.fsharp"
}
}
},
@ -1770,8 +1787,8 @@
"compiler_directives": {
"patterns": [
{
"name": "compiler_directive.fsharp",
"match": "\\s?(#if|#elif|#else|#elseif|#endif|#light|#nowarn)",
"name": "keyword.control.directive.fsharp",
"match": "\\s?(#if|#elif|#elseif|#else|#endif|#light|#nowarn)",
"captures": {}
}
]

4
extensions/fsharp/test/colorize-results/test_fs.json
View file

@ -276,7 +276,7 @@
},
{
"c": "new",
"t": "source.fsharp keyword.fsharp",
"t": "source.fsharp keyword.symbol.new",
"r": {
"dark_plus": "keyword: #569CD6",
"light_plus": "keyword: #0000FF",
@ -1396,4 +1396,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
]

6
extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/8fbbc11a6bb917f287bbe21d0573454020599547",
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/7cf9aa7bb76c55428063383610edc0a631230d58",
"name": "Markdown",
"scopeName": "text.html.markdown",
"patterns": [
@ -2267,7 +2267,7 @@
"name": "meta.other.valid-ampersand.markdown"
},
"bold": {
"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",
"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",
"captures": {
"1": {
"name": "punctuation.definition.bold.markdown"
@ -2412,7 +2412,7 @@
"name": "meta.image.reference.markdown"
},
"italic": {
"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",
"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",
"captures": {
"1": {
"name": "punctuation.definition.italic.markdown"

2
extensions/python/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "MagicStack/MagicPython",
"repositoryUrl": "https://github.com/MagicStack/MagicPython",
"commitHash": "c0f8d514bbe6e9d3899f2b002bcd6971aef5e34b"
"commitHash": "c9b3409deb69acec31bbf7913830e93a046b30cc"
}
},
"license": "MIT",

2
extensions/python/syntaxes/MagicPython.tmLanguage.json
View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/MagicStack/MagicPython/commit/c0f8d514bbe6e9d3899f2b002bcd6971aef5e34b",
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
"name": "MagicPython",
"scopeName": "source.python",
"patterns": [

2
extensions/python/syntaxes/MagicRegExp.tmLanguage.json
View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/MagicStack/MagicPython/commit/361a4964a559481330764a447e7bab88d4f1b01b",
"version": "https://github.com/MagicStack/MagicPython/commit/c9b3409deb69acec31bbf7913830e93a046b30cc",
"name": "MagicRegExp",
"scopeName": "source.regexp.python",
"patterns": [