Skip to content

feat: add include keyword to wit grammar #17

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
eduardomourar merged 2 commits into from
Jul 3, 2023
Merged

feat: add include keyword to wit grammar #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f59802
feat: add include keyword to wit grammar
eduardomourar Jul 2, 2023
1ec2679
chore: add grammar tests for include keyword
eduardomourar Jul 2, 2023
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
64 changes: 64 additions & 0 deletions syntaxes/wit.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,70 @@
"end": "\\s*(?<=\\n)",
"applyEndPatternLast": 1
},
{
"name": "meta.include-item.wit",
"comment": "Syntax for WIT like `include \"use-path\"`",
"begin": "\\s*\\b(include)\\s+([^\\s]+)\\s*",
"beginCaptures": {
"1": {
"name": "keyword.control.include.include-item.wit"
},
"2": {
"name": "meta.use-path.include-item.wit",
"patterns": [
{
"include": "#use-path"
}
]
}
},
"patterns": [
{
"name": "meta.with.include-item.wit",
"begin": "\\b(with)\\b\\s+(\\{)\\s*",
"beginCaptures": {
"1": {
"name": "keyword.control.with.include-item.wit"
},
"2": {
"name": "punctuation.brackets.curly.begin.wit"
}
},
"patterns": [
{
"include": "#comment"
},
{
"name": "meta.include-names-item.wit",
"match": "\\s*([^\\s]+)\\s+(as)\\s+([^\\s\\,]+)\\s*",
"captures": {
"1": {
"name": "variable.other.id.include-names-item.wit"
},
"2": {
"name": "keyword.control.as.include-names-item.wit"
},
"3": {
"name": "entity.name.type.include-names-item.wit"
}
}
},
{
"name": "punctuation.comma.wit",
"match": "\\s*(\\,)"
}
],
"end": "\\s*(\\})\\s*",
"endCaptures": {
"1": {
"name": "punctuation.brackets.curly.end.wit"
}
}
}
],
"end": "\\s*(?<=\\n)",
"applyEndPatternLast": 1
},
{
"include": "#use"
},
Expand Down
18 changes: 18 additions & 0 deletions tests/grammar/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ default world some-world {
// ^^^^^^^^^^ entity.name.type.id.world-item.wit
// ^ meta.world-item.wit punctuation.brackets.curly.begin.wit

include foo
//^^^^^^^ keyword.control.include.include-item.wit
// ^^^ meta.use-path.include-item.wit entity.name.namespace.id.use-path.wit

import filesystem: filesystem.filesystem
//^^^^^^ keyword.control.import.import-item.wit
// ^^^^^^^^^^ variable.other.id.import-item.wit
Expand Down Expand Up @@ -51,6 +55,20 @@ world another-world {
// ^^^^^^^^^^^^^ entity.name.type.id.world-item.wit
// ^ meta.world-item.wit punctuation.brackets.curly.begin.wit

include bar with { a as a1, b as b1 }
//^^^^^^^ keyword.control.include.include-item.wit
// ^^^ meta.use-path.include-item.wit entity.name.namespace.id.use-path.wit
// ^^^^ keyword.control.with.include-item.wit
// ^ meta.with.include-item.wit punctuation.brackets.curly.begin.wit
// ^ variable.other.id.include-names-item.wit
// ^^ keyword.control.as.include-names-item.wit
// ^^ entity.name.type.include-names-item.wit
// ^ meta.with.include-item.wit punctuation.comma.wit
// ^ variable.other.id.include-names-item.wit
// ^^ keyword.control.as.include-names-item.wit
// ^^ entity.name.type.include-names-item.wit
// ^ meta.with.include-item.wit punctuation.brackets.curly.end.wit

use pkg.path.{id}
//^^^ keyword.other.use.use-item.wit
// ^^^ variable.language.self.use-path.wit
Expand Down