Skip to content

Commit 551c71c

Browse files
tgodziktgodzik
committed
bugfix: Remove entity.other.inherited-class.scala
Previously, symbol in inheritance clause would be treated differently than outside it. Now, they are all treated the same. There are three reasons for that change: - most themes don't have a specific color for `entity.other.inherited-class.scala` and it would end up the same color as string - there is no reason to show the same symbol with different color aside from definition/declaration - there is no sensible way to handle `derives A, B, C` or `extends A, B, C` and the first `A` would be colored differently Fixes #239
1 parent 9db075c commit 551c71c

File tree

8 files changed

+38
-38
lines changed

8 files changed

+38
-38
lines changed

‎src/typescript/Scala.tmLanguage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ export const scalaTmLanguage: TmLanguage = {
11591159
name: 'keyword.declaration.scala'
11601160
},
11611161
'2': {
1162-
name: 'entity.other.inherited-class.scala'
1162+
name: 'entity.name.class'
11631163
}
11641164
}
11651165
}

‎syntaxes/Scala.tmLanguage.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎tests/snap/scala_spec.test.scala.snap‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# ^ source.scala
5252
# ^^^^^^^ source.scala keyword.declaration.scala
5353
# ^ source.scala
54-
# ^^^^^^^^^^ source.scala entity.other.inherited-class.scala
54+
# ^^^^^^^^^^ source.scala entity.name.class
5555
# ^ source.scala meta.bracket.scala
5656
# ^ source.scala entity.name.class
5757
# ^ source.scala meta.bracket.scala
@@ -135,7 +135,7 @@
135135
# ^ source.scala
136136
# ^^^^^^^ source.scala keyword.declaration.scala
137137
# ^ source.scala
138-
# ^^^^^^ source.scala entity.other.inherited-class.scala
138+
# ^^^^^^ source.scala entity.name.class
139139
# ^ source.scala
140140
# ^ source.scala punctuation.section.block.begin.scala
141141
> def fly(height: Int @suspendable) = ???
@@ -378,7 +378,7 @@
378378
# ^ source.scala
379379
# ^^^^^^^ source.scala keyword.declaration.scala
380380
# ^ source.scala
381-
# ^ source.scala entity.other.inherited-class.scala
381+
# ^ source.scala entity.name.class
382382
# ^ source.scala meta.bracket.scala
383383
# ^ source.scala entity.name.class
384384
# ^ source.scala meta.bracket.scala
@@ -389,7 +389,7 @@
389389
# ^ source.scala
390390
# ^^^^^^^ source.scala keyword.declaration.scala
391391
# ^ source.scala
392-
# ^ source.scala entity.other.inherited-class.scala
392+
# ^ source.scala entity.name.class
393393
# ^ source.scala meta.bracket.scala
394394
# ^ source.scala entity.name.class
395395
# ^ source.scala meta.bracket.scala
@@ -527,7 +527,7 @@
527527
# ^ source.scala
528528
# ^^^^ source.scala keyword.declaration.scala
529529
# ^ source.scala
530-
# ^^^^^^^^^ source.scala entity.other.inherited-class.scala
530+
# ^^^^^^^^^ source.scala entity.name.class
531531
# ^ source.scala
532532
# ^ source.scala punctuation.section.block.end.scala
533533
>
@@ -982,11 +982,11 @@
982982
# ^ source.scala
983983
# ^^^^^^^ source.scala keyword.declaration.scala
984984
# ^ source.scala
985-
# ^^^^^^^^^^^^^^ source.scala entity.other.inherited-class.scala
985+
# ^^^^^^^^^^^^^^ source.scala entity.name.class
986986
# ^ source.scala
987987
# ^^^^ source.scala keyword.declaration.scala
988988
# ^ source.scala
989-
# ^^^^^^^^^^^^ source.scala entity.other.inherited-class.scala
989+
# ^^^^^^^^^^^^ source.scala entity.name.class
990990
# ^ source.scala
991991
# ^ source.scala punctuation.section.block.begin.scala
992992
# ^^ source.scala
@@ -998,7 +998,7 @@
998998
# ^ source.scala
999999
# ^^^^^^^ source.scala keyword.declaration.scala
10001000
# ^ source.scala
1001-
# ^^^^ source.scala entity.other.inherited-class.scala
1001+
# ^^^^ source.scala entity.name.class
10021002
# ^ source.scala
10031003
# ^ source.scala punctuation.section.block.begin.scala
10041004
# ^ source.scala
@@ -1162,7 +1162,7 @@
11621162
# ^ source.scala
11631163
# ^^^^ source.scala keyword.declaration.scala
11641164
# ^ source.scala
1165-
# ^^^ source.scala entity.other.inherited-class.scala
1165+
# ^^^ source.scala entity.name.class
11661166
# ^ source.scala
11671167
# ^ source.scala keyword.operator.comparison.scala
11681168
# ^ source.scala keyword.operator.comparison.scala
@@ -1276,7 +1276,7 @@
12761276
# ^ source.scala
12771277
# ^^^^^^^ source.scala keyword.declaration.scala
12781278
# ^ source.scala
1279-
# ^^^^ source.scala entity.other.inherited-class.scala
1279+
# ^^^^ source.scala entity.name.class
12801280
>
12811281
>trait Comparable[T <: Comparable[T]] { self: T =>
12821282
#^^^^^ source.scala keyword.declaration.scala
@@ -1396,7 +1396,7 @@
13961396
# ^ source.scala
13971397
# ^^^^^^^ source.scala keyword.declaration.scala
13981398
# ^ source.scala
1399-
# ^^^^ source.scala entity.other.inherited-class.scala
1399+
# ^^^^ source.scala entity.name.class
14001400
# ^ source.scala
14011401
# ^ source.scala punctuation.section.block.begin.scala
14021402
# ^ source.scala
@@ -1978,7 +1978,7 @@
19781978
# ^ source.scala
19791979
# ^^^^^^^ source.scala keyword.declaration.scala
19801980
# ^ source.scala
1981-
# ^^^^^^ source.scala entity.other.inherited-class.scala
1981+
# ^^^^^^ source.scala entity.name.class
19821982
# ^ source.scala meta.bracket.scala
19831983
# ^^^^^^ source.scala entity.name.class
19841984
# ^ source.scala meta.bracket.scala
@@ -2376,7 +2376,7 @@
23762376
# ^ source.scala
23772377
# ^^^^^^^ source.scala keyword.declaration.scala
23782378
# ^ source.scala
2379-
# ^^^ source.scala entity.other.inherited-class.scala
2379+
# ^^^ source.scala entity.name.class
23802380
# ^ source.scala
23812381
# ^ source.scala punctuation.section.block.begin.scala
23822382
> println("Hello World")

‎tests/unit/#124.test.scala‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,64 @@
22

33
def foo(x: A with B, c: C): Int = 0
44
// ^^^^ keyword.declaration.scala
5-
// ^ entity.other.inherited-class.scala
5+
// ^ entity.name.class
66
// ^ source.scala
77

88
class B extends A with B,
99
// ^^^^ keyword.declaration.scala
10-
// ^ entity.other.inherited-class.scala
10+
// ^ entity.name.class
1111
// ^ source.scala
1212

1313
class B extends A with B:
1414
// ^^^^ keyword.declaration.scala
15-
// ^ entity.other.inherited-class.scala
15+
// ^ entity.name.class
1616
// ^ source.scala
1717

1818
class B extends A:
1919
// ^^^^^^^ keyword.declaration.scala
20-
// ^ entity.other.inherited-class.scala
20+
// ^ entity.name.class
2121
// ^ source.scala
2222

2323
class B extends A,
2424
// ^^^^^^^ keyword.declaration.scala
25-
// ^ entity.other.inherited-class.scala
25+
// ^ entity.name.class
2626
// ^ source.scala
2727

2828
class B extends A'
2929
// ^^^^^^^ keyword.declaration.scala
30-
// ^ entity.other.inherited-class.scala
30+
// ^ entity.name.class
3131
// ^ punctuation.definition.character.begin.scala
3232

3333
class B extends A|
3434
// ^^^^^^^ keyword.declaration.scala
35-
// ^ entity.other.inherited-class.scala
35+
// ^ entity.name.class
3636
// ^ source.scala
3737

3838
class B extends A+
3939
// ^^^^^^^ keyword.declaration.scala
40-
// ^ entity.other.inherited-class.scala
40+
// ^ entity.name.class
4141
// ^ source.scala
4242

4343
class B extends A-
4444
// ^^^^^^^ keyword.declaration.scala
45-
// ^ entity.other.inherited-class.scala
45+
// ^ entity.name.class
4646
// ^ source.scala
4747

4848
class B extends A*
4949
// ^^^^^^^ keyword.declaration.scala
50-
// ^ entity.other.inherited-class.scala
50+
// ^ entity.name.class
5151
// ^ source.scala
5252

5353
class B extends A&
5454
// ^^^^^^^ keyword.declaration.scala
55-
// ^ entity.other.inherited-class.scala
55+
// ^ entity.name.class
5656
// ^ source.scala
5757

5858
class B extends A^
5959
// ^^^^^^^ keyword.declaration.scala
60-
// ^ entity.other.inherited-class.scala
60+
// ^ entity.name.class
6161
// ^ source.scala
6262

6363
class B extends `A`
6464
// ^^^^^^^ keyword.declaration.scala
65-
// ^^^ entity.other.inherited-class.scala
65+
// ^^^ entity.name.class

‎tests/unit/#156.test.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
// ^^^^^ keyword.declaration.scala
1111
// ^^^ entity.name.class.declaration
1212
// ^^^^^^^ keyword.declaration.scala
13-
// ^^^ entity.other.inherited-class.scala
13+
// ^^^ entity.name.class
1414
// ^^^^ keyword.declaration.scala
15-
// ^^^ entity.other.inherited-class.scala
15+
// ^^^ entity.name.class
1616

1717
class Foo extends Bar with
1818
// ^^^^^ keyword.declaration.scala
1919
// ^^^ entity.name.class.declaration
2020
// ^^^^^^^ keyword.declaration.scala
21-
// ^^^ entity.other.inherited-class.scala
21+
// ^^^ entity.name.class
2222
// ^^^^ keyword.declaration.scala
2323

2424

@@ -46,7 +46,7 @@
4646
// ^^^ entity.name.class.declaration
4747
// ^ entity.name.class
4848
// ^^^^^^^ keyword.declaration.scala
49-
// ^^ entity.other.inherited-class.scala
49+
// ^^ entity.name.class
5050

5151
enum Opt[+T] derives
5252
// ^^^^ keyword.declaration.scala

‎tests/unit/#77.test.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
class A extends B with NoStackTrace)
55
// ^^^^ keyword.declaration.scala
6-
// ^^^^^^^^^^^^ entity.other.inherited-class.scala
6+
// ^^^^^^^^^^^^ entity.name.class
77
// ^ meta.bracket.scala
88
class A extends B with NoStackTrace}
99
// ^^^^ keyword.declaration.scala
10-
// ^^^^^^^^^^^^ entity.other.inherited-class.scala
10+
// ^^^^^^^^^^^^ entity.name.class
1111
// ^ punctuation.section.block.end.scala
1212
class A extends B with NoStackTrace]
1313
// ^^^^ keyword.declaration.scala
14-
// ^^^^^^^^^^^^ entity.other.inherited-class.scala
14+
// ^^^^^^^^^^^^ entity.name.class
1515
// ^ meta.bracket.scala

‎tests/unit/#84.test.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
// ^^^^^^^^^^^^^^^^^^^^ string.quoted.double.scala
99
// ^ string.quoted.double.scala punctuation.definition.string.end.scala
1010
// ^^^^ keyword.declaration.scala
11-
// ^ entity.other.inherited-class.scala
11+
// ^ entity.name.class

‎tests/unit/enum.test.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// ^^^^ source.scala keyword.control.flow.scala
2020
// ^^^^^^^^ entity.name.class
2121
// ^^^^^^^ keyword.declaration.scala
22-
// ^^^^^^^ entity.other.inherited-class.scala
22+
// ^^^^^^^ entity.name.class
2323
// ^ meta.bracket.scala
2424
// ^ constant.numeric.scala
2525
// ^ meta.bracket.scala
@@ -28,7 +28,7 @@
2828
// ^^^^ source.scala keyword.control.flow.scala
2929
// ^^^^^^^ entity.name.class
3030
// ^^^^^^^ keyword.declaration.scala
31-
// ^^^^^^^ entity.other.inherited-class.scala
31+
// ^^^^^^^ entity.name.class
3232
// ^ meta.bracket.scala
3333
// ^ constant.numeric.scala
3434
// ^ meta.bracket.scala

0 commit comments

Comments
 (0)