Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-25 04:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update make grammar (#154789)

Browse Source
This commit is contained in:
Alex Ross
2022-07-11 12:14:40 +02:00
committed by GitHub
parent fe5f1aef61
commit 473c57e261
3 changed files with 195 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/make/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "fadeevab/make.tmbundle",
"repositoryUrl": "https://github.com/fadeevab/make.tmbundle",
"commitHash": "91b724d1ad86fa65e4b240a960311a280b92f971"
"commitHash": "ef0c485afc66445a6cf184dc34f7744306304f1f"
}
},
"licenseDetail": [

20
extensions/make/syntaxes/make.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/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"
@@ -206,6 +210,9 @@
"end": "^",
"name": "meta.scope.condition.makefile",
"patterns": [
{
"include": "#comma"
},
{
"include": "#variables"
},
@@ -223,6 +230,9 @@
},
"end": "^",
"patterns": [
{
"include": "#comma"
},
{
"include": "#variables"
},
@@ -490,6 +500,9 @@
"end": "(?=\\)|((?<!\\\\)\\n))",
"name": "meta.scope.function-call.makefile",
"patterns": [
{
"include": "#comma"
},
{
"include": "#variables"
},
@@ -520,6 +533,9 @@
"end": "(?=}|((?<!\\\\)\\n))",
"name": "meta.scope.function-call.makefile",
"patterns": [
{
"include": "#comma"
},
{
"include": "#variables"
},

184
extensions/vscode-colorize-tests/test/colorize-results/makefile.json
View File

@@ -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",
@@ -1583,6 +1607,18 @@
"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 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",
@@ -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",