add nullish coalescing support

microsoft · Aug 22, 2019 · f646a52 · f646a52
1 parent 3890a41
commit f646a52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -1423,7 +1423,7 @@ repository:
 
   #ternary expression
   ternary-expression:
-    begin: (?!\?\.\s*[^[:digit:]])(\?)
+    begin: (?!\?\.\s*[^[:digit:]])(\?)(?!\?)
     beginCaptures:
       '1': { name: keyword.operator.ternary.ts }
     end: \s*(:)
@@ -1641,7 +1641,7 @@ repository:
     - name: keyword.operator.relational.ts
       match: <=|>=|<>|<|>
     - name: keyword.operator.logical.ts
-      match: \!|&&|\|\|
+      match: \!|&&|\|\||\?\?
     - name: keyword.operator.bitwise.ts
       match: \&|~|\^|\|
     - name: keyword.operator.assignment.ts

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -4606,7 +4606,7 @@
       <key>ternary-expression</key>
       <dict>
         <key>begin</key>
-        <string>(?!\?\.\s*[^[:digit:]])(\?)</string>
+        <string>(?!\?\.\s*[^[:digit:]])(\?)(?!\?)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -5343,7 +5343,7 @@
             <key>name</key>
             <string>keyword.operator.logical.ts</string>
             <key>match</key>
-            <string>\!|&amp;&amp;|\|\|</string>
+            <string>\!|&amp;&amp;|\|\||\?\?</string>
           </dict>
           <dict>
             <key>name</key>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -4630,7 +4630,7 @@
       <key>ternary-expression</key>
       <dict>
         <key>begin</key>
-        <string>(?!\?\.\s*[^[:digit:]])(\?)</string>
+        <string>(?!\?\.\s*[^[:digit:]])(\?)(?!\?)</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -5289,7 +5289,7 @@
             <key>name</key>
             <string>keyword.operator.logical.tsx</string>
             <key>match</key>
-            <string>\!|&amp;&amp;|\|\|</string>
+            <string>\!|&amp;&amp;|\|\||\?\?</string>
           </dict>
           <dict>
             <key>name</key>