Merge branch 'master' into highlight-nimscript

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

diff --git a/runtime/syntax/go.yaml b/runtime/syntax/go.yaml
index ede5555f7faff8891e5508dffc3192ad95214a37..fab3baa10fd47f71c6a5c3faee055b8a8242a78b 100644 (file)
--- a/runtime/syntax/go.yaml
+++ b/runtime/syntax/go.yaml
@@ -11,11 +11,9 @@ rules:
     - 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: "%."