Fix #108

jeff-hykin · Apr 18, 2019 · f2c6a86 · f2c6a86
1 parent f5552b7
commit f2c6a86
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 38 deletions.
diff --git a/c/generate.rb b/c/generate.rb
@@ -807,35 +807,19 @@
                 match: "%|\\*|/|-|\\+",
                 name: "keyword.operator.c"
             },
-            {
-                begin: "\\?",
-                beginCaptures: {
-                    "0" => {
-                        name: "keyword.operator.ternary.c"
-                    }
-                },
-                end: ":",
+            Range.new(
+                start_pattern: newPattern(
+                    match: /\?/,
+                    tag_as: "keyword.operator.ternary",
+                ),
+                end_pattern: newPattern(
+                    match: /:/,
+                    tag_as: "keyword.operator.ternary",
+                ),
                 applyEndPatternLast: true,
-                endCaptures: {
-                    "0" => {
-                        name: "keyword.operator.ternary.c"
-                    }
-                },
-                patterns: [
-                    {
-                        include: "#method_access"
-                    },
-                    {
-                        include: "#member_access"
-                    },
-                    {
-                        include: "#c_function_call"
-                    },
-                    {
-                        include: "$base"
-                    }
-                ]
-            }
+                includes: [ "#function-call-innards" ]
+
+            ).to_tag,
         ]
     },
     "strings" => {

diff --git a/syntaxes/c.tmLanguage.json b/syntaxes/c.tmLanguage.json
diff --git a/syntaxes/c.tmLanguage.yaml b/syntaxes/c.tmLanguage.yaml
@@ -475,20 +475,16 @@
       :name: keyword.operator.assignment.c
     - :match: "%|\\*|/|-|\\+"
       :name: keyword.operator.c
-    - :begin: "\\?"
+    - :begin: "(\\?)"
       :beginCaptures:
-        '0':
+        '1':
           :name: keyword.operator.ternary.c
-      :end: ":"
-      :applyEndPatternLast: true
+      :end: "(:)"
       :endCaptures:
-        '0':
+        '1':
           :name: keyword.operator.ternary.c
       :patterns:
-      - :include: "#method_access"
-      - :include: "#member_access"
-      - :include: "#c_function_call"
-      - :include: "$base"
+      - :include: "#function-call-innards"
   strings:
     :patterns:
     - :begin: "\""