Skip to content

Commit 1d27380

Browse files
committed
Fix #141: Remove old extension on syntax
1 parent 076a74a commit 1d27380

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,21 +1008,7 @@ export const scalaTmLanguage: TmLanguage = {
10081008
extension: {
10091009
patterns: [
10101010
{
1011-
match: `(extension)\\s+(?:(${plainid})\\s)?\\s*(on|(?=\\{))`,
1012-
captures: {
1013-
'1': {
1014-
name: 'keyword.declaration.scala'
1015-
},
1016-
'2': {
1017-
name: 'entity.name.class'
1018-
},
1019-
'3': {
1020-
name: 'keyword.declaration.scala'
1021-
}
1022-
}
1023-
},
1024-
{
1025-
match: `(extension)\\s+(?=[\\[\\(])`,
1011+
match: `^\\s*(extension)\\s+(?=[\\[\\(])`,
10261012
captures: {
10271013
'1': {
10281014
name: 'keyword.declaration.scala'

tests/unit/#141.test.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// SYNTAX TEST "source.scala"
2+
3+
val language = file.extension {
4+
// ^^^^^^^^^ - keyword.declaration.scala
5+
val language = file extension {
6+
// ^^^^^^^^^ - keyword.declaration.scala
7+
val language = file.extension(
8+
// ^^^^^^^^^ - keyword.declaration.scala
9+
val language = file extension (
10+
// ^^^^^^^^^ - keyword.declaration.scala

tests/unit/extension-on.test.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
// SYNTAX TEST "source.scala"
22

3+
// Old syntax is not supported anymore. We make sure that it is not accidentally highlighted.
4+
35
extension on (x: Rational):
4-
// ^^^^^^^^^ keyword.declaration.scala
5-
// ^^ keyword.declaration.scala
6+
// ^^^^^^^^^ - keyword.declaration.scala
7+
// ^^ - keyword.declaration.scala
68
// ^ variable.parameter.scala
79
// ^^^^^^^^ entity.name.class
810
def > (y: Rational): Boolean = y < x
911

1012
extension Ops on (x: Rational):
11-
// ^^^^^^^^^ keyword.declaration.scala
13+
// ^^^^^^^^^ - keyword.declaration.scala
1214
// ^^^ entity.name.class
13-
// ^^ keyword.declaration.scala
15+
// ^^ - keyword.declaration.scala
1416
// ^ variable.parameter.scala
1517
// ^^^^^^^^ entity.name.class
1618
def > (y: Rational): Boolean = y < x
1719

1820
extension stringOps { }
19-
// ^^^^^^^^^ keyword.declaration.scala
20-
// ^^^^^^^^^ entity.name.class
21+
// ^^^^^^^^^ - keyword.declaration.scala
22+
// ^^^^^^^^^ - entity.name.class
2123

2224
extension { }
23-
// ^^^^^^^^^ keyword.declaration.scala
25+
// ^^^^^^^^^ - keyword.declaration.scala

0 commit comments

Comments
 (0)