Skip to content

Commit 96c7b24

Browse files
committed
Fix dynamic imports matching
Fixes #506
1 parent e8b504c commit 96c7b24

File tree

5 files changed

+244
-8
lines changed

5 files changed

+244
-8
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ repository:
355355

356356
import-declaration:
357357
name: meta.import.ts
358-
begin: (?<!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*:)|(\$|\.))\b
358+
begin: (?<!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*[:\(])|(\$|\.))\b
359359
beginCaptures:
360360
'1': { name: keyword.control.export.ts }
361361
'2': { name: keyword.control.import.ts }
@@ -1627,7 +1627,6 @@ repository:
16271627
match: (?:[_$[:alpha:]][_$[:alnum:]]*)\s*(?=:)
16281628
captures:
16291629
'0': { name: meta.object-literal.key.ts }
1630-
end: (?=,|\})
16311630
- name: meta.object.member.ts
16321631
begin: \.\.\.
16331632
beginCaptures:

TypeScript.tmLanguage

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@
10911091
<key>name</key>
10921092
<string>meta.import.ts</string>
10931093
<key>begin</key>
1094-
<string>(?&lt;!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*:)|(\$|\.))\b</string>
1094+
<string>(?&lt;!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*[:\(])|(\$|\.))\b</string>
10951095
<key>beginCaptures</key>
10961096
<dict>
10971097
<key>1</key>
@@ -4451,8 +4451,6 @@
44514451
<string>meta.object-literal.key.ts</string>
44524452
</dict>
44534453
</dict>
4454-
<key>end</key>
4455-
<string>(?=,|\})</string>
44564454
</dict>
44574455
<dict>
44584456
<key>name</key>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@
10951095
<key>name</key>
10961096
<string>meta.import.tsx</string>
10971097
<key>begin</key>
1098-
<string>(?&lt;!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*:)|(\$|\.))\b</string>
1098+
<string>(?&lt;!\.|\$)(?:(\bexport)\s+)?\b(import)(?!(\s*[:\(])|(\$|\.))\b</string>
10991099
<key>beginCaptures</key>
11001100
<dict>
11011101
<key>1</key>
@@ -4397,8 +4397,6 @@
43974397
<string>meta.object-literal.key.tsx</string>
43984398
</dict>
43994399
</dict>
4400-
<key>end</key>
4401-
<string>(?=,|\})</string>
44024400
</dict>
44034401
<dict>
44044402
<key>name</key>

0 commit comments

Comments
 (0)