diff --git a/extensions/make/cgmanifest.json b/extensions/make/cgmanifest.json index 6f4432b66da47e00ea71bccbdc839725dc3be396..ed80096c8ce18d0c188f30c9e76666c2f393e29d 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": "21e9108e9dce13b798667806bb105d852ac0a58c" + "commitHash": "bd71f44ea55d61be711bd7676e600a7333cc79ea" } }, "licenseDetail": [ diff --git a/extensions/make/syntaxes/make.tmLanguage.json b/extensions/make/syntaxes/make.tmLanguage.json index 878e78767e8d14e59eee04c373a2874d9fd56263..f2e43e163ee81555c38a3cba8b449adbb2b3459e 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/21e9108e9dce13b798667806bb105d852ac0a58c", + "version": "https://github.com/fadeevab/make.tmbundle/commit/bd71f44ea55d61be711bd7676e600a7333cc79ea", "name": "Makefile", "scopeName": "source.makefile", "patterns": [ @@ -320,7 +320,7 @@ ] }, "recipe": { - "begin": "^\\t([+-@]*)", + "begin": "^\\t([+\\-@]*)", "beginCaptures": { "1": { "name": "keyword.control.$1.makefile" diff --git a/extensions/make/test/colorize-fixtures/makefile b/extensions/make/test/colorize-fixtures/makefile index 6fbe91275ff605e46a444fb45bb892922875ed3d..7aae1d20f3d3805ba602efa229cb5b4412a0ba74 100644 --- a/extensions/make/test/colorize-fixtures/makefile +++ b/extensions/make/test/colorize-fixtures/makefile @@ -38,6 +38,7 @@ echo: @-+-+echo Error will be ignored here; invalidcommand # And we can see variables are highlited as supposed to be: @echo '$(CC) $(shell echo "123") -o $@' + @-./point-and-slash-should-not-be-highlighted define defined $(info Checking existance of $(1) $(flavor $(1))) diff --git a/extensions/make/test/colorize-results/makefile.json b/extensions/make/test/colorize-results/makefile.json index cd9a6c46e531a48860c09765a42272c7caa78cf2..9f977fcf5f80f4d5a2602ec7a19196ae65ad9c33 100644 --- a/extensions/make/test/colorize-results/makefile.json +++ b/extensions/make/test/colorize-results/makefile.json @@ -1154,6 +1154,39 @@ "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", "t": "source.makefile meta.scope.conditional.makefile keyword.control.define.makefile",