Fix the nested ternary operator

Fixes #366

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -166,13 +166,6 @@ repository:
     - include: '#punctuation-comma'
 
   ternary-expression:
-    begin: (?=\?)
-    end: (?=$|[;,})\]])
-    patterns:
-    - include: '#ternary-operator'
-    - include: '#expression' 
-
-  ternary-operator:
     begin: (\?)
     beginCaptures:
       '0': { name: keyword.operator.ternary.ts }

TypeScript.tmLanguage

@@ -471,24 +471,6 @@
         </array>
       </dict>
       <key>ternary-expression</key>
-      <dict>
-        <key>begin</key>
-        <string>(?=\?)</string>
-        <key>end</key>
-        <string>(?=$|[;,})\]])</string>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>include</key>
-            <string>#ternary-operator</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#expression</string>
-          </dict>
-        </array>
-      </dict>
-      <key>ternary-operator</key>
       <dict>
         <key>begin</key>
         <string>(\?)</string>

TypeScriptReact.tmLanguage

@@ -471,24 +471,6 @@
         </array>
       </dict>
       <key>ternary-expression</key>
-      <dict>
-        <key>begin</key>
-        <string>(?=\?)</string>
-        <key>end</key>
-        <string>(?=$|[;,})\]])</string>
-        <key>patterns</key>
-        <array>
-          <dict>
-            <key>include</key>
-            <string>#ternary-operator</string>
-          </dict>
-          <dict>
-            <key>include</key>
-            <string>#expression</string>
-          </dict>
-        </array>
-      </dict>
-      <key>ternary-operator</key>
       <dict>
         <key>begin</key>
         <string>(\?)</string>

tests/baselines/Issue366.baseline.txt

@@ -0,0 +1,68 @@
+original file
+-----------------------------------
+let foo = a ? b ? c : d : e;
+let bar;
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>let foo = a ? b ? c : d : e;
+ ^^^
+ source.ts meta.var.expr.ts storage.type.ts
+    ^
+    source.ts meta.var.expr.ts
+     ^^^
+     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+        ^
+        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+         ^
+         source.ts meta.var.expr.ts keyword.operator.assignment.ts
+          ^
+          source.ts meta.var.expr.ts
+           ^
+           source.ts meta.var.expr.ts variable.other.readwrite.ts
+            ^
+            source.ts meta.var.expr.ts
+             ^
+             source.ts meta.var.expr.ts keyword.operator.ternary.ts
+              ^
+              source.ts meta.var.expr.ts
+               ^
+               source.ts meta.var.expr.ts variable.other.readwrite.ts
+                ^
+                source.ts meta.var.expr.ts
+                 ^
+                 source.ts meta.var.expr.ts keyword.operator.ternary.ts
+                  ^
+                  source.ts meta.var.expr.ts
+                   ^
+                   source.ts meta.var.expr.ts variable.other.readwrite.ts
+                    ^
+                    source.ts meta.var.expr.ts
+                     ^
+                     source.ts meta.var.expr.ts keyword.operator.ternary.ts
+                      ^
+                      source.ts meta.var.expr.ts
+                       ^
+                       source.ts meta.var.expr.ts variable.other.readwrite.ts
+                        ^
+                        source.ts meta.var.expr.ts
+                         ^
+                         source.ts meta.var.expr.ts keyword.operator.ternary.ts
+                          ^
+                          source.ts meta.var.expr.ts
+                           ^
+                           source.ts meta.var.expr.ts variable.other.readwrite.ts
+                            ^
+                            source.ts punctuation.terminator.statement.ts
+                             ^^
+                             source.ts
+>let bar;
+ ^^^
+ source.ts meta.var.expr.ts storage.type.ts
+    ^
+    source.ts meta.var.expr.ts
+     ^^^
+     source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+        ^
+        source.ts punctuation.terminator.statement.ts

tests/cases/Issue366.ts

@@ -0,0 +1,2 @@
+let foo = a ? b ? c : d : e;
+let bar;