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-05-11 14:03:35 +02:00
parent 71bb111a06
commit 884fcedf97
9 changed files with 89 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/perl/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "textmate/perl.tmbundle",
"repositoryUrl": "https://github.com/textmate/perl.tmbundle",
"commitHash": "d9841a0878239fa43f88c640f8d458590f97e8f5"
"commitHash": "80826abe75250286c2a1a07958e50e8551d3f50c"
}
},
"licenseDetail": [

2
extensions/python/cgmanifest.json
View file

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

56
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/0b09c1fca238d22e15ac5712d03f9bf6da626f9c",
"version": "https://github.com/MagicStack/MagicPython/commit/2ca894f270f92e2bc8f09a2ebdcd482fbb3b1074",
"name": "MagicPython",
"scopeName": "source.python",
"patterns": [
@ -31,6 +31,9 @@
{
"include": "#function-declaration"
},
{
"include": "#generator"
},
{
"include": "#statement-keyword"
},
@ -291,6 +294,9 @@
{
"include": "#lambda"
},
{
"include": "#generator"
},
{
"include": "#illegal-operator"
},
@ -306,6 +312,9 @@
{
"include": "#list"
},
{
"include": "#odd-function-call"
},
{
"include": "#round-braces"
},
@ -388,6 +397,9 @@
},
{
"include": "#member-access-base"
},
{
"include": "#member-access-attribute"
}
]
},
@ -413,6 +425,11 @@
}
]
},
"member-access-attribute": {
"comment": "Highlight attribute access in otherwise non-specialized cases.",
"name": "meta.attribute.python",
"match": "(?x)\n \\b ([[:alpha:]_]\\w*) \\b\n"
},
"special-names": {
"name": "constant.other.caps.python",
"match": "(?x)\n \\b\n # we want to see \"enough\", meaning 2 or more upper-case\n # letters in the beginning of the constant\n #\n # for more details refer to:\n # https://github.com/MagicStack/MagicPython/issues/42\n (\n _* [[:upper:]] [_\\d]* [[:upper:]]\n )\n [[:upper:]\\d]* (_\\w*)?\n \\b\n"
@ -459,6 +476,21 @@
}
]
},
"odd-function-call": {
"comment": "A bit obscured function call where there may have been an\narbitrary number of other operations to get the function.\nE.g. \"arr[idx](args)\"\n",
"begin": "(?x)\n (?<= \\] | \\) ) \\s*\n (?=\\()\n",
"end": "(\\))",
"endCaptures": {
"1": {
"name": "punctuation.definition.arguments.end.python"
}
},
"patterns": [
{
"include": "#function-arguments"
}
]
},
"round-braces": {
"begin": "\\(",
"end": "\\)",
@ -1195,6 +1227,26 @@
}
]
},
"generator": {
"comment": "Match \"for ... in\" construct used in generators and for loops to\ncorrectly identify the \"in\" as a control flow keyword.\n",
"begin": "for",
"beginCaptures": {
"0": {
"name": "keyword.control.flow.python"
}
},
"end": "in",
"endCaptures": {
"0": {
"name": "keyword.control.flow.python"
}
},
"patterns": [
{
"include": "#expression"
}
]
},
"function-declaration": {
"name": "meta.function.python",
"begin": "(?x)\n \\s*\n (?:\\b(async) \\s+)? \\b(def)\\s+\n (?=\n [[:alpha:]_][[:word:]]* \\s* \\(\n )\n",
@ -1407,6 +1459,7 @@
"include": "#special-names"
},
{
"name": "meta.indexed-name.python",
"match": "(?x)\n \\b ([[:alpha:]_]\\w*) \\b\n"
}
]
@ -1524,6 +1577,7 @@
},
"function-call": {
"name": "meta.function-call.python",
"comment": "Regular function call of the type \"name(args)\"",
"begin": "(?x)\n \\b(?=\n ([[:alpha:]_]\\w*) \\s* (\\()\n )\n",
"end": "(\\))",
"endCaptures": {

14
extensions/python/test/colorize-results/test-freeze-56377_py.json
View file

@ -254,13 +254,13 @@
},
{
"c": "in",
"t": "source.python keyword.operator.logical.python",
"t": "source.python keyword.control.flow.python",
"r": {
"dark_plus": "keyword.operator.logical.python: #569CD6",
"light_plus": "keyword.operator.logical.python: #0000FF",
"dark_vs": "keyword.operator.logical.python: #569CD6",
"light_vs": "keyword.operator.logical.python: #0000FF",
"hc_black": "keyword.operator.logical.python: #569CD6"
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
{
@ -298,7 +298,7 @@
},
{
"c": "request",
"t": "source.python meta.member.access.python",
"t": "source.python meta.member.access.python meta.attribute.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",

38
extensions/python/test/colorize-results/test_py.json
View file

@ -430,7 +430,7 @@
},
{
"c": "size",
"t": "source.python meta.member.access.python",
"t": "source.python meta.member.access.python meta.attribute.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -914,13 +914,13 @@
},
{
"c": "in",
"t": "source.python meta.function.python meta.function.parameters.python keyword.operator.logical.python",
"t": "source.python meta.function.python meta.function.parameters.python keyword.control.flow.python",
"r": {
"dark_plus": "keyword.operator.logical.python: #569CD6",
"light_plus": "keyword.operator.logical.python: #0000FF",
"dark_vs": "keyword.operator.logical.python: #569CD6",
"light_vs": "keyword.operator.logical.python: #0000FF",
"hc_black": "keyword.operator.logical.python: #569CD6"
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
{
@ -2113,13 +2113,13 @@
},
{
"c": "in",
"t": "source.python keyword.operator.logical.python",
"t": "source.python keyword.control.flow.python",
"r": {
"dark_plus": "keyword.operator.logical.python: #569CD6",
"light_plus": "keyword.operator.logical.python: #0000FF",
"dark_vs": "keyword.operator.logical.python: #569CD6",
"light_vs": "keyword.operator.logical.python: #0000FF",
"hc_black": "keyword.operator.logical.python: #569CD6"
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
{
@ -4544,7 +4544,7 @@
},
{
"c": "fn",
"t": "source.python meta.member.access.python",
"t": "source.python meta.member.access.python meta.attribute.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -4621,7 +4621,7 @@
},
{
"c": "memo",
"t": "source.python meta.member.access.python",
"t": "source.python meta.member.access.python meta.attribute.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -4918,7 +4918,7 @@
},
{
"c": "memo",
"t": "source.python meta.member.access.python",
"t": "source.python meta.member.access.python meta.attribute.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -4973,7 +4973,7 @@
},
{
"c": "memo",
"t": "source.python meta.member.access.python meta.item-access.python",
"t": "source.python meta.member.access.python meta.item-access.python meta.indexed-name.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -5182,7 +5182,7 @@
},
{
"c": "memo",
"t": "source.python meta.member.access.python meta.item-access.python",
"t": "source.python meta.member.access.python meta.item-access.python meta.indexed-name.python",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
@ -6797,4 +6797,4 @@
"hc_black": "string: #CE9178"
}
}
]
]

4
extensions/r/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": {
"name": "Ikuyadeu/vscode-R",
"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
"commitHash": "bc79e9245682ee09b4f0b742b927a37702d91b82"
"commitHash": "e03ba9cb9b19412f48c73ea73deb6746d50bbf23"
}
},
"license": "MIT",
"version": "1.1.8"
"version": "1.3.0"
}
],
"version": 1

12
extensions/r/syntaxes/r.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/Ikuyadeu/vscode-R/commit/bc79e9245682ee09b4f0b742b927a37702d91b82",
"version": "https://github.com/Ikuyadeu/vscode-R/commit/e03ba9cb9b19412f48c73ea73deb6746d50bbf23",
"name": "R",
"scopeName": "source.r",
"patterns": [
@ -168,20 +168,12 @@
"match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%o%|%x%|\\^)",
"name": "keyword.operator.arithmetic.r"
},
{
"match": "<=|>=",
"name": "keyword.operator.comparison.r"
},
{
"match": "==",
"name": "keyword.operator.comarison.r"
},
{
"match": "(:=|<-|<<-|->|->>)",
"name": "keyword.operator.assignment.r"
},
{
"match": "(!=|<>|<|>|%in%)",
"match": "(==|<=|>=|!=|<>|<|>|%in%)",
"name": "keyword.operator.comparison.r"
},
{

2
extensions/sql/cgmanifest.json
View file

@ -6,7 +6,7 @@
"git": {
"name": "Microsoft/vscode-mssql",
"repositoryUrl": "https://github.com/Microsoft/vscode-mssql",
"commitHash": "a542fe96780e6b274adb281810d419a512fb5bb4"
"commitHash": "37a22725186b5b481b2882a78c7b9fe024c13946"
}
},
"license": "MIT",

2
extensions/sql/syntaxes/sql.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-mssql/commit/a542fe96780e6b274adb281810d419a512fb5bb4",
"version": "https://github.com/Microsoft/vscode-mssql/commit/37a22725186b5b481b2882a78c7b9fe024c13946",
"name": "SQL",
"scopeName": "source.sql",
"patterns": [