Fix the logical && and || operators after as expression

Fixes #762
microsoft · Jul 29, 2019 · 84238ef · 84238ef
1 parent 1dfa3c1
commit 84238ef
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -1372,7 +1372,7 @@ repository:
       begin: '{{startOfIdentifier}}(as)\s+'
       beginCaptures:
         '1': { name: keyword.control.as.ts }
-      end: (?=$|^|[,}]|({{startOfIdentifier}}(as)\s+))
+      end: (?=$|^|[,}]|\|\||\&\&|({{startOfIdentifier}}(as)\s+))
       patterns:
       - include: '#type'
     - name: meta.object.member.ts
@@ -1618,7 +1618,7 @@ repository:
     - begin: '{{startOfIdentifier}}(as)\s+'
       beginCaptures:
         '1': { name: keyword.control.as.ts }
-      end: (?=$|^|[;,:})\]]|({{startOfIdentifier}}(as)\s+)|(\s+\<))
+      end: (?=$|^|[;,:})\]]|\|\||\&\&|({{startOfIdentifier}}(as)\s+)|(\s+\<))
       patterns:
       - include: '#type'
     - name: keyword.operator.spread.ts

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -4446,7 +4446,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[,}]|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+))</string>
+            <string>(?=$|^|[,}]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+))</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -5278,7 +5278,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[;,:})\]]|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
+            <string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
             <key>patterns</key>
             <array>
               <dict>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -4470,7 +4470,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[,}]|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+))</string>
+            <string>(?=$|^|[,}]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+))</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -5224,7 +5224,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=$|^|[;,:})\]]|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
+            <string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
             <key>patterns</key>
             <array>
               <dict>

diff --git a/tests/baselines/Issue762.baseline.txt b/tests/baselines/Issue762.baseline.txt
@@ -0,0 +1,26 @@
+original file
+-----------------------------------
+Date as any || null
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>Date as any || null
+ ^^^^
+ source.ts support.class.builtin.ts
+     ^
+     source.ts
+      ^^
+      source.ts keyword.control.as.ts
+        ^
+        source.ts
+         ^^^
+         source.ts support.type.primitive.ts
+            ^
+            source.ts
+             ^^
+             source.ts keyword.operator.logical.ts
+               ^
+               source.ts
+                ^^^^
+                source.ts constant.language.null.ts
diff --git a/tests/cases/Issue762.ts b/tests/cases/Issue762.ts
@@ -0,0 +1 @@
+Date as any || null