Skip to content

Commit ccb8bbd

Browse files
committed
Fix #125: Highlight literals with dots and exponents
1 parent ec37a5e commit ccb8bbd

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@ export const scalaTmLanguage: TmLanguage = {
187187
name: 'constant.language.scala'
188188
},
189189
{
190-
match: '\\b((0(x|X)[0-9a-fA-F_]*)|(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)|(\\.[0-9][0-9_]*))((e|E)(\\+|-)?[0-9][0-9_]*)?|[0-9][0-9_]*)([LlFfDd]|UL|ul)?\\b',
190+
match: '\\b(0[xX][0-9a-fA-F_]*)\\b',
191+
name: 'constant.numeric.scala'
192+
},
193+
{
194+
match: '((([0-9][0-9_]*(\\.[0-9][0-9_]*)?)|(\\.[0-9][0-9_]*))([eE](\\+|-)?[0-9][0-9_]*)?|[0-9][0-9_]*)([LlFfDd]|UL|ul)?\\b',
191195
name: 'constant.numeric.scala'
192196
},
193197
{

tests/snap/lexical.test.scala.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163
# ^^^^^^^^ source.scala constant.numeric.scala
164164
# ^^ source.scala
165165
# ^^^^^^^^ source.scala constant.numeric.scala
166-
# ^^^ source.scala
167-
# ^ source.scala constant.numeric.scala
166+
# ^^ source.scala
167+
# ^^ source.scala constant.numeric.scala
168168
# ^^ source.scala
169169
# ^ source.scala meta.bracket.scala
170170
>}

tests/unit/#105.test.scala

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
// ^^^^^^ constant.numeric.scala
2424

2525
.1e12 .1e+34 .1e-56 .1e12f .1e+34f .1e-56f .1e12d .1e+34d .1e-56d
26-
// ^^^^ constant.numeric.scala
27-
// ^^^^^ constant.numeric.scala
28-
// ^^^^^ constant.numeric.scala
29-
// ^^^^^ constant.numeric.scala
30-
// ^^^^^^ constant.numeric.scala
31-
// ^^^^^^ constant.numeric.scala
32-
// ^^^^^ constant.numeric.scala
33-
// ^^^^^^ constant.numeric.scala
34-
// ^^^^^^ constant.numeric.scala
26+
// ^^^^^ constant.numeric.scala
27+
// ^^^^^^ constant.numeric.scala
28+
// ^^^^^^ constant.numeric.scala
29+
// ^^^^^^ constant.numeric.scala
30+
// ^^^^^^^ constant.numeric.scala
31+
// ^^^^^^^ constant.numeric.scala
32+
// ^^^^^^ constant.numeric.scala
33+
// ^^^^^^^ constant.numeric.scala
34+
// ^^^^^^^ constant.numeric.scala
3535

3636
.1E12 .1E+34 .1E-56 .1E12f .1E+34f .1E-56f .1E12d .1E+34d .1E-56d
37-
// ^^^^ constant.numeric.scala
38-
// ^^^^^ constant.numeric.scala
39-
// ^^^^^ constant.numeric.scala
40-
// ^^^^^ constant.numeric.scala
41-
// ^^^^^^ constant.numeric.scala
42-
// ^^^^^^ constant.numeric.scala
43-
// ^^^^^ constant.numeric.scala
44-
// ^^^^^^ constant.numeric.scala
45-
// ^^^^^^ constant.numeric.scala
37+
// ^^^^^ constant.numeric.scala
38+
// ^^^^^^ constant.numeric.scala
39+
// ^^^^^^ constant.numeric.scala
40+
// ^^^^^^ constant.numeric.scala
41+
// ^^^^^^^ constant.numeric.scala
42+
// ^^^^^^^ constant.numeric.scala
43+
// ^^^^^^ constant.numeric.scala
44+
// ^^^^^^^ constant.numeric.scala
45+
// ^^^^^^^ constant.numeric.scala

tests/unit/lexical.test.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object FloatingPointLiterals {
3939
// ^^^ constant.numeric.scala
4040
// ^^^^^^^^ constant.numeric.scala
4141
// ^^^^^^^^ constant.numeric.scala
42-
// ^ constant.numeric.scala
42+
// ^^ constant.numeric.scala
4343
}
4444

4545
object Boolean {

0 commit comments

Comments
 (0)