Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile tests for else ifeq|ifneq|... syntax #170888

Merged
merged 4 commits into from
Jan 12, 2023
Merged

Makefile tests for else ifeq|ifneq|... syntax #170888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4be3ab
Makefile tests for `else ifeq|ifneq|...` syntax
fadeevab Jan 9, 2023
30c11ff
Merge branch 'main' into main
alexr00 Jan 10, 2023
9475b36
Merge branch 'main' into main
alexr00 Jan 10, 2023
ac52d0f
Update test
alexr00 Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions extensions/vscode-colorize-tests/test/colorize-fixtures/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ ${info Parentheses () in braces {()}: $(ok)}

ifeq ("${ok}", "skip")
$(ok))}
else ifeq ("${ok}", "skip")
${ok}})
else
$(info Else: ${ok})
endif

result != echo "'$(ok)' $(shell echo "from inlined shell")"
Expand Down
266 changes: 266 additions & 0 deletions extensions/vscode-colorize-tests/test/colorize-results/makefile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3415,6 +3415,118 @@
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "else ifeq",
"t": "source.makefile meta.scope.conditional.makefile keyword.control.else.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",
"dark_plus_experimental": "keyword.control: #C586C0",
"hc_light": "keyword.control: #B5200D",
"light_plus_experimental": "keyword.control: #AF00DB"
}
},
{
"c": " (\"",
"t": "source.makefile meta.scope.conditional.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "${",
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": "ok",
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile variable.other.makefile",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "variable: #9CDCFE",
"dark_plus_experimental": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_plus_experimental": "variable: #001080"
}
},
{
"c": "}",
"t": "source.makefile meta.scope.conditional.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": "\"",
"t": "source.makefile meta.scope.conditional.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": ",",
"t": "source.makefile meta.scope.conditional.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",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": " \"skip\")",
"t": "source.makefile meta.scope.conditional.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": " ",
"t": "source.makefile meta.scope.conditional.makefile",
Expand Down Expand Up @@ -3485,6 +3597,160 @@
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "else",
"t": "source.makefile meta.scope.conditional.makefile keyword.control.else.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",
"dark_plus_experimental": "keyword.control: #C586C0",
"hc_light": "keyword.control: #B5200D",
"light_plus_experimental": "keyword.control: #AF00DB"
}
},
{
"c": " ",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "$(",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile entity.name.function.target.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": "info",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile entity.name.function.target.makefile string.interpolated.makefile meta.scope.function-call.makefile support.function.info.makefile",
"r": {
"dark_plus": "support.function: #DCDCAA",
"light_plus": "support.function: #795E26",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "support.function: #DCDCAA",
"dark_plus_experimental": "support.function: #DCDCAA",
"hc_light": "support.function: #5E2CBC",
"light_plus_experimental": "support.function: #795E26"
}
},
{
"c": " Else",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile entity.name.function.target.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",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": ":",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile punctuation.separator.key-value.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": " ",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "${",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": "ok",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile variable.other.makefile",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "variable: #9CDCFE",
"dark_plus_experimental": "variable: #9CDCFE",
"hc_light": "variable: #001080",
"light_plus_experimental": "variable: #001080"
}
},
{
"c": "}",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile string.interpolated.makefile punctuation.definition.variable.makefile",
"r": {
"dark_plus": "string: #CE9178",
"light_plus": "string: #A31515",
"dark_vs": "string: #CE9178",
"light_vs": "string: #A31515",
"hc_black": "string: #CE9178",
"dark_plus_experimental": "string: #CE9178",
"hc_light": "string: #0F4A85",
"light_plus_experimental": "string: #A31515"
}
},
{
"c": ")",
"t": "source.makefile meta.scope.conditional.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF",
"dark_plus_experimental": "default: #FFFFFFD3",
"hc_light": "default: #292929",
"light_plus_experimental": "default: #000000E4"
}
},
{
"c": "endif",
"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
Expand Down