Skip to content

Commit 3989859

Browse files
sheetalkamatsheetalkamat
committed
Fix new expression scoping
Fixes #844
1 parent 8975bb1 commit 3989859

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+290
-111
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,9 +1534,7 @@ repository:
15341534
'1': { name: keyword.operator.new.ts }
15351535
end: (?<=\))|(?={{lookAheadEndOfType}}|({{startOfIdentifier}}new{{endOfIdentifier}})|({{startOfIdentifier}}function((\s+{{identifier}})|(\s*[\(]))))
15361536
patterns:
1537-
- include: '#paren-expression'
1538-
- include: '#class-declaration'
1539-
- include: '#type'
1537+
- include: '#expression'
15401538

15411539
instanceof-expr:
15421540
begin: '{{startOfIdentifier}}(instanceof){{endOfIdentifier}}'

‎TypeScript.tmLanguage‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4930,15 +4930,7 @@
49304930
<array>
49314931
<dict>
49324932
<key>include</key>
4933-
<string>#paren-expression</string>
4934-
</dict>
4935-
<dict>
4936-
<key>include</key>
4937-
<string>#class-declaration</string>
4938-
</dict>
4939-
<dict>
4940-
<key>include</key>
4941-
<string>#type</string>
4933+
<string>#expression</string>
49424934
</dict>
49434935
</array>
49444936
</dict>

‎TypeScriptReact.tmLanguage‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4954,15 +4954,7 @@
49544954
<array>
49554955
<dict>
49564956
<key>include</key>
4957-
<string>#paren-expression</string>
4958-
</dict>
4959-
<dict>
4960-
<key>include</key>
4961-
<string>#class-declaration</string>
4962-
</dict>
4963-
<dict>
4964-
<key>include</key>
4965-
<string>#type</string>
4957+
<string>#expression</string>
49664958
</dict>
49674959
</array>
49684960
</dict>

‎tests/baselines/Abstracts.baseline.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Grammar: TypeScript.tmLanguage
252252
^
253253
source.ts meta.var.expr.ts new.expr.ts
254254
^^^
255-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
255+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts entity.name.function.ts
256256
^
257257
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
258258
^

‎tests/baselines/Comments.baseline.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2081,7 +2081,7 @@ Grammar: TypeScript.tmLanguage
20812081
^
20822082
source.ts meta.var.expr.ts new.expr.ts
20832083
^^^^^^
2084-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2084+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
20852085
^
20862086
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
20872087
^
@@ -2108,7 +2108,7 @@ Grammar: TypeScript.tmLanguage
21082108
^
21092109
source.ts meta.var.expr.ts new.expr.ts
21102110
^^^^^^
2111-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2111+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
21122112
^
21132113
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
21142114
^
@@ -2135,7 +2135,7 @@ Grammar: TypeScript.tmLanguage
21352135
^^
21362136
source.ts meta.var.expr.ts new.expr.ts comment.block.ts punctuation.definition.comment.ts
21372137
^^^^^^
2138-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2138+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
21392139
^
21402140
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
21412141
^
@@ -2171,7 +2171,7 @@ Grammar: TypeScript.tmLanguage
21712171
^
21722172
source.ts meta.var.expr.ts new.expr.ts
21732173
^^^^^^
2174-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2174+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
21752175
^
21762176
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
21772177
^
@@ -2204,7 +2204,7 @@ Grammar: TypeScript.tmLanguage
22042204
^
22052205
source.ts meta.var.expr.ts new.expr.ts
22062206
^^^^^^
2207-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2207+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
22082208
^
22092209
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
22102210
^
@@ -2237,7 +2237,7 @@ Grammar: TypeScript.tmLanguage
22372237
^
22382238
source.ts meta.var.expr.ts new.expr.ts
22392239
^^^^^^
2240-
source.ts meta.var.expr.ts new.expr.ts entity.name.type.ts
2240+
source.ts meta.var.expr.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
22412241
^
22422242
source.ts meta.var.expr.ts new.expr.ts meta.brace.round.ts
22432243
^

‎tests/baselines/FunctionMethodOverloads.baseline.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ Grammar: TypeScript.tmLanguage
293293
^
294294
source.ts meta.function.ts meta.block.ts new.expr.ts
295295
^^^^^
296-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
296+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
297297
^
298298
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
299299
^
@@ -556,7 +556,7 @@ Grammar: TypeScript.tmLanguage
556556
^
557557
source.ts meta.function.ts meta.block.ts new.expr.ts
558558
^^^^^
559-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
559+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
560560
^
561561
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
562562
^
@@ -814,7 +814,7 @@ Grammar: TypeScript.tmLanguage
814814
^
815815
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
816816
^^^^^
817-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
817+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
818818
^
819819
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
820820
^
@@ -1067,7 +1067,7 @@ Grammar: TypeScript.tmLanguage
10671067
^
10681068
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
10691069
^^^^^
1070-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
1070+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
10711071
^
10721072
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
10731073
^

‎tests/baselines/FunctionMethodReturnTypes.baseline.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ Grammar: TypeScript.tmLanguage
411411
^
412412
source.ts meta.function.ts meta.block.ts new.expr.ts
413413
^^^^^
414-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
414+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
415415
^
416416
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
417417
^
@@ -476,7 +476,7 @@ Grammar: TypeScript.tmLanguage
476476
^
477477
source.ts meta.function.ts meta.block.ts new.expr.ts
478478
^^^^^
479-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
479+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
480480
^
481481
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
482482
^
@@ -547,7 +547,7 @@ Grammar: TypeScript.tmLanguage
547547
^
548548
source.ts meta.function.ts meta.block.ts new.expr.ts
549549
^^^^^
550-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
550+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
551551
^
552552
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
553553
^
@@ -634,7 +634,7 @@ Grammar: TypeScript.tmLanguage
634634
^
635635
source.ts meta.function.ts meta.block.ts new.expr.ts
636636
^^^^^
637-
source.ts meta.function.ts meta.block.ts new.expr.ts entity.name.type.ts
637+
source.ts meta.function.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
638638
^
639639
source.ts meta.function.ts meta.block.ts new.expr.ts meta.brace.round.ts
640640
^
@@ -1307,7 +1307,7 @@ Grammar: TypeScript.tmLanguage
13071307
^
13081308
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
13091309
^^^^^
1310-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
1310+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
13111311
^
13121312
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
13131313
^
@@ -1370,7 +1370,7 @@ Grammar: TypeScript.tmLanguage
13701370
^
13711371
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
13721372
^^^^^
1373-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
1373+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
13741374
^
13751375
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
13761376
^
@@ -1439,7 +1439,7 @@ Grammar: TypeScript.tmLanguage
14391439
^
14401440
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
14411441
^^^^^
1442-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
1442+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
14431443
^
14441444
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
14451445
^
@@ -1524,7 +1524,7 @@ Grammar: TypeScript.tmLanguage
15241524
^
15251525
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts
15261526
^^^^^
1527-
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts entity.name.type.ts
1527+
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.function-call.ts support.class.error.ts
15281528
^
15291529
source.ts meta.class.ts meta.method.declaration.ts meta.block.ts new.expr.ts meta.brace.round.ts
15301530
^

‎tests/baselines/Issue112.baseline.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Grammar: TypeScript.tmLanguage
1818
^
1919
source.ts new.expr.ts
2020
^^^^^^
21-
source.ts new.expr.ts entity.name.type.module.ts
21+
source.ts new.expr.ts meta.function-call.ts variable.other.object.ts
2222
^
23-
source.ts new.expr.ts punctuation.accessor.ts
23+
source.ts new.expr.ts meta.function-call.ts punctuation.accessor.ts
2424
^^^^^^^^
25-
source.ts new.expr.ts entity.name.type.ts
25+
source.ts new.expr.ts meta.function-call.ts entity.name.function.ts
2626
^
2727
source.ts new.expr.ts meta.brace.round.ts
2828
^^^^^^^^

‎tests/baselines/Issue139.baseline.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Grammar: TypeScript.tmLanguage
1717
^
1818
source.ts new.expr.ts
1919
^^^^^
20-
source.ts new.expr.ts entity.name.type.ts
20+
source.ts new.expr.ts meta.function-call.ts support.class.builtin.ts
2121
^
2222
source.ts new.expr.ts meta.brace.round.ts
2323
^^^^^^^^

0 commit comments

Comments
 (0)