Minor fixes and additional colorscheme support

syntax_files/glsl.yaml

@@ -4,19 +4,23 @@ detect:
     filename: "\\.(frag|vert|fp|vp|glsl)$"
 
 rules:
-    - brightblue: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
-    - green: "\\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\>"
-    - green: "\\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\>"
-    - cyan: "\\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\>"
-    - brightred: "\\<(break|continue)\\>"
-    - brightcyan: "\\<(true|false)\\>"
-    - red: "[-+/*=<>?:!~%&|^]"
-    - blue: "\\<([0-9]+|0x[0-9a-fA-F]*)\\>"
-    - brightblack: "(^|[[:space:]])//.*"
-    - brightblack:
+    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+    - type: "\\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\>"
+    - statement: "\\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\>"
+    - statement: "\\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\>"
+    - statement: "\\<(break|continue)\\>"
+    - constant: "\\<(true|false)\\>"
+    - statement: "[-+/*=<>?:!~%&|^]"
+    - constant.number: "\\<([0-9]+|0x[0-9a-fA-F]*)\\>"
+
+    - comment: 
+        start: "//"
+        end: "$"
+        rules:
+            todo: "TODO:?"
+
+    - comment:
         start: "/\\*"
         end: "\\*/"
-        rules: []
-    - brightwhite,cyan: "TODO:?"
-    - ,green: "[[:space:]]+$"
-    - ,red: "	+ +| +	+"
+        rules:
+            todo: "TODO:?"