Changes between Version 9 and Version 10 of ETextEditorSupport

Timestamp:

06/19/09 21:06:12 (16 years ago)

Author:

webnov8

Comment:

Best version so far, docstrings don't degenerate. Tested on CobraParser?.cobra.

ETextEditorSupport

@@ -88 +88 @@
       {
          "name" : "support.function.cobra",
-         "match" : "\\b(base|(?<!is\\s)shared)\\b",
-         "comment" : "language variables that are builtin"
-      },
-      {
-         "begin" : "r?'",
-         "patterns" : [
-            {
-               "include" : "#escaped-characters"
-            }
-         ],
-         "name" : "string.quoted.single.cobra",
-         "end" : "'"
-      },
-      {
-         "begin" : "r?\"",
-         "patterns" : [
-            {
-               "include" : "#escaped-characters"
-            }
-         ],
-         "name" : "string.quoted.double.cobra",
-         "end" : "\""
+         "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",
-         "comment" : "list of native primitive types"
+         "match" : "\\b(bool|char|int|uint|float|decimal|number|dynamic|int8|int16|int32|int64|uint8|uint16|uint32|uint64)\\b"
       },
       {
@@ -121 +99 @@
       },
       {
-         "include" : "#type"
+         "include" : "#types"
       },
       {
-         "begin" : "\\b(?:class)\\s*([a-zA-Z0-9_]+)",
+        "include" : "#strings"
+      },
+      {
+         "begin" : "^\\s*(\"\"\")",
+         "name" : "comment.block.cobra",
+         "end" : "\"\"\"\\s*$"
+      },
+      {
+         "begin" : "^\\s*(?:class)\\s+(?=[a-zA-Z_][a-zA-Z0-9_]*)",
          "patterns" : [
             {
@@ -135 +121 @@
             },
             {
-               "include" : "#type"
+               "include" : "#types"
             }
          ],
@@ -147 +133 @@
       },
       {
-         "begin" : "^\\s*(def|cue|get|pro)\\s+([a-zA-Z0-9_]+)",
-         "patterns" : [
-            {
-               "include" : "#argument-list"
-            },
-            {
-               "name" : "support.variable.cobra",
-               "match" : "\\bvar|from|as|get\\b"
-            },
-            {
-               "include" : "#type"
-            },
-            {
-                "include" : "#multiline-comments"
-            }
-         ],
+         "match" : "^\\s+(var|def|cue|get|pro|sig)\\s+([a-zA-Z_]\\w+)",         
          "name" : "meta.type.method.cobra",
-         "end" : "$",
-         "beginCaptures" : {
+         "captures" : {
             "1" : {
                "name" : "keyword.operator.method.cobra"
@@ -173 +143 @@
             }
          }
-      },
-      {
-         "include" : "#multiline-comments"
       }
    ],
@@ -183 +150 @@
       "cobra"
    ],
-   "foldingStopMarker" : "^$",
-   "foldingStartMarker" : "^\\s*(def|class|cue|get|set)(.*)",
+   "foldingStopMarker" : "",
+   "foldingStartMarker" : "",
    "repository" : {
-      "argument-list" : {
-         "begin" : "\\(",
-         "patterns" : [
-            {
-               "include" : "#type"
-            },
-            {
-               "name" : "keyword.operator.cast.cobra",
-               "match" : "\\bas\\b"
-            }
-         ],
-         "endCaptures" : {
-            "0" : "support"
-         },
-         "end" : "\\)",
-         "beginCaptures" : {
-            "0" : "support"
-         }
-      },
-      "multiline-comments" : {
-         "begin" : "^\\s*\"\"\"\\s+",
-         "name" : "comment.block.cobra",
-         "comment" : "comment blocks including docstrings",
-         "end" : "(^\\s*|\\s+)\"\"\"$"
-      },
-      "escaped-characters" : {
-         "name" : "constant.character.escape.cobra",
-         "match" : "(\\\\x[0-9A-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
-      },
-      "type" : {
+      "types" : {
          "match" : "(?<=as|\\=)\\s+([A-Z][a-zA-Z0-9_]+)\\s*(\\??|<\\s*of\\s+[a-zA-Z0-9]+>)?",
          "captures" : {
@@ -225 +163 @@
             }
          }
+      },
+      "escaped-characters" : {
+         "name" : "constant.character.escape.cobra",
+         "match" : "(\\\\x[0-9A-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
+      },
+      "strings" : {
+         "patterns" : [
+            {
+               "begin" : "r?'",
+               "patterns" : [
+                  {
+                     "include" : "#escaped-characters"
+                  }
+               ],
+               "name" : "string.quoted.single.cobra",
+               "end" : "'"
+            }
+         ]
       }
    },