Fix detection of import-export clause when name is $

Fixes #665
microsoft · Sep 10, 2018 · c90418c · c90418c
1 parent 0aea7e0
commit c90418c
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 3 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -1138,7 +1138,7 @@ repository:
     patterns:
     - include: '#comment'
     #(default|*|name) as alias
-    - match: '{{startOfIdentifier}}(?:(\bdefault)|(\*)|(\b{{identifier}}))\s+(as)\s+(?:(\bdefault{{endOfIdentifier}})|(\b{{identifier}}))'
+    - match: '{{startOfIdentifier}}(?:(\bdefault)|(\*)|(\b{{identifier}}))\s+(as)\s+(?:(default{{endOfIdentifier}})|({{identifier}}))'
       captures:
         '1': { name: keyword.control.default.ts }
         '2': { name: constant.language.import-export-all.ts }

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -3672,7 +3672,7 @@
           </dict>
           <dict>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(\bdefault)|(\*)|(\b[_$[:alpha:]][_$[:alnum:]]*))\s+(as)\s+(?:(\bdefault(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(\b[_$[:alpha:]][_$[:alnum:]]*))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(\bdefault)|(\*)|(\b[_$[:alpha:]][_$[:alnum:]]*))\s+(as)\s+(?:(default(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|([_$[:alpha:]][_$[:alnum:]]*))</string>
             <key>captures</key>
             <dict>
               <key>1</key>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -3676,7 +3676,7 @@
           </dict>
           <dict>
             <key>match</key>
-            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(\bdefault)|(\*)|(\b[_$[:alpha:]][_$[:alnum:]]*))\s+(as)\s+(?:(\bdefault(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(\b[_$[:alpha:]][_$[:alnum:]]*))</string>
+            <string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(\bdefault)|(\*)|(\b[_$[:alpha:]][_$[:alnum:]]*))\s+(as)\s+(?:(default(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|([_$[:alpha:]][_$[:alnum:]]*))</string>
             <key>captures</key>
             <dict>
               <key>1</key>

diff --git a/tests/baselines/Issue665.baseline.txt b/tests/baselines/Issue665.baseline.txt
@@ -0,0 +1,96 @@
+original file
+-----------------------------------
+import * as _ from 'lodash';
+import * as $ from 'jquery';
+import * as React from 'react';
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>import * as _ from 'lodash';
+ ^^^^^^
+ source.ts meta.import.ts keyword.control.import.ts
+       ^
+       source.ts meta.import.ts
+        ^
+        source.ts meta.import.ts constant.language.import-export-all.ts
+         ^
+         source.ts meta.import.ts
+          ^^
+          source.ts meta.import.ts keyword.control.as.ts
+            ^
+            source.ts meta.import.ts
+             ^
+             source.ts meta.import.ts variable.other.readwrite.alias.ts
+              ^
+              source.ts meta.import.ts
+               ^^^^
+               source.ts meta.import.ts keyword.control.from.ts
+                   ^
+                   source.ts meta.import.ts
+                    ^
+                    source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+                     ^^^^^^
+                     source.ts meta.import.ts string.quoted.single.ts
+                           ^
+                           source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts
+                            ^
+                            source.ts punctuation.terminator.statement.ts
+>import * as $ from 'jquery';
+ ^^^^^^
+ source.ts meta.import.ts keyword.control.import.ts
+       ^
+       source.ts meta.import.ts
+        ^
+        source.ts meta.import.ts constant.language.import-export-all.ts
+         ^
+         source.ts meta.import.ts
+          ^^
+          source.ts meta.import.ts keyword.control.as.ts
+            ^
+            source.ts meta.import.ts
+             ^
+             source.ts meta.import.ts variable.other.readwrite.alias.ts
+              ^
+              source.ts meta.import.ts
+               ^^^^
+               source.ts meta.import.ts keyword.control.from.ts
+                   ^
+                   source.ts meta.import.ts
+                    ^
+                    source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+                     ^^^^^^
+                     source.ts meta.import.ts string.quoted.single.ts
+                           ^
+                           source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts
+                            ^
+                            source.ts punctuation.terminator.statement.ts
+>import * as React from 'react';
+ ^^^^^^
+ source.ts meta.import.ts keyword.control.import.ts
+       ^
+       source.ts meta.import.ts
+        ^
+        source.ts meta.import.ts constant.language.import-export-all.ts
+         ^
+         source.ts meta.import.ts
+          ^^
+          source.ts meta.import.ts keyword.control.as.ts
+            ^
+            source.ts meta.import.ts
+             ^^^^^
+             source.ts meta.import.ts variable.other.readwrite.alias.ts
+                  ^
+                  source.ts meta.import.ts
+                   ^^^^
+                   source.ts meta.import.ts keyword.control.from.ts
+                       ^
+                       source.ts meta.import.ts
+                        ^
+                        source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+                         ^^^^^
+                         source.ts meta.import.ts string.quoted.single.ts
+                              ^
+                              source.ts meta.import.ts string.quoted.single.ts punctuation.definition.string.end.ts
+                               ^
+                               source.ts punctuation.terminator.statement.ts
diff --git a/tests/cases/Issue665.ts b/tests/cases/Issue665.ts
@@ -0,0 +1,3 @@
+import * as _ from 'lodash';
+import * as $ from 'jquery';
+import * as React from 'react';