ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-14 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

Browse Source
This commit is contained in:
ADS Merger
2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/python/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "MagicStack/MagicPython",
"repositoryUrl": "https://github.com/MagicStack/MagicPython",
"commitHash": "0b09c1fca238d22e15ac5712d03f9bf6da626f9c"
"commitHash": "b4b2e6eb16fee36aea0788bf0aa1853c25f7d276"
}
},
"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/b4b2e6eb16fee36aea0788bf0aa1853c25f7d276",
"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": "\\bfor\\b",
"beginCaptures": {
"0": {
"name": "keyword.control.flow.python"
}
},
"end": "\\bin\\b",
"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": {

16
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",
@@ -565,7 +565,7 @@
"t": "source.python string.quoted.single.python constant.character.escape.python",
"r": {
"dark_plus": "constant.character.escape: #D7BA7D",
"light_plus": "constant.character.escape: #FF0000",
"light_plus": "constant.character.escape: #EE0000",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "constant.character: #569CD6"

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"
}
}
]
]