WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

fix: Separate rules for result keyword with and without <> #36

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

Merged
GordonSmith merged 1 commit into from
May 9, 2025
Merged

fix: Separate rules for result keyword with and without <> #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 26 additions & 37 deletions syntaxes/wit.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,9 @@
{
"include": "#container"
},
{
"include": "#result-base"
},
{
"include": "#identifier"
}
Expand Down Expand Up @@ -1035,6 +1038,11 @@
}
]
},
"result-base": {
"name": "entity.name.type.result.wit",
"comment": "Syntax for result types where both the `ok` and `err` types are `_`. This pattern must be placed after the #container pattern to correctly capture `result<...>`.",
"match": "\\b(result)\\b"
},
"tuple": {
"name": "meta.tuple.ty.wit",
"comment": "Syntax for WIT types such as tuple",
Expand Down Expand Up @@ -1138,7 +1146,7 @@
"result": {
"name": "meta.result.ty.wit",
"comment": "Syntax for WIT types such as result",
"begin": "\\b(result)\\b",
"begin": "\\b(result)\\b(\\<)",
"beginCaptures": {
"1": {
"name": "entity.name.type.result.wit"
Expand All @@ -1152,47 +1160,28 @@
"include": "#comment"
},
{
"name": "meta.inner.result.wit",
"begin": "(\\<)",
"beginCaptures": {
"1": {
"name": "punctuation.brackets.angle.begin.wit"
}
},
"patterns": [
{
"include": "#comment"
},
{
"name": "variable.other.inferred-type.result.wit",
"match": "(?<!\\w)(\\_)(?!\\w)"
},
{
"name": "meta.types.result.wit",
"include": "#types"
},
{
"name": "punctuation.comma.wit",
"match": "(?<!result)\\s*(\\,)"
},
{
"include": "#whitespace"
}
],
"end": "(\\>)",
"applyEndPatternLast": 1,
"endCaptures": {
"1": {
"name": "punctuation.brackets.angle.end.wit"
}
}
"name": "variable.other.inferred-type.result.wit",
"match": "(?<!\\w)(\\_)(?!\\w)"
},
{
"name": "meta.types.list.wit",
"include": "#types"
},
{
"name": "punctuation.comma.wit",
"match": "(?<!result)\\s*(\\,)"
},
{
"include": "#whitespace"
}
],
"end": "((?<=\\n)|(?=\\,)|(?=\\}))",
"applyEndPatternLast": 1
"end": "(\\>)",
"applyEndPatternLast": 1,
"endCaptures": {
"1": {
"name": "punctuation.brackets.angle.end.wit"
}
}
},
"handle": {
"name": "meta.handle.ty.wit",
Expand Down
18 changes: 9 additions & 9 deletions tests/grammar/integration/import-func.wit.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
# ^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit keyword.operator.arrow.skinny.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.whitespace.wit
# ^^^^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit entity.name.type.result.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit punctuation.brackets.angle.begin.wit
# ^^^^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit meta.option.ty.wit entity.name.type.option.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit meta.option.ty.wit punctuation.brackets.angle.begin.wit
# ^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit meta.option.ty.wit entity.name.type.numeric.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit meta.option.ty.wit punctuation.brackets.angle.end.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit punctuation.comma.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit meta.whitespace.wit
# ^^^^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit entity.name.type.string.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.inner.result.wit punctuation.brackets.angle.end.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit punctuation.brackets.angle.begin.wit
# ^^^^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.option.ty.wit entity.name.type.option.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.option.ty.wit punctuation.brackets.angle.begin.wit
# ^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.option.ty.wit entity.name.type.numeric.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.option.ty.wit punctuation.brackets.angle.end.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit punctuation.comma.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit meta.whitespace.wit
# ^^^^^^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit entity.name.type.string.wit
# ^ source.wit meta.world-item.wit meta.import-item.wit meta.function.wit meta.result-list.wit meta.result.ty.wit punctuation.brackets.angle.end.wit
>}
#^ source.wit meta.world-item.wit punctuation.brackets.curly.end.wit
>
Loading
Loading