Skip to content

Commit 1bede0d

Browse files
committed
Fix scala#122: Detect new on its own and let the other rules match the name
1 parent 16d49e5 commit 1bede0d

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,13 +729,10 @@ export const scalaTmLanguage: TmLanguage = {
729729
name: 'string.quoted.other constant.character.literal.scala'
730730
},
731731
initialization: {
732-
match: '\\b(new)\\s+([^\\s,\\{\\}\\(\\)\\[\\]]+|(?=\\{))',
732+
match: '\\b(new)\\b',
733733
captures: {
734734
'1': {
735735
name: 'keyword.declaration.scala'
736-
},
737-
'2': {
738-
name: 'entity.name.class'
739736
}
740737
}
741738
},

tests/snap/scala_spec.test.scala.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2328,8 +2328,8 @@
23282328
# ^ source.scala keyword.operator.comparison.scala
23292329
# ^ source.scala
23302330
# ^^^ source.scala keyword.declaration.scala
2331-
# ^ source.scala
2332-
# ^^^^^^^^^^ source.scala entity.name.class
2331+
# ^^^^^^^^^^ source.scala
2332+
# ^ source.scala entity.name.class
23332333
> }
23342334
#^^^^ source.scala
23352335
# ^ source.scala punctuation.section.block.end.scala

tests/unit/#122.test.scala

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// SYNTAX TEST "source.scala"
2+
3+
new Foo
4+
// ^^^ keyword.declaration.scala
5+
// ^^^ entity.name.class
6+
7+
new foo.Foo
8+
// ^^^ keyword.declaration.scala
9+
// ^^^^ source.scala
10+
// ^^^ entity.name.class
11+
12+
new Foo.Foo
13+
// ^^^ keyword.declaration.scala
14+
// ^^^ entity.name.class
15+
// ^ source.scala
16+
// ^^^ entity.name.class
17+

0 commit comments

Comments
 (0)