merge with Fix-#108

jeff-hykin · Apr 22, 2019 · 77dfa6a · 77dfa6a
2 parents 50f7fee + c75d437
commit 77dfa6a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 40 deletions.
diff --git a/c/debug.rb b/c/debug.rb
@@ -0,0 +1,7 @@
+require_relative 'generate.rb'
+# this will overwrite the system syntax with the generated syntax
+if (/darwin/ =~ RUBY_PLATFORM) != nil
+    `cp '#{@syntax_location}.json' '/Applications/Visual Studio Code.app/Contents/Resources/app/extensions/cpp/syntaxes'`
+else
+    puts "\n\nCurrently the build command is only has support for Mac"
+end
diff --git a/c/generate.rb b/c/generate.rb
@@ -20,6 +20,14 @@
     c_grammar.data[:repository] = @cpp_grammar.data[:repository]
 else
 
+# 
+# Contexts
+# 
+    evalutation_context = [
+        "#function-call-innards",
+        "$base"
+    ]
+
 #
 # Variable
 #
@@ -807,35 +815,17 @@
                 match: "%|\\*|/|-|\\+",
                 name: "keyword.operator.c"
             },
-            {
-                begin: "\\?",
-                beginCaptures: {
-                    "0" => {
-                        name: "keyword.operator.ternary.c"
-                    }
-                },
-                end: ":",
-                applyEndPatternLast: true,
-                endCaptures: {
-                    "0" => {
-                        name: "keyword.operator.ternary.c"
-                    }
-                },
-                patterns: [
-                    {
-                        include: "#method_access"
-                    },
-                    {
-                        include: "#member_access"
-                    },
-                    {
-                        include: "#c_function_call"
-                    },
-                    {
-                        include: "$base"
-                    }
-                ]
-            }
+            Range.new(
+                start_pattern: newPattern(
+                    match: /\?/,
+                    tag_as: "keyword.operator.ternary",
+                ),
+                end_pattern: newPattern(
+                    match: /:/,
+                    tag_as: "keyword.operator.ternary",
+                ),
+                includes: [ *evalutation_context ]
+            ).to_tag,
         ]
     },
     "strings" => {
@@ -2161,5 +2151,6 @@
 Dir.chdir __dir__
 
 # Save
-c_grammar.saveAsYamlTo("../syntaxes/c.tmLanguage")
-c_grammar.saveAsJsonTo("../syntaxes/c.tmLanguage")
+@syntax_location = "../syntaxes/c.tmLanguage"
+c_grammar.saveAsYamlTo(@syntax_location)
+c_grammar.saveAsJsonTo(@syntax_location)
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,19 +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: "#function-call-innards"
       - include: "$base"
   strings:
     patterns: