Skip to content

Commit 80c21d1

Browse files
tanishikingGordonSmith
authored andcommitted
fix: comments on type aliases are now recognized as comments
fix #38
1 parent e4c1ca6 commit 80c21d1

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

syntaxes/wit.tmLanguage.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,9 @@
720720
"name": "meta.types.type-item.wit",
721721
"include": "#types"
722722
},
723+
{
724+
"include": "#comment"
725+
},
723726
{
724727
"include": "#whitespace"
725728
}

tests/grammar/integration/issue573.wit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ interface types-interface {
3434
// type aliases are allowed to primitive types and additionally here are some
3535
// examples of other types
3636
type t1 = u32
37-
type t2 = tuple<u32, u64>
37+
type t2 = tuple<u32, u64> // tuple
3838
type t3 = string
39-
type t4 = option<u32>
39+
type t4 = option<u32> // option
4040
/// no "ok" type
4141
type t5 = result<_, errno> // no "ok" type
4242
type t6 = result<string> // no "err" type

tests/grammar/integration/issue573.wit.snap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
# ^ source.wit meta.interface-item.wit meta.type-item.wit punctuation.equal.wit
162162
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.whitespace.wit
163163
# ^^^ source.wit meta.interface-item.wit meta.type-item.wit entity.name.type.numeric.wit
164-
> type t2 = tuple<u32, u64>
164+
> type t2 = tuple<u32, u64> // tuple
165165
#^^ source.wit meta.interface-item.wit meta.whitespace.wit
166166
# ^^^^ source.wit meta.interface-item.wit meta.type-item.wit keyword.declaration.type.type-item.wit storage.type.wit
167167
# ^ source.wit meta.interface-item.wit meta.type-item.wit
@@ -176,6 +176,7 @@
176176
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.tuple.ty.wit meta.whitespace.wit
177177
# ^^^ source.wit meta.interface-item.wit meta.type-item.wit meta.tuple.ty.wit entity.name.type.numeric.wit
178178
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.tuple.ty.wit punctuation.brackets.angle.end.wit
179+
# ^^^^^^^^^ source.wit meta.interface-item.wit meta.type-item.wit comment.line.double-slash.wit
179180
> type t3 = string
180181
#^^ source.wit meta.interface-item.wit meta.whitespace.wit
181182
# ^^^^ source.wit meta.interface-item.wit meta.type-item.wit keyword.declaration.type.type-item.wit storage.type.wit
@@ -185,7 +186,7 @@
185186
# ^ source.wit meta.interface-item.wit meta.type-item.wit punctuation.equal.wit
186187
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.whitespace.wit
187188
# ^^^^^^ source.wit meta.interface-item.wit meta.type-item.wit entity.name.type.string.wit
188-
> type t4 = option<u32>
189+
> type t4 = option<u32> // option
189190
#^^ source.wit meta.interface-item.wit meta.whitespace.wit
190191
# ^^^^ source.wit meta.interface-item.wit meta.type-item.wit keyword.declaration.type.type-item.wit storage.type.wit
191192
# ^ source.wit meta.interface-item.wit meta.type-item.wit
@@ -197,6 +198,7 @@
197198
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.option.ty.wit punctuation.brackets.angle.begin.wit
198199
# ^^^ source.wit meta.interface-item.wit meta.type-item.wit meta.option.ty.wit entity.name.type.numeric.wit
199200
# ^ source.wit meta.interface-item.wit meta.type-item.wit meta.option.ty.wit punctuation.brackets.angle.end.wit
201+
# ^^^^^^^^^^ source.wit meta.interface-item.wit meta.type-item.wit comment.line.double-slash.wit
200202
> /// no "ok" type
201203
#^^^^^ source.wit meta.interface-item.wit comment.line.documentation.wit
202204
# ^^^^^^^^^^^^^ source.wit meta.interface-item.wit comment.line.documentation.wit

tests/grammar/unit/interface.wit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ interface another-interface {
8383
// ^^^^^^^^^^^^^^^^^ entity.name.type.id.interface-item.wit
8484
// ^ meta.interface-item.wit punctuation.brackets.curly.begin.wit
8585

86-
type my-type = string
86+
type my-type = string // comment
8787
//^^^^ keyword.declaration.type.type-item.wit
8888
// ^^^^^^^ entity.name.type.id.type-item.wit
8989
// ^ meta.type-item.wit punctuation.equal.wit
9090
// ^^^^^^ entity.name.type.string.wit
91+
// ^^^^^^^^^^ comment.line.double-slash.wit
9192

9293
record my-record {
9394
//^^^^^^ keyword.declaration.record.record-item.wit

0 commit comments

Comments
 (0)