Skip to content

Commit f3fea07

Browse files
Merge pull request #106 from nicolasstucki/fix-#105
Fix #105: Detect all combinations of dot in numeric literals
2 parents 2e3629c + af1e15d commit f3fea07

File tree

3 files changed

+49
-2
lines changed

3 files changed

+49
-2
lines changed

src/typescript/Scala.tmLanguage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export const scalaTmLanguage: TmLanguage = {
174174
name: 'constant.language.scala'
175175
},
176176
{
177-
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',
177+
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',
178178
name: 'constant.numeric.scala'
179179
},
180180
{

tests/snap/lexical.test.scala.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,9 @@
157157
# ^ source.scala meta.bracket.scala
158158
# ^ source.scala
159159
# ^^^ source.scala constant.numeric.scala
160-
# ^^^^^^^^^ source.scala
160+
# ^^ source.scala
161+
# ^^^^^ source.scala constant.numeric.scala
162+
# ^^ source.scala
161163
# ^^^^^^^^ source.scala constant.numeric.scala
162164
# ^^ source.scala
163165
# ^^^^^^^^ source.scala constant.numeric.scala

tests/unit/#105.test.scala

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// SYNTAX TEST "source.scala"
2+
3+
1e12 1e+34 1e-56 1e12f 1e+34f 1e-56f 1e12d 1e+34d 1e-56d
4+
// ^^^^ constant.numeric.scala
5+
// ^^^^ constant.numeric.scala
6+
// ^^^^^ constant.numeric.scala
7+
// ^^^^^ constant.numeric.scala
8+
// ^^^^^^ constant.numeric.scala
9+
// ^^^^^ constant.numeric.scala
10+
// ^^^^^ constant.numeric.scala
11+
// ^^^^^^ constant.numeric.scala
12+
// ^^^^^^ constant.numeric.scala
13+
14+
1E12 1E+34 1E-56 1E12f 1E+34f 1E-56f 1E12d 1E+34d 1E-56d
15+
// ^^^^ constant.numeric.scala
16+
// ^^^^ constant.numeric.scala
17+
// ^^^^^ constant.numeric.scala
18+
// ^^^^^ constant.numeric.scala
19+
// ^^^^^^ constant.numeric.scala
20+
// ^^^^^ constant.numeric.scala
21+
// ^^^^^ constant.numeric.scala
22+
// ^^^^^^ constant.numeric.scala
23+
// ^^^^^^ constant.numeric.scala
24+
25+
.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
35+
36+
.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

0 commit comments

Comments
 (0)