Merge branch 'python-highlight-zero' of https://github.com/a11ce/micro into a11ce...

[micro.git] / runtime / syntax / go.yaml

diff --git a/runtime/syntax/go.yaml b/runtime/syntax/go.yaml
index ede5555f7faff8891e5508dffc3192ad95214a37..3885c7b17d952f88d53d26ff1ef3773243ec0f5b 100644 (file)
--- a/runtime/syntax/go.yaml
+++ b/runtime/syntax/go.yaml
@@ -5,17 +5,15 @@ detect:
 
 rules:
     # Conditionals and control flow
-    - special: "\\b(break|case|continue|default|go|goto|range|return)\\b"
-    - statement: "\\b(else|for|if|switch)\\b"
-    - preproc: "\\b(package|import|const|var|type|struct|func|go|defer|iota)\\b"
+    - special: "\\b(break|case|continue|default|go|goto|range|return|println|fallthrough)\\b"
+    - statement: "\\b(else|for|if|switch|select)\\b"
+    - preproc: "\\b(package|import|const|var|type|struct|func|defer|iota|make|new|copy|len|cap|panic|append|close|delete|print|recover)\\b"
     - symbol.operator: "[-+/*=<>!~%&|^]|:="
 
       # Types
-    - special: "[a-zA-Z0-9]*\\("
     - symbol: "(,|\\.)"
     - type: "\\b(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\\b"
     - type: "\\b(uintptr|byte|rune|string|interface|bool|map|chan|error)\\b"
-      ##I'm... not sure, but aren't structs a type?
     - type.keyword: "\\b(struct)\\b"
     - constant.bool: "\\b(true|false|nil)\\b"
 
@@ -29,7 +27,8 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "(?<!\\\\)\""
+        end: "\""
+        skip: "\\\\."
         rules:
             - constant.specialChar: "%."
             - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
@@ -37,7 +36,8 @@ rules:
 
     - constant.string:
         start: "'"
-        end: "(?<!\\\\)'"
+        end: "'"
+        skip: "\\\\."
         rules:
             - error: "..+"
             - constant.specialChar: "%."