Changes between Version 1 and Version 2 of ETextEditor

Timestamp:

06/22/09 03:44:50 (15 years ago)

Author:

webnov8

Comment:

Better version

ETextEditor

@@ -49 +49 @@
       {
          "name" : "keyword.control.cobra",
-         "match" : "\\b(inherits|branch|on|else|catch|finally|for|if|try|while|break|continue|pass|raise|return|using|yield)\\b"
+         "match" : "\\b(branch|on|else|catch|finally|for|if|try|while|break|continue|pass|raise|return|using|yield)\\b"
       },
       {
@@ -57 +57 @@
       {
          "name" : "keyword.other.cobra",
-         "match" : "\\b(as|assert|print|var|invariant|is|is\\s*shared)\\b"
+         "match" : "\\b(as|from|assert|print|var|invariant|is)\\b"
       },
       {
@@ -87 +87 @@
       },
       {
-         "name" : "support.function.cobra",
-         "match" : "\\b(base|(?<!is\\s)shared)\\b"
-      },
-      {
-         "name" : "support.type.cobra",
-         "match" : "\\b(bool|char|int|uint|float|decimal|number|dynamic|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b"
+         "name" : "support.type.primitive.cobra",
+         "match" : "\\b(nil|bool|char|int|uint|float|decimal|number|dynamic|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b(\\?)?",
+         "captures" : {
+            "2" : {
+               "name" : "support.type.nillible-marker.cobra"
+            }
+         }
       },
       {
@@ -99 +100 @@
       },
       {
-         "include" : "#types"
-      },
-      {
-        "include" : "#strings"
+         "include" : "#strings"
       },
       {
@@ -110 +108 @@
       },
       {
-         "begin" : "^\\s*(?:class)\\s+(?=[a-zA-Z_][a-zA-Z0-9_]*)",
-         "patterns" : [
-            {
-               "name" : "keyword.operator.cobra",
-               "match" : "(inherits|implements|is|partial)"
-            },
-            {
-               "name" : "entity.name.type.cobra",
-               "match" : "[a-zA-Z0-9_]+"
-            },
-            {
-               "include" : "#types"
-            }
-         ],
-         "name" : "storage.type.class.cobra",
-         "end" : "$",
-         "beginCaptures" : {
-            "1" : {
+         "match" : "^\\s+(var)\\s+(_[\\w_]+)\\s+(as)?(\\s+[\\w_<>\\s?]+)",
+         "captures" : {
+            "3" : {
+               "name" : "keyword.operator.specifier.cobra"
+            },
+            "1" : {
+               "name" : "keyword.operator.declaration.cobra"
+            },
+            "4" : {
+               "name" : "support.other.type.cobra"
+            },
+            "2" : {
+               "name" : "support.private-variable.cobra"
+            }
+         }
+      },
+      {
+         "name" : "keyword.operator.enumeration.cobra",
+         "match" : "\\s*(?:enum|interface|struct|mixin)\\s+([\\w_]+)",
+         "captures" : {
+            "1" : {
+               "name" : "entity.name.enumeration.cobras"
+            }
+         }
+      },
+      {
+         "name" : "keyword.operator.enumeration.cobra",
+         "match" : "\\s*(is|has)\\s+(shared|partial)\\s*",
+         "captures" : {
+            "1" : {
+               "name" : "operator.name.is.cobra"
+            },
+            "2" : {
+               "name" : "constant.other.modifier.cobra"
+            }
+         }
+      },
+      {
+         "name" : "keyword.operator.enumeration.cobra",
+         "match" : "\\s*(implements|inherits)\\s+([a-zA-Z_][\\w_]*)\\s*",
+         "captures" : {
+            "1" : {
+               "name" : "operator.name.is.cobra"
+            },
+            "2" : {
+               "name" : "constant.other.interface.cobra"
+            }
+         }
+      },
+      {
+         "name" : "meta.type.method.cobra",
+         "match" : "^\\s+(def|cue|get|pro|sig)\\s+([a-zA-Z_]\\w+)",
+         "captures" : {
+            "1" : {
+               "name" : "keyword.operator.method.cobra"
+            },
+            "2" : {
                "name" : "entity.name.type.cobra"
             }
@@ -133 +170 @@
       },
       {
-         "match" : "^\\s+(var|def|cue|get|pro|sig)\\s+([a-zA-Z_]\\w+)",         
-         "name" : "meta.type.method.cobra",
-         "captures" : {
-            "1" : {
-               "name" : "keyword.operator.method.cobra"
-            },
-            "2" : {
-               "name" : "entity.name.type.cobra"
+         "match" : "^\\s*(class)\\s+([a-zA-Z_][\\w_]*)\\s*",
+         "captures" : {
+            "1" : {
+               "name" : "keyword.operator.class-definition.cobra"
+            },
+            "2" : {
+               "name" : "entity.name.user-defined-type.cobra"
             }
          }
@@ -153 +189 @@
    "foldingStartMarker" : "",
    "repository" : {
-      "types" : {
-         "match" : "(?<=as|\\=)\\s+([A-Z][a-zA-Z0-9_]+)\\s*(\\??|<\\s*of\\s+[a-zA-Z0-9]+>)?",
-         "captures" : {
-            "1" : {
-               "name" : "entity.name.class.cobra"
-            },
-            "2" : {
-               "name" : "entity.name.generic.cobra"
-            }
-         }
-      },
       "escaped-characters" : {
          "name" : "constant.character.escape.cobra",
          "match" : "(\\\\x[0-9A-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
       },
+      "varsub" : {
+         "name" : "support.other.variable-substitution.cobra",
+         "match" : "(\\[[\\w.]+\\])"
+      },
       "strings" : {
          "patterns" : [
             {
-               "begin" : "r?'",
+               "begin" : "(?<!')r?'(?!')",
                "patterns" : [
                   {
                      "include" : "#escaped-characters"
+                  },
+                  {
+                     "include" : "#varsub"
                   }
                ],
                "name" : "string.quoted.single.cobra",
                "end" : "'"
+            },
+            {
+               "begin" : "(?<!\")r?\"(?!\")",
+               "patterns" : [
+                  {
+                     "include" : "#escaped-characters"
+                  },
+                  {
+                     "include" : "#varsub"
+                  }
+               ],
+               "name" : "string.quoted.single.cobra",
+               "end" : "\""
             }
          ]