add nullish coalescing support

Author: Kingwl

TypeScript.YAML-tmLanguage

@@ -218,7 +218,6 @@ repository:
     - include: '#arrow-function'
     - include: '#paren-expression-possibly-arrow'
     - include: '#cast'
-    - include: '#nullish-coalesce'
     - include: '#ternary-expression'
     - include: '#new-expr'
     - include: '#instanceof-expr'
@@ -1415,15 +1414,9 @@ repository:
       - include: '#expression'
     - include: '#punctuation-comma'
 
-  #nullish coalesce
-  nullish-coalesce:
-    patterns:
-      - name: keyword.operator.logical.ts
-        match: \?\?
-
   #ternary expression
   ternary-expression:
-    begin: (?!\?\.\s*[^[:digit:]])(\?)
+    begin: (?!\?\.\s*[^[:digit:]])(\?)(?!\?)
     beginCaptures:
       '1': { name: keyword.operator.ternary.ts }
     end: \s*(:)
@@ -1641,7 +1634,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

TypeScript.tmLanguage

@@ -323,10 +323,6 @@
             <key>include</key>
             <string>#cast</string>
           </dict>
-          <dict>
-            <key>include</key>
-            <string>#nullish-coalesce</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#ternary-expression</string>
@@ -4591,22 +4587,10 @@
           </dict>
         </array>
       </dict>
-      <key>nullish-coalesce</key>
-      <dict>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.logical.ts</string>
-            <key>match</key>
-            <string>\?\?</string>
-          </dict>
-        </array>
-      </dict>
       <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 +5327,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>

TypeScriptReact.tmLanguage

@@ -327,10 +327,6 @@
             <key>include</key>
             <string>#cast</string>
           </dict>
-          <dict>
-            <key>include</key>
-            <string>#nullish-coalesce</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#ternary-expression</string>
@@ -4615,22 +4611,10 @@
           </dict>
         </array>
       </dict>
-      <key>nullish-coalesce</key>
-      <dict>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>name</key>
-            <string>keyword.operator.logical.tsx</string>
-            <key>match</key>
-            <string>\?\?</string>
-          </dict>
-        </array>
-      </dict>
       <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 +5273,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>