fixup! Properly parse nested ternary expressions

Author: ayazhafiz

syntaxes/expression.json

@@ -563,7 +563,7 @@
       "match": "\\\\(x\\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)"
     },
     "ternaryExpression": {
-      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.ts"

syntaxes/src/expression.ts

@@ -593,8 +593,12 @@ export const Expression: GrammarDefinition = {
       match: /\\(x\h{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)/,
     },
 
+    // Derived from
+    // https://github.com/sheetalkamat/TypeScript-TmLanguage-VsCode/blob/04219109f3e2090f787c0fa8743e73a4bd1ad876/syntaxes/TypeScript.tmLanguage.json#L2830-L2848
     ternaryExpression: {
-      begin: /(?!\?\.\s*[^[:digit:]])(\?)(?!\?)/,
+      // 1. negative lookahead (?!\?\.\s*[^[:digit:]]) ensures safe navigation does not match
+      // 2. match the ternary question mark with (\?)
+      begin: /(?!\?\.\s*[^[:digit:]])(\?)/,
       beginCaptures: {
         1: {
           name: 'keyword.operator.ternary.ts',

syntaxes/test/data/expression.html

@@ -71,6 +71,8 @@
 {{ condition ? 'test' : "test" }}
 {{ condition ? [function(), variable] : {} }}
 {{ condition ? condition2 ? condition3 ? 1 : 2 : 3 : 4 }}
+<!-- Don't match safe navigations -->
+{{ condition?.a : 1 }}
 
 <!-- Microsyntax -->
 <!-- Let Expression -->

syntaxes/test/data/expression.html.snap

@@ -825,6 +825,18 @@
 #                                                     ^ template.ng expression.ng constant.numeric.decimal.ts
 #                                                      ^ template.ng expression.ng
 #                                                       ^^ template.ng punctuation.definition.block.ts
+><!-- Don't match safe navigations -->
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ template.ng
+>{{ condition?.a : 1 }}
+#^^ template.ng punctuation.definition.block.ts
+#  ^ template.ng expression.ng
+#   ^^^^^^^^^ template.ng expression.ng variable.other.readwrite.ts
+#            ^^ template.ng expression.ng punctuation.accessor.ts
+#              ^ template.ng expression.ng variable.other.property.ts
+#               ^^^ template.ng expression.ng
+#                  ^ template.ng expression.ng constant.numeric.decimal.ts
+#                   ^ template.ng expression.ng
+#                    ^^ template.ng punctuation.definition.block.ts
 >
 ><!-- Microsyntax -->
 #^^^^^^^^^^^^^^^^^^^^^ template.ng