Skip to content

Commit a34cb11

Browse files
committed
Add +\- to the list to end the new expression
Fixes #673
1 parent 6e8a383 commit a34cb11

File tree

5 files changed

+82
-3
lines changed

5 files changed

+82
-3
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ repository:
13821382
begin: '{{startOfIdentifier}}(new){{endOfIdentifier}}'
13831383
beginCaptures:
13841384
'1': { name: keyword.operator.new.ts }
1385-
end: (?<=\))|(?=[;),}\]:]|\|\||\&\&|$|({{startOfIdentifier}}new{{endOfIdentifier}})|({{startOfIdentifier}}function((\s+{{identifier}})|(\s*[\(]))))
1385+
end: (?<=\))|(?=[;),}\]:\-\+]|\|\||\&\&|$|({{startOfIdentifier}}new{{endOfIdentifier}})|({{startOfIdentifier}}function((\s+{{identifier}})|(\s*[\(]))))
13861386
patterns:
13871387
- include: '#paren-expression'
13881388
- include: '#class-declaration'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4472,7 +4472,7 @@
44724472
</dict>
44734473
</dict>
44744474
<key>end</key>
4475-
<string>(?&lt;=\))|(?=[;),}\]:]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4475+
<string>(?&lt;=\))|(?=[;),}\]:\-\+]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
44764476
<key>patterns</key>
44774477
<array>
44784478
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4476,7 +4476,7 @@
44764476
</dict>
44774477
</dict>
44784478
<key>end</key>
4479-
<string>(?&lt;=\))|(?=[;),}\]:]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
4479+
<string>(?&lt;=\))|(?=[;),}\]:\-\+]|\|\||\&amp;\&amp;|$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))</string>
44804480
<key>patterns</key>
44814481
<array>
44824482
<dict>

tests/baselines/Issue673.baseline.txt

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
original file
2+
-----------------------------------
3+
+new Date - 1 < 2;
4+
var abc = 'abc';
5+
function abc2() { }
6+
-----------------------------------
7+
8+
Grammar: TypeScript.tmLanguage
9+
-----------------------------------
10+
>+new Date - 1 < 2;
11+
^
12+
source.ts keyword.operator.arithmetic.ts
13+
^^^
14+
source.ts new.expr.ts keyword.operator.new.ts
15+
^
16+
source.ts new.expr.ts
17+
^^^^
18+
source.ts new.expr.ts entity.name.type.ts
19+
^
20+
source.ts new.expr.ts
21+
^
22+
source.ts keyword.operator.arithmetic.ts
23+
^
24+
source.ts
25+
^
26+
source.ts constant.numeric.decimal.ts
27+
^
28+
source.ts
29+
^
30+
source.ts keyword.operator.relational.ts
31+
^
32+
source.ts
33+
^
34+
source.ts constant.numeric.decimal.ts
35+
^
36+
source.ts punctuation.terminator.statement.ts
37+
>var abc = 'abc';
38+
^^^
39+
source.ts meta.var.expr.ts storage.type.ts
40+
^
41+
source.ts meta.var.expr.ts
42+
^^^
43+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
44+
^
45+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
46+
^
47+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
48+
^
49+
source.ts meta.var.expr.ts
50+
^
51+
source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
52+
^^^
53+
source.ts meta.var.expr.ts string.quoted.single.ts
54+
^
55+
source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts
56+
^
57+
source.ts punctuation.terminator.statement.ts
58+
>function abc2() { }
59+
^^^^^^^^
60+
source.ts meta.function.ts storage.type.function.ts
61+
^
62+
source.ts meta.function.ts
63+
^^^^
64+
source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
65+
^
66+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
67+
^
68+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
69+
^
70+
source.ts meta.function.ts
71+
^
72+
source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
73+
^
74+
source.ts meta.function.ts meta.block.ts
75+
^
76+
source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts

tests/cases/Issue673.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
+new Date - 1 < 2;
2+
var abc = 'abc';
3+
function abc2() { }

0 commit comments

Comments
 (0)