diff options
author | Alex Ross <alros@microsoft.com> | 2022-07-11 13:14:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-11 13:14:40 +0300 |
commit | 473c57e261f50c74fcd8f7bb3d40b39ef09931c6 (patch) | |
tree | 0aff481794e3e2ee7ee4a395ff066076e8c379ce /extensions | |
parent | fe5f1aef61160d49b6bc97f34c430aa020c6d789 (diff) |
Update make grammar (#154789)
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/make/cgmanifest.json | 2 | ||||
-rw-r--r-- | extensions/make/syntaxes/make.tmLanguage.json | 20 | ||||
-rw-r--r-- | extensions/vscode-colorize-tests/test/colorize-results/makefile.json | 184 |
3 files changed, 195 insertions, 11 deletions
diff --git a/extensions/make/cgmanifest.json b/extensions/make/cgmanifest.json index 35b8bc4c52e..44cfa092993 100644 --- a/extensions/make/cgmanifest.json +++ b/extensions/make/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "fadeevab/make.tmbundle", "repositoryUrl": "https://github.com/fadeevab/make.tmbundle", - "commitHash": "91b724d1ad86fa65e4b240a960311a280b92f971" + "commitHash": "ef0c485afc66445a6cf184dc34f7744306304f1f" } }, "licenseDetail": [ diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json index e08936b2d22..c8771d3a247 100644 --- a/extensions/make/syntaxes/make.tmLanguage.json +++ b/extensions/make/syntaxes/make.tmLanguage.json @@ -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/fadeevab/make.tmbundle/commit/91b724d1ad86fa65e4b240a960311a280b92f971", + "version": "https://github.com/fadeevab/make.tmbundle/commit/ef0c485afc66445a6cf184dc34f7744306304f1f", "name": "Makefile", "scopeName": "source.makefile", "patterns": [ @@ -28,8 +28,12 @@ } ], "repository": { + "comma": { + "match": ",", + "name": "punctuation.separator.delimeter.comma.makefile" + }, "comment": { - "begin": "(^[ ]+)?(?=#)", + "begin": "(^[ ]+)?((?<!\\\\)(\\\\\\\\)*)(?=#)", "beginCaptures": { "1": { "name": "punctuation.whitespace.comment.leading.makefile" @@ -207,6 +211,9 @@ "name": "meta.scope.condition.makefile", "patterns": [ { + "include": "#comma" + }, + { "include": "#variables" }, { @@ -224,6 +231,9 @@ "end": "^", "patterns": [ { + "include": "#comma" + }, + { "include": "#variables" }, { @@ -491,6 +501,9 @@ "name": "meta.scope.function-call.makefile", "patterns": [ { + "include": "#comma" + }, + { "include": "#variables" }, { @@ -521,6 +534,9 @@ "name": "meta.scope.function-call.makefile", "patterns": [ { + "include": "#comma" + }, + { "include": "#variables" }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json index a3abf6bf666..741b37eaa15 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json @@ -252,7 +252,31 @@ } }, { - "c": " second,second", + "c": " second", + "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "second", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1572,7 +1596,7 @@ } }, { - "c": " undefined,", + "c": " undefined", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1584,6 +1608,18 @@ } }, { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { "c": "$(", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile punctuation.definition.variable.makefile", "r": { @@ -1680,7 +1716,43 @@ } }, { - "c": ",0,1", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "0", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "1", "t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1800,7 +1872,31 @@ } }, { - "c": " defined,TOP_DIR", + "c": " defined", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "TOP_DIR", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -1836,7 +1932,19 @@ } }, { - "c": ",0)", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "0)", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", @@ -2076,7 +2184,31 @@ } }, { - "c": " defined,CODIT_DIR", + "c": " defined", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "string: #CE9178", + "light_plus": "string: #A31515", + "dark_vs": "string: #CE9178", + "light_vs": "string: #A31515", + "hc_black": "string: #CE9178", + "hc_light": "string: #0F4A85" + } + }, + { + "c": "CODIT_DIR", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile string.interpolated.makefile meta.scope.function-call.makefile string.interpolated.makefile meta.scope.function-call.makefile", "r": { "dark_plus": "string: #CE9178", @@ -2112,7 +2244,19 @@ } }, { - "c": ",0)", + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": "0)", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", @@ -2688,7 +2832,31 @@ } }, { - "c": "\", \"skip\")", + "c": "\"", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": ",", + "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile punctuation.separator.delimeter.comma.makefile", + "r": { + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "hc_light": "default: #292929" + } + }, + { + "c": " \"skip\")", "t": "source.makefile meta.scope.conditional.makefile meta.scope.condition.makefile", "r": { "dark_plus": "default: #D4D4D4", |