Merge branch 'master' into highlight-nimscript

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

diff --git a/runtime/syntax/vi.yaml b/runtime/syntax/vi.yaml
index f0491d1daa0d9d190bbcea4304d8fabb8c060b97..d83a80af1e3872720b3fc7438f9f03e9a32d3d9a 100644 (file)
--- a/runtime/syntax/vi.yaml
+++ b/runtime/syntax/vi.yaml
@@ -1,13 +1,32 @@
 filetype: vi
 
-detect: 
+detect:
     filename: "(^|/|\\.)(ex|vim)rc$|\\.vim"
 
 rules:
     - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
     - statement: "\\b([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\\b"
     - statement: "\\b(snor|nun|nm|set|if|endif|let|unlet)\\b"
-    - symbol.operator: "[!&=]"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+    - statement: "[!&=]"
     - constant.number: "\\b[0-9]+\\b"
-    - comment: "(^|[[:space:]])\\\"[^\"]*$"
+
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+
+    - comment:
+        start: "\""
+        end: "$"
+        rules: []
+        
+