Changes between Version 4 and Version 5 of ETextEditorSupport

Timestamp:

06/18/09 07:50:39 (16 years ago)

Author:

webnov8

Comment:

Removed some grammars in an attempt to keep the syntax file as short as possible. TODO: Folding end marker

ETextEditorSupport

@@ -50 +50 @@
       },
       {
-         "name" : "keyword.control.cobra",
-         "match" : "\\b(branch|on|else|except|finally|for|if|try|while|break|continue|pass|raise|return|yield)\\b"
+         "name" : "constant.keyword.control.cobra",
+         "match" : "\\b(branch|on|else|except|finally|for|if|try|while|break|continue|pass|raise|return|using|yield)\\b"
       },
       {
@@ -59 +59 @@
       {
          "name" : "keyword.other.cobra",
-         "match" : "\\b(as|assert|print|var|use|inherits|is|shared)\\b"
+         "match" : "\\b(as|assert|print|var|invariant|is|is\\s*shared)\\b"
       },
       {
@@ -72 +72 @@
          "name" : "keyword.operator.arithmetic.cobra",
          "match" : "\\+|\\-|\\*|\\*\\*|/|//|%|<<|>>|&|\\||\\^|~"
+      },
+      {
+         "match" : "\\s*(use)\\s+([a-zA-Z0-9_.]+)$",
+         "captures" : {
+            "1" : {
+               "name" : "keyword.other.use.cobra"
+            },
+            "2" : {
+               "name" : "support.class.cobra"
+            }
+         }
       },
       {
@@ -80 +91 @@
       },
       {
-         "begin" : "(?<=\\)|\\])\\s*(\\[)",
-         "patterns" : [
-            {
-               "include" : "$self"
-            }
-         ],
-         "name" : "meta.item-access.cobra",
-         "contentName" : "meta.item-access.arguments.cobra",
-         "endCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.arguments.end.cobra"
-            }
-         },
-         "end" : "(\\])",
-         "beginCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.arguments.begin.cobra"
-            }
-         }
-      },
-      {
-         "name" : "storage.type.class.cobra",
-         "match" : "\\b(class)\\b"
-      },
-      {
          "name" : "storage.type.function.cobra",
-         "match" : "\\b(def|cue|get)\\b"
+         "match" : "\\b(def|cue)\\b"
       },
       {
          "name" : "support.function.cobra",
-         "match" : "\\b(base)\\b",
+         "match" : "\\b(base|test|require|ensure|var|get|(?<!is\\s)shared)\\b",
          "comment" : "language variables that are builtin"
       },
       {
-         "begin" : "(\\()",
-         "patterns" : [
-            {
-               "include" : "$self"
-            }
-         ],
-         "end" : "(\\))"
-      },
-      {
-         "match" : "(\\[)(\\s*(\\]))\\b",
-         "captures" : {
-            "3" : {
-               "name" : "punctuation.definition.list.end.cobra"
-            },
-            "1" : {
-               "name" : "punctuation.definition.list.begin.cobra"
-            },
-            "2" : {
-               "name" : "meta.empty-list.cobra"
-            }
-         }
-      },
-      {
-         "begin" : "(\\[)",
-         "patterns" : [
-            {
-               "begin" : "(?<=\\[|\\,)\\s*(?![\\],])",
-               "patterns" : [
-                  {
-                     "include" : "$self"
-                  }
-               ],
-               "contentName" : "meta.structure.list.item.cobra",
-               "endCaptures" : {
-                  "1" : {
-                     "name" : "punctuation.separator.list.cobra"
-                  }
-               },
-               "end" : "\\s*(?:(,)|(?=\\]))"
-            }
-         ],
-         "name" : "meta.structure.list.cobra",
-         "endCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.list.end.cobra"
-            }
-         },
-         "end" : "(\\])",
-         "beginCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.list.begin.cobra"
-            }
-         }
-      },
-      {
-         "name" : "meta.structure.tuple.cobra",
-         "match" : "(\\()(\\s*(\\)))",
-         "captures" : {
-            "3" : {
-               "name" : "punctuation.definition.tuple.end.cobra"
-            },
-            "1" : {
-               "name" : "punctuation.definition.tuple.begin.cobra"
-            },
-            "2" : {
-               "name" : "meta.empty-tuple.cobra"
-            }
-         }
-      },
-      {
-         "name" : "meta.structure.dictionary.cobra",
-         "match" : "(\\{)(\\s*(\\}))",
-         "captures" : {
-            "3" : {
-               "name" : "punctuation.definition.dictionary.end.cobra"
-            },
-            "1" : {
-               "name" : "punctuation.definition.dictionary.begin.cobra"
-            },
-            "2" : {
-               "name" : "meta.empty-dictionary.cobra"
-            }
-         }
-      },
-      {
-         "begin" : "(\\{)",
-         "patterns" : [
-            {
-               "begin" : "(?<=\\{|\\,|^)\\s*(?![\\},])",
-               "patterns" : [
-                  {
-                     "include" : "$self"
-                  }
-               ],
-               "contentName" : "meta.structure.dictionary.key.cobra",
-               "endCaptures" : {
-                  "1" : {
-                     "name" : "punctuation.separator.valuepair.dictionary.cobra"
-                  }
-               },
-               "end" : "\\s*(?:(?=\\})|(\\:))"
-            },
-            {
-               "begin" : "(?<=\\:|^)\\s*",
-               "patterns" : [
-                  {
-                     "include" : "$self"
-                  }
-               ],
-               "contentName" : "meta.structure.dictionary.value.cobra",
-               "endCaptures" : {
-                  "1" : {
-                     "name" : "punctuation.separator.dictionary.cobra"
-                  }
-               },
-               "end" : "\\s*(?:(?=\\})|(,))"
-            }
-         ],
-         "name" : "meta.structure.dictionary.cobra",
-         "endCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.dictionary.end.cobra"
-            }
-         },
-         "end" : "(\\})",
-         "beginCaptures" : {
-            "1" : {
-               "name" : "punctuation.definition.dictionary.begin.cobra"
-            }
-         }
-      },
-      {
          "begin" : "r?'",
+         "patterns" : [
+            {
+               "include" : "#escaped_characters"
+            }
+         ],
          "name" : "string.quoted.single.cobra",
-         "end" : "'",
-         "patterns" : [
-          { "include" : "#escaped_characters" }
-         ]
+         "end" : "'"
       },
       {
          "begin" : "r?\"",
+         "patterns" : [
+            {
+               "include" : "#escaped_characters"
+            }
+         ],
          "name" : "string.quoted.double.cobra",
-         "end" : "\"",
-         "patterns" : [
-          { "include" : "#escaped_characters" }
-         ]
+         "end" : "\""
       },
       {
@@ -269 +127 @@
          "name" : "support.class.cobra",
          "match" : "\\b(String|List|Dictionary|Set|Stack|Queue|TextWriter|TextReader|StringBuilder)(?:\\?)?\\s*(<of\\s*[a-zA-Z0-9_]+>)\\b"
+      },
+      {
+         "begin" : "\\b(?:class)\\s*([a-zA-Z0-9_]+)",
+         "patterns" : [
+            {
+               "name" : "keyword.operator.cobra",
+               "match" : "(inherits|implements)"
+            },
+            {
+               "name" : "entity.name.type.cobra",
+               "match" : "[a-zA-Z0-9_]+"
+            },
+            {
+               "name" : "support.name.generic.cobra",
+               "match" : "<\\s*of\\s+[a-zA-Z0-9]+>"
+            }
+         ],
+         "name" : "storage.type.class.cobra",
+         "end" : "$",
+         "beginCaptures" : {
+            "1" : {
+               "name" : "entity.name.type.cobra"
+            }
+         }
+      },
+      {
+         "begin" : "^\\s*(?:def)\\s*([a-zA-Z0-9_]+)",
+         "patterns" : [
+            {
+               "include" : "#argument-list"
+            }
+         ],
+         "name" : "meta.type.method.cobra",
+         "end" : "$",
+         "beginCaptures" : {
+            "1" : {
+               "name" : "entity.name.type.cobra"
+            }
+         }
       }
    ],
@@ -279 +176 @@
    "foldingStartMarker" : "^\\s*(def|class|cue)(.*)",
    "repository" : {
+      "argument-list" : {
+         "begin" : "\\(",
+         "endCaptures" : {
+            "0" : "support"
+         },
+         "end" : "\\)",
+         "beginCaptures" : {
+            "0" : "support"
+         }
+      },
       "constant_placeholder" : {
          "name" : "constant.other.placeholder.cobra",
          "match" : "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])"
       },
-      "escaped_characters" : {
-        "match" : "(\\\\x[0-9A-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
-        "name" : "constant.character.escape.cobra"
-      },
       "generic_names" : {
          "match" : "[A-Za-z_][A-Za-z0-9_]*"
+      },
+      "escaped_characters" : {
+         "name" : "constant.character.escape.cobra",
+         "match" : "(\\\\x[0-9A-F]{2})|(\\\\[0-7]{3})|(\\\\\\n)|(\\\\\\\\)|(\\\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)"
       }
    },