Skip to content

Commit e454a44

Browse files
committed
Solving Issue #28
1 parent 9a1c040 commit e454a44

File tree

6 files changed

+21
-4
lines changed

6 files changed

+21
-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]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
636+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([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]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
882+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([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]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b
624+
match: \b(?<=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([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]+)?))([eE]([+-]?)[0-9]+(\.[0-9]+)?)?)\b</string>
1248+
<string>\b(?&lt;=[^$])((0(x|X)[0-9a-fA-F]+)|(0(o|O)[0-7]+)|(0(b|B)(0|1)+)|(([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/Issue28.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[4, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
2+
[5, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
3+
[6, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
4+
[7, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
5+
[8, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
6+
[9, 9]: source.ts meta.var.expr.ts meta.var-single-variable.expr.ts constant.numeric.ts
7+
[10, 1]: source.ts

tests/cases/Issue28.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
/* Testing octals */
3+
4+
var x = ^^123;
5+
var y = ^^0x123;
6+
var z = ^^0b10101;
7+
var z = ^^0B00000;
8+
var j = ^^0o474774;
9+
var w = ^^0O767;
10+
^^

0 commit comments

Comments
 (0)