Skip to content

Consistent highlight on derives' qualIds #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Consistent highlight on derives' qualIds #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e50367
Consistent highlight on derives' qualIds
tanishiking Aug 3, 2022
6cf16c6
assign entity.name.class for `A, B` in `extends A, B`
tanishiking Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ export const scalaTmLanguage: TmLanguage = {
{
include: '#inheritance'
},
{
include: '#derives'
},
{
include: '#extension'
},
Expand Down Expand Up @@ -1153,7 +1156,7 @@ export const scalaTmLanguage: TmLanguage = {
inheritance: {
patterns: [
{
match: `\\b(extends|with|derives)\\b\\s*(${idUpper}|${backQuotedId}|(?=\\([^\\)]+=>)|(?=${plainid})|(?="))?`,
match: `\\b(with)\\b\\s*(${idUpper}|${backQuotedId}|(?=\\([^\\)]+=>)|(?=${plainid})|(?="))?`,
captures: {
'1': {
name: 'keyword.declaration.scala'
Expand All @@ -1165,6 +1168,18 @@ export const scalaTmLanguage: TmLanguage = {
}
]
},
derives: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Derives is a soft keyword, wouldn't it be an issue when someone uses it as an identifier?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it would be a problem.

derives, if it appears after an extension clause or after the name and possibly parameters of a class, trait, object, or enum definition.
https://docs.scala-lang.org/scala3/reference/soft-modifier.html

However, I don't think there's a way for regex to check the previous clause is "extension clause or after the name and possibly parameters of a class, trait, object, or enum definition."
(for using, we could determine it's after ( by positive-lookahead though).

patterns: [
{
match: '\\b(derives|extends)\\b',
captures: {
1: {
name: 'keyword.declaration.scala'
}
}
}
]
},
extension: {
patterns: [
{
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/Scala.tmLanguage.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion tests/snap/scala_spec.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,9 @@ object Annotations {

@UserDefinedUpperCase def x
@userDefinedLowerCase def y
}
}

enum A:
case B, c, D

enum A extends B, C with D derives E, F
57 changes: 46 additions & 11 deletions tests/snap/scala_spec.test.scala.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^^^^^^^ source.scala entity.other.inherited-class.scala
# ^^^^^^^^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
Expand Down Expand Up @@ -135,7 +135,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^^^ source.scala entity.other.inherited-class.scala
# ^^^^^^ source.scala entity.name.class
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
> def fly(height: Int @suspendable) = ???
Expand Down Expand Up @@ -378,7 +378,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.other.inherited-class.scala
# ^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
Expand All @@ -389,7 +389,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.other.inherited-class.scala
# ^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
Expand Down Expand Up @@ -982,7 +982,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^^^^^^^^^^^ source.scala entity.other.inherited-class.scala
# ^^^^^^^^^^^^^^ source.scala entity.name.class
# ^ source.scala
# ^^^^ source.scala keyword.declaration.scala
# ^ source.scala
Expand All @@ -998,7 +998,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^ source.scala entity.other.inherited-class.scala
# ^^^^ source.scala entity.name.class
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
# ^ source.scala
Expand Down Expand Up @@ -1276,7 +1276,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^ source.scala entity.other.inherited-class.scala
# ^^^^ source.scala entity.name.class
>
>trait Comparable[T <: Comparable[T]] { self: T =>
#^^^^^ source.scala keyword.declaration.scala
Expand Down Expand Up @@ -1396,7 +1396,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^ source.scala entity.other.inherited-class.scala
# ^^^^ source.scala entity.name.class
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
# ^ source.scala
Expand Down Expand Up @@ -1978,7 +1978,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^^^^ source.scala entity.other.inherited-class.scala
# ^^^^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^^^^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
Expand Down Expand Up @@ -2376,7 +2376,7 @@
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^^^ source.scala entity.other.inherited-class.scala
# ^^^ source.scala entity.name.class
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
> println("Hello World")
Expand Down Expand Up @@ -2528,4 +2528,39 @@
# ^ source.scala
# ^ source.scala entity.name.function.declaration
>}
#^ source.scala punctuation.section.block.end.scala
#^ source.scala punctuation.section.block.end.scala
>
>enum A:
#^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.name.class.declaration
# ^ source.scala keyword.operator.scala
> case B, c, D
#^^ source.scala
# ^^^^ source.scala keyword.control.flow.scala
# ^ source.scala
# ^ source.scala entity.name.class
# ^^^^^ source.scala
# ^ source.scala entity.name.class
>
>enum A extends B, C with D derives E, F
#^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.name.class.declaration
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.name.class
# ^^ source.scala
# ^ source.scala entity.name.class
# ^ source.scala
# ^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.other.inherited-class.scala
# ^ source.scala
# ^^^^^^^ source.scala keyword.declaration.scala
# ^ source.scala
# ^ source.scala entity.name.class
# ^^ source.scala
# ^ source.scala entity.name.class
>
20 changes: 10 additions & 10 deletions tests/unit/#124.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,49 @@ class B extends A with B:

class B extends A:
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A,
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A'
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ punctuation.definition.character.begin.scala

class B extends A|
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A+
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A-
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A*
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A&
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends A^
// ^^^^^^^ keyword.declaration.scala
// ^ entity.other.inherited-class.scala
// ^ source.scala entity.name.class
// ^ source.scala

class B extends `A`
// ^^^^^^^ keyword.declaration.scala
// ^^^ entity.other.inherited-class.scala
// ^ source.scala
23 changes: 20 additions & 3 deletions tests/unit/#156.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,23 @@
// ^^^^^ keyword.declaration.scala
// ^^^ entity.name.class.declaration
// ^^^^^^^ keyword.declaration.scala
// ^^^ entity.other.inherited-class.scala
// ^^^ source.scala entity.name.class
// ^^^^ keyword.declaration.scala
// ^^^ entity.other.inherited-class.scala

class Foo extends Bar, Baz
// ^^^^^ keyword.declaration.scala
// ^^^ entity.name.class.declaration
// ^^^^^^^ keyword.declaration.scala
// ^^^ entity.name.class
// ^^ source.scala
// ^^^ source.scala entity.name.class

class Foo extends Bar with
// ^^^^^ keyword.declaration.scala
// ^^^ entity.name.class.declaration
// ^^^^^^^ keyword.declaration.scala
// ^^^ entity.other.inherited-class.scala
// ^^^ source.scala entity.name.class
// ^^^^ keyword.declaration.scala


Expand Down Expand Up @@ -46,10 +54,19 @@
// ^^^ entity.name.class.declaration
// ^ entity.name.class
// ^^^^^^^ keyword.declaration.scala
// ^^ entity.other.inherited-class.scala
// ^^ entity.name.class

enum Opt[+T] derives
// ^^^^ keyword.declaration.scala
// ^^^ entity.name.class.declaration
// ^ entity.name.class
// ^^^^^^^ keyword.declaration.scala

enum Opt[+T] derives Eq, Foo
// ^^^^ keyword.declaration.scala
// ^^^ entity.name.class.declaration
// ^ entity.name.class
// ^^^^^^^ keyword.declaration.scala
// ^^ source.scala entity.name.class
// ^^ source.scala
// ^^^ source.scala entity.name.class
4 changes: 2 additions & 2 deletions tests/unit/enum.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// ^^^^ source.scala keyword.control.flow.scala
// ^^^^^^^^ entity.name.class
// ^^^^^^^ keyword.declaration.scala
// ^^^^^^^ entity.other.inherited-class.scala
// ^^^^^^^ source.scala entity.name.class
// ^ meta.bracket.scala
// ^ constant.numeric.scala
// ^ meta.bracket.scala
Expand All @@ -28,7 +28,7 @@
// ^^^^ source.scala keyword.control.flow.scala
// ^^^^^^^ entity.name.class
// ^^^^^^^ keyword.declaration.scala
// ^^^^^^^ entity.other.inherited-class.scala
// ^^^^^^^ source.scala entity.name.class
// ^ meta.bracket.scala
// ^ constant.numeric.scala
// ^ meta.bracket.scala