Julia syntax improvements (#2415)

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

diff --git a/runtime/syntax/julia.yaml b/runtime/syntax/julia.yaml
index 9c33560d6c1724fd75f9a8821661fc432816ba08..fda0e333dd8b822db09698d9887496f39e546385 100644 (file)
--- a/runtime/syntax/julia.yaml
+++ b/runtime/syntax/julia.yaml
@@ -19,30 +19,40 @@ rules:
       # decorators
     - identifier.macro: "@[A-Za-z0-9_]+"
       # operators
-    - symbol.operator: "[-+*/|=%<>&~^]|\\b(in|isa|where)\\b"
+    - symbol.operator: "[:+*|=!%~<>/\\-?&\\\\÷∈∉∘]|\\b(in|isa|where)\\b"
+      # for some reason having ^ in the same regex with the other operators broke things
+    - symbol.operator: "\\^"
       # parentheses
     - symbol.brackets: "([(){}]|\\[|\\])"
       # numbers
     - constant.number: "\\b([0-9]+(_[0-9]+)*|0x[0-9a-fA-F]+(_[0-9a-fA-F]+)*|0b[01]+(_[01]+)*|0o[0-7]+(_[0-7]+)*|Inf(16|32|64)?|NaN(16|32|64)?)\\b"
 
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^']){1}'"
-
     - constant.string:
         start: "\"\"\""
         end: "\"\"\""
         rules: []
 
     - constant.string:
-        start: "\"[^\"]|\"$"
+        start: "\""
         end: "\""
-        rules: []
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{1,4}|U[0-9A-Fa-f]{1,8})"
 
-    - comment:
-        start: "#[^=]|#$"
-        end: "$"
-        rules: []
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - error: "..+"
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{1,4}|U[0-9A-Fa-f]{1,8})"
 
     - comment:
         start: "#="
         end: "=#"
         rules: []
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules: []