Merge branch 'master' into view-refactor

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

diff --git a/runtime/syntax/gdscript.yaml b/runtime/syntax/gdscript.yaml
index e9df1795bf2e0a0ee2e959c887e45d05562560ba..2b721a7a5ac682fe38c41090483e628b88181eb6 100644 (file)
--- a/runtime/syntax/gdscript.yaml
+++ b/runtime/syntax/gdscript.yaml
@@ -1,31 +1,69 @@
 filetype: gdscript
 
-detect: 
+detect:
     filename: "\\.gd$"
 
 rules:
+    # built-in objects
     - constant: "\\b(null|self|true|false)\\b"
+      # built-in attributes
+      # color constant "\\b()\\b"
+      # built-in functions
     - identifier: "\\b(abs|acos|asin|atan|atan2|ceil|clamp|convert|cos|cosh|db2linear|decimals|deg2rad|ease|exp|float|floor|fmod|fposmod|hash|int|isinf|isnan|lerp|linear2db|load|log|max|min|nearest_po2|pow|preload|print|printerr|printraw|prints|printt|rad2deg|rand_range|rand_seed|randomize|randi|randf|range|round|seed|sin|slerp|sqrt|str|str2var|tan|typeof|var2str|weakref)\\b"
+      # special method names
     - identifier: "\\b(AnimationPlayer|AnimationTreePlayer|Button|Control|HTTPClient|HTTPRequest|Input|InputEvent|MainLoop|Node|Node2D|SceneTree|Spatial|SteamPeer|PacketPeer|PacketPeerUDP|Timer|Tween)\\b"
+      # types
     - type: "\\b(Vector2|Vector3)\\b"
-    - identifier: "func [a-zA-Z_0-9]+"
-    - statement: "\\b(and|as|assert|break|breakpoint|class|const|continue|elif|else|export|extends|for|func|if|in|map|not|onready|or|pass|return|signal|var|while|yield)\\b"
+      # definitions
+    - identifier: "func [a-zA-Z_0-9]+" 
+      # keywords
+    - statement: "\\b(and|as|assert|break|breakpoint|class|const|continue|elif|else|export|extends|for|func|if|in|map|not|onready|or|pass|return|signal|var|while|yield)\\b" 
+
+      # decorators
     - special: "@.*[(]"
+
+      # operators
     - statement: "[.:;,+*|=!\\%@]|<|>|/|-|&"
+
+      # parentheses
     - statement: "[(){}]|\\[|\\]"
+
+      # numbers
     - constant: "\\b[0-9]+\\b"
     - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
-    - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
-    - constant.string: "`[^`]*`"
-    - comment: "#.*$"
+
     - comment:
-        start: "\"\"\"([^\"]|$)"
+        start: "\"\"\""
         end: "\"\"\""
-        rules: []
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
 
     - comment:
-        start: "'''([^']|$)"
+        start: "'''"
         end: "'''"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+
+    - constant.string:
+        start: "\""
+        end: "(?<!\\\\)\""
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "'"
+        end: "(?<!\\\\)'"
+        rules:
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+
+    - constant.string:
+        start: "`"
+        end: "`"
         rules: []
 
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+