Skip to content

Commit 61cdd03

Browse files
committed
Merge pull request #118 from anubmat/issue_110
Allowing numbers in exponential notation to be scoped as numeric literals
2 parents 8a30ca9 + 0dc4305 commit 61cdd03

File tree

6 files changed

+43
-4
lines changed

6 files changed

+43
-4
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ repository:
633633

634634
numeric-literal:
635635
name: constant.numeric.ts
636-
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
636+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
637637

638638
boolean-literal:
639639
name: constant.language.boolean.ts

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@
879879
<key>numeric-literal</key>
880880
<dict>
881881
<key>match</key>
882-
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
882+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
883883
<key>name</key>
884884
<string>constant.numeric.ts</string>
885885
</dict>

TypeScriptReact.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ repository:
621621

622622
numeric-literal:
623623
name: constant.numeric.tsx
624-
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b
624+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
625625

626626
boolean-literal:
627627
name: constant.language.boolean.tsx

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@
12451245
<key>numeric-literal</key>
12461246
<dict>
12471247
<key>match</key>
1248-
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?))\b</string>
1248+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(([0-9]+(\.[0-9]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
12491249
<key>name</key>
12501250
<string>constant.numeric.tsx</string>
12511251
</dict>

tests/baselines/Issue110.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[1, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
2+
[2, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
3+
[3, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
4+
[4, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
5+
[5, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
6+
[6, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
7+
[7, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
8+
[8, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
9+
[9, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
10+
[10, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
11+
[11, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
12+
[12, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
13+
[13, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
14+
[14, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
15+
[15, 15]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
16+
[16, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
17+
[16, 16]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
18+
[19, 1]: source.ts comment.block.ts

tests/cases/Issue110.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
let number1 = ^^0x100
2+
let number2 = ^^14e15
3+
let number3 = ^^10.42e41.5
4+
let number4 = ^^4
5+
let number5 = ^^51.4
6+
let number6 = ^^12.4E10.2
7+
let number7 = ^^14.6e+10
8+
let number8 = ^^12E4
9+
let number9 = ^^10e10
10+
let number10 = ^^14e14.5
11+
let number11 = ^^12E-10
12+
let number12 = ^^13.4e-14.2
13+
let number13 = ^^14.12
14+
let number14 = ^^10.2E+4
15+
let number6 = ^^5.00567789e+2
16+
let i = ^^1, j = ^^1e3
17+
18+
/*
19+
^^
20+
Testing comments
21+
*/

0 commit comments

Comments
 (0)