From c57c5c04e5bccaad668dae3ff490cff69ba2a7e5 Mon Sep 17 00:00:00 2001
From: Mikko <Andriamanitra@users.noreply.github.com>
Date: Sun, 15 May 2022 23:00:59 +0300
Subject: [PATCH] Julia syntax improvements (#2415)

* fix D syntax highlighting for integer literals with underscores

* improve julia syntax highlighting for strings, chars and operators
---
 runtime/syntax/d.yaml     |  2 +-
 runtime/syntax/julia.yaml | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/runtime/syntax/d.yaml b/runtime/syntax/d.yaml
index db9fd695..de2441e6 100644
--- a/runtime/syntax/d.yaml
+++ b/runtime/syntax/d.yaml
@@ -10,7 +10,7 @@ rules:
     # Octal integer literals are deprecated
     - error: "(0[0-7_]*)(L[uU]?|[uU]L?)?"
     # Decimal integer literals
-    - constant.number: "([0-9]|[1-9][0-9_]*)(L[uU]?|[uU]L?)?"
+    - constant.number: "([0-9]|[1-9][0-9_]*)(L[uU]?|[uU]L?)?\\b"
     # Binary integer literals
     - constant: "(0[bB][01_]*)(L[uU]?|[uU]L?)?"
     # Decimal float literals
diff --git a/runtime/syntax/julia.yaml b/runtime/syntax/julia.yaml
index 9c33560d..fda0e333 100644
--- 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: []
-- 
2.44.0