Skip to content

Fix #62: Do not tag some classes as storage keywords #63

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

Merged
merged 1 commit into from
Oct 7, 2019
Merged

Fix #62: Do not tag some classes as storage keywords #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions src/typescript/Scala.tmLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,24 +113,16 @@ export const scalaTmLanguage: TmLanguage = {
constants: {
patterns: [
{
match: '\\b(false|null|true|Nil|None)\\b',
match: '\\b(false|null|true)\\b',
name: 'constant.language.scala'
},
{
match: '\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.[0-9]+)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?|[0-9]+)([LlFfDd]|UL|ul)?\\b',
name: 'constant.numeric.scala'
},
{
match: '\\b(this|super|self)\\b',
match: '\\b(this|super)\\b',
name: 'variable.language.scala'
},
{
match: '\\b(Unit|Boolean|Byte|Char|Short|Int|Float|Long|Double)\\b',
name: 'storage.type.primitive.scala'
},
{
match: '\\b(String|Symbol)\\b',
name: 'storage.type.scala'
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/Scala.tmLanguage.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions tests/snap/comments.test.scala.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
# ^ source.scala variable.other.declaration.scala
# ^ source.scala keyword.operator.scala
# ^ source.scala
# ^^^ source.scala storage.type.primitive.scala
# ^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
Expand All @@ -80,12 +80,12 @@
# ^ source.scala meta.bracket.scala
# ^ source.scala
# ^ source.scala keyword.operator.scala
# ^^^^^^ source.scala storage.type.primitive.scala
# ^^^^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala
# ^ source.scala keyword.operator.scala
# ^ source.scala
# ^^^^^^ source.scala storage.type.scala
# ^^^^^^ source.scala entity.name.class
# ^ source.scala
# ^ source.scala keyword.operator.comparison.scala
# ^ source.scala
Expand Down Expand Up @@ -277,12 +277,12 @@
# ^^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
# ^ source.scala
# ^^^^^^ source.scala storage.type.scala
# ^^^^^^ source.scala entity.name.class
# ^^ source.scala
# ^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
# ^ source.scala
# ^^^ source.scala storage.type.primitive.scala
# ^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala
# ^ source.scala punctuation.section.block.begin.scala
Expand Down Expand Up @@ -333,12 +333,12 @@
# ^^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
# ^ source.scala
# ^^^^^^ source.scala storage.type.scala
# ^^^^^^ source.scala entity.name.class
# ^^ source.scala
# ^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
# ^ source.scala
# ^^^ source.scala storage.type.primitive.scala
# ^^^ source.scala entity.name.class
# ^ source.scala meta.bracket.scala
# ^ source.scala
# ^ source.scala keyword.operator.comparison.scala
Expand Down Expand Up @@ -382,7 +382,7 @@
# ^^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
# ^ source.scala
# ^^^^^^ source.scala storage.type.scala
# ^^^^^^ source.scala entity.name.class
# ^^ source.scala
# ^^^^^^^^^ source.scala variable.parameter.scala
# ^ source.scala meta.colon.scala
Expand Down
108 changes: 54 additions & 54 deletions tests/snap/scala_spec.test.scala.snap
View file
Open in desktop

Large diffs are not rendered by default.

62 changes: 62 additions & 0 deletions tests/unit/#62.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// SYNTAX TEST "source.scala"

val _ : XYZ = XYZ
// ^^^ keyword.declaration.stable.scala
// ^^^ entity.name.class
// ^^^ entity.name.class

val _ : Unit = Unit
// ^^^ keyword.declaration.stable.scala
// ^^^^ entity.name.class
// ^^^^ entity.name.class

val _ : Boolean = Boolean
// ^^^ keyword.declaration.stable.scala
// ^^^^^^^ entity.name.class
// ^^^^^^^ entity.name.class

val _ : Byte = Byte
// ^^^ keyword.declaration.stable.scala
// ^^^^ entity.name.class
// ^^^^ entity.name.class

val _ : Char = Char
// ^^^ keyword.declaration.stable.scala
// ^^^^ entity.name.class
// ^^^^ entity.name.class

val _ : Short = Short
// ^^^ keyword.declaration.stable.scala
// ^^^^^ entity.name.class
// ^^^^^ entity.name.class

val _ : Int = Int
// ^^^ keyword.declaration.stable.scala
// ^^^ entity.name.class
// ^^^ entity.name.class

val _ : Float = Float
// ^^^ keyword.declaration.stable.scala
// ^^^^^ entity.name.class
// ^^^^^ entity.name.class

val _ : Long = Long
// ^^^ keyword.declaration.stable.scala
// ^^^^ entity.name.class
// ^^^^ entity.name.class

val _ : Double = Double
// ^^^ keyword.declaration.stable.scala
// ^^^^^^ entity.name.class
// ^^^^^^ entity.name.class

val _ : String = String
// ^^^ keyword.declaration.stable.scala
// ^^^^^^ entity.name.class
// ^^^^^^ entity.name.class

val _ : Symbol = Symbol
// ^^^ keyword.declaration.stable.scala
// ^^^^^^ entity.name.class
// ^^^^^^ entity.name.class

22 changes: 11 additions & 11 deletions tests/unit/basic.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
class Stack[A] {
// <----- keyword.declaration.scala
// ^ - keyword.declaration.scala entity.name.class.declaration
// ^^^^^ entity.name.class.declaration
// ^^^^^ entity.name.class.declaration
// ^ source.scala meta.bracket.scala
// ^ entity.name.class
// ^ meta.bracket.scala
// ^ punctuation.section.block.begin.scala
private var elements: List[A] = Nil
//^^^^^^^ storage.modifier.access
//^^^^^^^ storage.modifier.access
// ^^^ keyword.declaration.volatile.scala
// ^^^^^^^^ variable.other.declaration.scala
// ^ keyword.operator.scala
Expand All @@ -19,28 +19,28 @@ class Stack[A] {
// ^ entity.name.class
// ^ meta.bracket.scala
// ^ keyword.operator.comparison.scala
// ^^^ constant.language.scala
// ^^^ entity.name.class
def push(x: A) { elements = x :: elements }
// ^^^ keyword.declaration.scala
// ^^^^ entity.name.function.declaration
// ^ meta.bracket.scala
// ^ variable.parameter.scala
// ^ meta.colon.scala
// ^ meta.bracket.scala
// ^ variable.parameter.scala
// ^ meta.colon.scala
// ^ entity.name.class
// ^ meta.bracket.scala
// ^ meta.bracket.scala
// ^ punctuation.section.block.begin.scala
// ^^^^^^^^ source.scala
// ^ keyword.operator.comparison.scala
// ^ source.scala
// ^ source.scala
// ^^ keyword.operator.scala
// ^^^^^^^^ source.scala
// ^^^^^^^^ source.scala
// ^ punctuation.section.block.end.scala
def peek: A = elements.head
def pop(): A = {
val currentTop = peek
// ^^^ keyword.declaration.stable.scala
// ^^^ keyword.declaration.stable.scala
// ^^^^^^^^^^ variable.other.declaration.scala
// ^ keyword.operator.comparison.scala
// ^ keyword.operator.comparison.scala
// ^^^^ source.scala
elements = elements.tail
currentTop
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/quoted.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

'[ String ]
// ^^ constant.other.quoted.scala
// ^^^^^^ storage.type.scala
// ^^^^^^ entity.name.class
// ^ meta.bracket.scala
18 changes: 9 additions & 9 deletions tests/unit/unicode.identifiers.test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
// ^ meta.bracket.scala
// ^ variable.parameter.scala
// ^ meta.colon.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^^^^^ variable.parameter.scala
// ^ meta.colon.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^^^ keyword.declaration.stable.scala
// ^ variable.other.declaration.scala
// ^ keyword.operator.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^^^ keyword.declaration.stable.scala
// ^^ variable.other.declaration.scala
// ^ keyword.operator.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^ meta.bracket.scala
// ^ punctuation.section.block.begin.scala
def δφξ() = 3
Expand All @@ -39,7 +39,7 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
// ^ meta.bracket.scala
// ^^^^^ variable.parameter.scala
// ^ meta.colon.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^ meta.bracket.scala
// ^ keyword.operator.comparison.scala
// ^^ meta.parentheses.scala meta.bracket.scala
Expand All @@ -49,7 +49,7 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
// ^ meta.bracket.scala
// ^^ variable.parameter.scala
// ^ meta.colon.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^ meta.bracket.scala
// ^ keyword.operator.comparison.scala
// ^^ meta.parentheses.scala meta.bracket.scala
Expand Down Expand Up @@ -83,7 +83,7 @@ case class **(x: Int) {}
// ^ meta.bracket.scala
// ^ variable.parameter.scala
// ^ meta.colon.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
// ^ meta.bracket.scala

trait f_*[A,x] {
Expand All @@ -98,12 +98,12 @@ trait f_*[A,x] {
//^^^^ keyword.declaration.scala
// ^ entity.name.type.declaration
// ^ keyword.operator.comparison.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
type x_* = Int
//^^^^ keyword.declaration.scala
// ^^^ entity.name.type.declaration
// ^ keyword.operator.comparison.scala
// ^^^ storage.type.primitive.scala
// ^^^ entity.name.class
}


Expand Down