Update to powershell grammars. Fixes #52956

This commit is contained in:
Martin Aeschlimann
2018-07-09 11:57:24 +02:00
parent 2f041f0a9f
commit d17ceea08e
2 changed files with 472 additions and 254 deletions

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/PowerShell/EditorSyntax/commit/6f5438611c54922ea94c81532a2dcfee72190039",
"version": "https://github.com/PowerShell/EditorSyntax/commit/146e421358945dbfbd24a9dcf56d759bdb0693db",
"name": "PowerShell",
"scopeName": "source.powershell",
"patterns": [
@@ -71,7 +71,17 @@
},
{
"begin": "(?<!')'",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.powershell"
}
},
"end": "'(?!')",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.powershell"
}
},
"name": "string.quoted.single.powershell",
"patterns": [
{
@@ -137,7 +147,7 @@
"begin": "(\\$)(\\()",
"beginCaptures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "punctuation.section.group.begin.powershell"
@@ -170,8 +180,20 @@
"name": "keyword.control.powershell"
},
{
"match": "(?<!\\w)(--%)(?!\\w)",
"name": "keyword.control.powershell"
"begin": "(?<!\\w)(--%)(?!\\w)",
"beginCaptures": {
"1": {
"name": "keyword.control.powershell"
}
},
"end": "$",
"patterns": [
{
"match": ".+",
"name": "string.unquoted.powershell"
}
],
"comment": "This should be moved to the repository at some point."
},
{
"comment": "This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.",
@@ -220,7 +242,7 @@
},
{
"match": "\\|{2}|&{2}|;",
"name": "keyword.other.statement-separator.powershell"
"name": "punctuation.terminator.statement.powershell"
},
{
"match": "&|(?<!\\w)\\.(?= )|`|,|\\|",
@@ -326,7 +348,17 @@
},
{
"begin": "(?<!')'",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.powershell"
}
},
"end": "'(?!')",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.powershell"
}
},
"name": "string.quoted.single.powershell",
"patterns": [
{
@@ -379,7 +411,7 @@
"name": "keyword.operator.documentation.powershell"
}
},
"match": "(?i:\\s*(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
"match": "^(?i:(?:\\s*|#)+(\\.)(COMPONENT|DESCRIPTION|EXAMPLE|EXTERNALHELP|FORWARDHELPCATEGORY|FORWARDHELPTARGETNAME|FUNCTIONALITY|INPUTS|LINK|NOTES|OUTPUTS|REMOTEHELPRUNSPACE|ROLE|SYNOPSIS))",
"name": "comment.documentation.embedded.powershell"
},
{
@@ -464,7 +496,7 @@
"begin": "(\\$)(\\()",
"beginCaptures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "punctuation.section.group.begin.powershell"
@@ -617,11 +649,11 @@
"patterns": [
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "constant.language.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
}
},
"comment": "These are special constants.",
@@ -629,14 +661,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "support.constant.variable.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "These are the other built-in constants.",
@@ -644,14 +676,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "support.constant.automatic.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.",
@@ -659,14 +691,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "variable.language.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "Style preference variables as language variables so that they stand out.",
@@ -674,25 +706,28 @@
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "storage.modifier.scope.powershell"
},
"3": {
"name": "variable.other.readwrite.powershell"
},
"4": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "punctuation.section.braces.begin.powershell"
@@ -700,39 +735,39 @@
"3": {
"name": "storage.modifier.scope.powershell"
},
"4": {
"name": "variable.other.readwrite.powershell"
},
"5": {
"name": "punctuation.section.braces.end.powershell"
},
"6": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "support.variable.drive.powershell"
},
"3": {
"name": "variable.other.readwrite.powershell"
},
"4": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$|@)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "punctuation.section.braces.begin.powershell"
@@ -740,14 +775,11 @@
"3": {
"name": "support.variable.drive.powershell"
},
"4": {
"name": "variable.other.readwrite.powershell"
},
"5": {
"name": "punctuation.section.braces.end.powershell"
},
"6": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$)(\\{)((?:\\p{L}|\\d|_)+:)?([^}]*[^}`])(\\}))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?"
@@ -795,11 +827,11 @@
"patterns": [
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "constant.language.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
}
},
"comment": "These are special constants.",
@@ -807,14 +839,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "support.constant.variable.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "These are the other built-in constants.",
@@ -822,14 +854,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "support.variable.automatic.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "Automatic variables are not constants, but they are read-only...",
@@ -837,14 +869,14 @@
},
{
"captures": {
"1": {
"name": "keyword.other.variable.definition.powershell"
},
"2": {
"0": {
"name": "variable.language.powershell"
},
"1": {
"name": "punctuation.definition.variable.powershell"
},
"3": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"comment": "Style preference variables as language variables so that they stand out.",
@@ -852,62 +884,65 @@
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "storage.modifier.scope.powershell"
},
"3": {
"name": "variable.other.readwrite.powershell"
},
"4": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "storage.modifier.scope.powershell"
},
"3": {
"name": "variable.other.readwrite.powershell"
},
"4": {
"name": "keyword.other.powershell"
},
"5": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$)(\\{)(global|local|private|script|using|workflow):([^}]*[^}`])(\\}))"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "support.variable.drive.powershell"
},
"3": {
"name": "variable.other.readwrite.powershell"
},
"4": {
"name": "entity.name.function.invocation.powershell"
"name": "variable.other.member.powershell"
}
},
"match": "(?i:(\\$)((?:\\p{L}|\\d|_)+:)?((?:\\p{L}|\\d|_)+))"
},
{
"captures": {
"0": {
"name": "variable.other.readwrite.powershell"
},
"1": {
"name": "keyword.other.variable.definition.powershell"
"name": "punctuation.definition.variable.powershell"
},
"2": {
"name": "punctuation.section.braces.begin"
@@ -915,9 +950,6 @@
"3": {
"name": "support.variable.drive.powershell"
},
"4": {
"name": "variable.other.readwrite.powershell"
},
"5": {
"name": "punctuation.section.braces.end"
}
@@ -972,7 +1004,17 @@
},
"doubleQuotedString": {
"begin": "(?<!(?<!`)\")\"",
"beginCaptures": {
"0": {
"name": "punctuation.definition.string.begin.powershell"
}
},
"end": "\"(?!\")",
"endCaptures": {
"0": {
"name": "punctuation.definition.string.end.powershell"
}
},
"name": "string.quoted.double.powershell",
"patterns": [
{