Skip to content

Commit 86b17b0

Browse files
nicolasstuckiPanAeon
authored andcommitted
Fix scala#122: Detect new on its own and let the other rules match the name
1 parent 29b8512 commit 86b17b0

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -743,13 +743,10 @@ export const scalaTmLanguage: TmLanguage = {
743743
name: 'string.quoted.other constant.character.literal.scala'
744744
},
745745
initialization: {
746-
match: '\\b(new)\\s+([^\\s,\\{\\}\\(\\)\\[\\]]+|(?=\\{))',
746+
match: '\\b(new)\\b',
747747
captures: {
748748
'1': {
749749
name: 'keyword.declaration.scala'
750-
},
751-
'2': {
752-
name: 'entity.name.class'
753750
}
754751
}
755752
},

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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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

0 commit comments

Comments
 (0)