Makefile test case about the bug fix with "@,-,+" colorizing in the recipe (#72265)
Bug: regex [@-+] means "from @ to +", so "." and "\" was also colorized. Bug is fixed in make.tmbundle, test case is added to vscode. Update make grammar
This commit is contained in:
parent
016921a4d2
commit
6b7c8f3d77
4 changed files with 37 additions and 3 deletions
|
@ -6,7 +6,7 @@
|
||||||
"git": {
|
"git": {
|
||||||
"name": "fadeevab/make.tmbundle",
|
"name": "fadeevab/make.tmbundle",
|
||||||
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
|
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
|
||||||
"commitHash": "21e9108e9dce13b798667806bb105d852ac0a58c"
|
"commitHash": "bd71f44ea55d61be711bd7676e600a7333cc79ea"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"licenseDetail": [
|
"licenseDetail": [
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
|
"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."
|
"Once accepted there, we are happy to receive an update request."
|
||||||
],
|
],
|
||||||
"version": "https://github.com/fadeevab/make.tmbundle/commit/21e9108e9dce13b798667806bb105d852ac0a58c",
|
"version": "https://github.com/fadeevab/make.tmbundle/commit/bd71f44ea55d61be711bd7676e600a7333cc79ea",
|
||||||
"name": "Makefile",
|
"name": "Makefile",
|
||||||
"scopeName": "source.makefile",
|
"scopeName": "source.makefile",
|
||||||
"patterns": [
|
"patterns": [
|
||||||
|
@ -320,7 +320,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"recipe": {
|
"recipe": {
|
||||||
"begin": "^\\t([+-@]*)",
|
"begin": "^\\t([+\\-@]*)",
|
||||||
"beginCaptures": {
|
"beginCaptures": {
|
||||||
"1": {
|
"1": {
|
||||||
"name": "keyword.control.$1.makefile"
|
"name": "keyword.control.$1.makefile"
|
||||||
|
|
|
@ -38,6 +38,7 @@ echo:
|
||||||
@-+-+echo Error will be ignored here; invalidcommand
|
@-+-+echo Error will be ignored here; invalidcommand
|
||||||
# And we can see variables are highlited as supposed to be:
|
# And we can see variables are highlited as supposed to be:
|
||||||
@echo '$(CC) $(shell echo "123") -o $@'
|
@echo '$(CC) $(shell echo "123") -o $@'
|
||||||
|
@-./point-and-slash-should-not-be-highlighted
|
||||||
|
|
||||||
define defined
|
define defined
|
||||||
$(info Checking existance of $(1) $(flavor $(1)))
|
$(info Checking existance of $(1) $(flavor $(1)))
|
||||||
|
|
|
@ -1154,6 +1154,39 @@
|
||||||
"hc_black": "default: #FFFFFF"
|
"hc_black": "default: #FFFFFF"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"c": "\t",
|
||||||
|
"t": "source.makefile meta.scope.recipe.makefile",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": "default: #D4D4D4",
|
||||||
|
"light_plus": "default: #000000",
|
||||||
|
"dark_vs": "default: #D4D4D4",
|
||||||
|
"light_vs": "default: #000000",
|
||||||
|
"hc_black": "default: #FFFFFF"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": "@-",
|
||||||
|
"t": "source.makefile meta.scope.recipe.makefile keyword.control.@-.makefile",
|
||||||
|
"r": {
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"c": "./point-and-slash-should-not-be-highlighted",
|
||||||
|
"t": "source.makefile meta.scope.recipe.makefile",
|
||||||
|
"r": {
|
||||||
|
"dark_plus": "default: #D4D4D4",
|
||||||
|
"light_plus": "default: #000000",
|
||||||
|
"dark_vs": "default: #D4D4D4",
|
||||||
|
"light_vs": "default: #000000",
|
||||||
|
"hc_black": "default: #FFFFFF"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"c": "define",
|
"c": "define",
|
||||||
"t": "source.makefile meta.scope.conditional.makefile keyword.control.define.makefile",
|
"t": "source.makefile meta.scope.conditional.makefile keyword.control.define.makefile",
|
||||||
|
|
Loading…
Reference in a new issue