github-linguist 5.3.3 → 6.0.0

data/grammars/source.scheme.json

@@ -1,12 +1,6 @@
 {
-  "comment": "\n\t\tThe foldings do not currently work the way I want them to. This\n\t\tmay be a limitation of the way they are applied rather than the\n\t\tregexps in use. Nonetheless, the foldings will end on the last\n\t\tidentically indented blank line following an s-expression. Not\n\t\tideal perhaps, but it works. Also, the #illegal pattern never\n\t\tmatches an unpaired ( as being illegal. Why?! -- Rob Rix\n\t\t\n\t\tOk, hopefully this grammar works better on quoted stuff now.  It\n\t\tmay break for fancy macros, but should generally work pretty\n\t\tsmoothly.  -- Jacob Rus\n\t\t\n\t\tI have attempted to get this under control but because of the way folding\n\t\tand indentation interact in Textmate, I am not sure if it is possible. In the\n\t\tmeantime, I have implemented Python-style folding anchored at newlines.\n\t\tAdditionally, I have made some minor improvements to the numeric constant\n\t\thighlighting. Next up is square bracket expressions, I guess, but that\n\t\tshould be trivial. -- ozy`\n\t",
-  "fileTypes": [
-    "scm",
-    "sch",
-    "rkt"
-  ],
-  "keyEquivalent": "^~S",
   "name": "Scheme",
+  "scopeName": "source.scheme",
   "patterns": [
     {
       "include": "#comment"
@@ -30,86 +24,83 @@
   "repository": {
     "comment": {
       "begin": "(^[ \\t]+)?(?=;)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.scheme"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.semicolon.scheme",
           "begin": ";",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.scheme"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.semicolon.scheme"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.scheme"
+        }
+      }
     },
     "constants": {
       "patterns": [
         {
-          "match": "#[t|f]",
-          "name": "constant.language.boolean.scheme"
+          "name": "constant.language.boolean.scheme",
+          "match": "#[t|f]"
         },
         {
-          "match": "(?<=[\\(\\s])((#e|#i)?[0-9]+(\\.[0-9]+)?|(#x)[0-9a-fA-F]+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]])",
-          "name": "constant.numeric.scheme"
+          "name": "constant.numeric.scheme",
+          "match": "(?\u003c=[\\(\\s])((#e|#i)?[0-9]+(\\.[0-9]+)?|(#x)[0-9a-fA-F]+|(#o)[0-7]+|(#b)[01]+)(?=[\\s;()'\",\\[\\]])"
         }
       ]
     },
     "illegal": {
-      "match": "[()\\[\\]]",
-      "name": "invalid.illegal.parenthesis.scheme"
+      "name": "invalid.illegal.parenthesis.scheme",
+      "match": "[()\\[\\]]"
     },
     "language-functions": {
       "patterns": [
         {
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\(|\\[)) # preceded by space or ( \n\t\t\t\t\t\t( do|or|and|else|quasiquote|begin|if|case|set!|\n\t\t\t\t\t\t  cond|let|unquote|define|let\\*|unquote-splicing|delay|\n\t\t\t\t\t\t  letrec)\n\t\t\t\t\t\t(?=(\\s|\\())",
-          "name": "keyword.control.scheme"
+          "name": "keyword.control.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\(|\\[)) # preceded by space or ( \n\t\t\t\t\t\t( do|or|and|else|quasiquote|begin|if|case|set!|\n\t\t\t\t\t\t  cond|let|unquote|define|let\\*|unquote-splicing|delay|\n\t\t\t\t\t\t  letrec)\n\t\t\t\t\t\t(?=(\\s|\\())"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions run a test, and return a boolean\n\t\t\t\t\t\tanswer.\n\t\t\t\t\t",
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( char-alphabetic|char-lower-case|char-numeric|\n\t\t\t\t\t\t  char-ready|char-upper-case|char-whitespace|\n\t\t\t\t\t\t  (?:char|string)(?:-ci)?(?:=|<=?|>=?)|\n\t\t\t\t\t\t  atom|boolean|bound-identifier=|char|complex|\n\t\t\t\t\t\t  identifier|integer|symbol|free-identifier=|inexact|\n\t\t\t\t\t\t  eof-object|exact|list|(?:input|output)-port|pair|\n\t\t\t\t\t\t  real|rational|zero|vector|negative|odd|null|string|\n\t\t\t\t\t\t  eq|equal|eqv|even|number|positive|procedure\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(\\?)\t\t# name ends with ? sign\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t",
-          "name": "support.function.boolean-test.scheme"
+          "name": "support.function.boolean-test.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( char-alphabetic|char-lower-case|char-numeric|\n\t\t\t\t\t\t  char-ready|char-upper-case|char-whitespace|\n\t\t\t\t\t\t  (?:char|string)(?:-ci)?(?:=|\u003c=?|\u003e=?)|\n\t\t\t\t\t\t  atom|boolean|bound-identifier=|char|complex|\n\t\t\t\t\t\t  identifier|integer|symbol|free-identifier=|inexact|\n\t\t\t\t\t\t  eof-object|exact|list|(?:input|output)-port|pair|\n\t\t\t\t\t\t  real|rational|zero|vector|negative|odd|null|string|\n\t\t\t\t\t\t  eq|equal|eqv|even|number|positive|procedure\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(\\?)\t\t# name ends with ? sign\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions change one type into another.\n\t\t\t\t\t",
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( char->integer|exact->inexact|inexact->exact|\n\t\t\t\t\t\t  integer->char|symbol->string|list->vector|\n\t\t\t\t\t\t  list->string|identifier->symbol|vector->list|\n\t\t\t\t\t\t  string->list|string->number|string->symbol|\n\t\t\t\t\t\t  number->string\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\t\t\t\t\t\n\t\t\t\t\t",
-          "name": "support.function.convert-type.scheme"
+          "name": "support.function.convert-type.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( char-\u003einteger|exact-\u003einexact|inexact-\u003eexact|\n\t\t\t\t\t\t  integer-\u003echar|symbol-\u003estring|list-\u003evector|\n\t\t\t\t\t\t  list-\u003estring|identifier-\u003esymbol|vector-\u003elist|\n\t\t\t\t\t\t  string-\u003elist|string-\u003enumber|string-\u003esymbol|\n\t\t\t\t\t\t  number-\u003estring\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\t\t\t\t\t\n\t\t\t\t\t"
         },
         {
-          "comment": "\n\t\t\t\t\t\tThese functions are potentially dangerous because\n\t\t\t\t\t\tthey have side-effects which could affect other\n\t\t\t\t\t\tparts of the program.\n\t\t\t\t\t",
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( set-(?:car|cdr)|\t\t\t\t # set car/cdr\n\t\t\t\t\t\t  (?:vector|string)-(?:fill|set) # fill/set string/vector\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(!)\t\t\t# name ends with ! sign\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t",
-          "name": "support.function.with-side-effects.scheme"
+          "name": "support.function.with-side-effects.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( set-(?:car|cdr)|\t\t\t\t # set car/cdr\n\t\t\t\t\t\t  (?:vector|string)-(?:fill|set) # fill/set string/vector\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(!)\t\t\t# name ends with ! sign\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t"
         },
         {
-          "comment": "\n\t\t\t\t\t\t+, -, *, /, =, >, etc. \n\t\t\t\t\t",
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( >=?|<=?|=|[*/+-])\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t\t",
-          "name": "keyword.operator.arithmetic.scheme"
+          "name": "keyword.operator.arithmetic.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( \u003e=?|\u003c=?|=|[*/+-])\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t\t"
         },
         {
-          "match": "(?x)\n\t\t\t\t\t\t(?<=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( append|apply|approximate|\n\t\t\t\t\t\t  call-with-current-continuation|call/cc|catch|\n\t\t\t\t\t\t  construct-identifier|define-syntax|display|foo|\n\t\t\t\t\t\t  for-each|force|cd|gen-counter|gen-loser|\n\t\t\t\t\t\t  generate-identifier|last-pair|length|let-syntax|\n\t\t\t\t\t\t  letrec-syntax|list|list-ref|list-tail|load|log|\n\t\t\t\t\t\t  macro|magnitude|map|map-streams|max|member|memq|\n\t\t\t\t\t\t  memv|min|newline|nil|not|peek-char|rationalize|\n\t\t\t\t\t\t  read|read-char|return|reverse|sequence|substring|\n\t\t\t\t\t\t  syntax|syntax-rules|transcript-off|transcript-on|\n\t\t\t\t\t\t  truncate|unwrap-syntax|values-list|write|write-char|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # cons, car, cdr, etc\n\t\t\t\t\t\t  cons|c(a|d){1,4}r| \n                          \n\t\t\t\t\t\t  # unary math operators\n\t\t\t\t\t\t  abs|acos|angle|asin|assoc|assq|assv|atan|ceiling|\n\t\t\t\t\t\t  cos|floor|round|sin|sqrt|tan|\n\t\t\t\t\t\t  (?:real|imag)-part|numerator|denominator\n                          \n\t\t\t\t\t\t  # other math operators\n\t\t\t\t\t\t  modulo|exp|expt|remainder|quotient|lcm|\n                          \n\t\t\t\t\t\t  # ports / files\n\t\t\t\t\t\t  call-with-(?:input|output)-file|\n\t\t\t\t\t\t  (?:close|current)-(?:input|output)-port|\n\t\t\t\t\t\t  with-(?:input|output)-from-file|\n\t\t\t\t\t\t  open-(?:input|output)-file|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # char-«foo»\n\t\t\t\t\t\t  char-(?:downcase|upcase|ready)|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # make-«foo»\n\t\t\t\t\t\t  make-(?:polar|promise|rectangular|string|vector)\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # string-«foo», vector-«foo»\n\t\t\t\t\t\t  string(?:-(?:append|copy|length|ref))?|\n\t\t\t\t\t\t  vector(?:-length|-ref)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t",
-          "name": "support.function.general.scheme"
+          "name": "support.function.general.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(?\u003c=(\\s|\\()) # preceded by space or (\n\t\t\t\t\t\t( append|apply|approximate|\n\t\t\t\t\t\t  call-with-current-continuation|call/cc|catch|\n\t\t\t\t\t\t  construct-identifier|define-syntax|display|foo|\n\t\t\t\t\t\t  for-each|force|cd|gen-counter|gen-loser|\n\t\t\t\t\t\t  generate-identifier|last-pair|length|let-syntax|\n\t\t\t\t\t\t  letrec-syntax|list|list-ref|list-tail|load|log|\n\t\t\t\t\t\t  macro|magnitude|map|map-streams|max|member|memq|\n\t\t\t\t\t\t  memv|min|newline|nil|not|peek-char|rationalize|\n\t\t\t\t\t\t  read|read-char|return|reverse|sequence|substring|\n\t\t\t\t\t\t  syntax|syntax-rules|transcript-off|transcript-on|\n\t\t\t\t\t\t  truncate|unwrap-syntax|values-list|write|write-char|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # cons, car, cdr, etc\n\t\t\t\t\t\t  cons|c(a|d){1,4}r| \n                          \n\t\t\t\t\t\t  # unary math operators\n\t\t\t\t\t\t  abs|acos|angle|asin|assoc|assq|assv|atan|ceiling|\n\t\t\t\t\t\t  cos|floor|round|sin|sqrt|tan|\n\t\t\t\t\t\t  (?:real|imag)-part|numerator|denominator\n                          \n\t\t\t\t\t\t  # other math operators\n\t\t\t\t\t\t  modulo|exp|expt|remainder|quotient|lcm|\n                          \n\t\t\t\t\t\t  # ports / files\n\t\t\t\t\t\t  call-with-(?:input|output)-file|\n\t\t\t\t\t\t  (?:close|current)-(?:input|output)-port|\n\t\t\t\t\t\t  with-(?:input|output)-from-file|\n\t\t\t\t\t\t  open-(?:input|output)-file|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # char-«foo»\n\t\t\t\t\t\t  char-(?:downcase|upcase|ready)|\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # make-«foo»\n\t\t\t\t\t\t  make-(?:polar|promise|rectangular|string|vector)\n\t\t\t\t\t\t  \n\t\t\t\t\t\t  # string-«foo», vector-«foo»\n\t\t\t\t\t\t  string(?:-(?:append|copy|length|ref))?|\n\t\t\t\t\t\t  vector(?:-length|-ref)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t(?=(\\s|\\()) # followed by space or (\n\t\t\t\t\t"
         }
       ]
     },
     "quote": {
-      "comment": "\n\t\t\t\tWe need to be able to quote any kind of item, which creates\n\t\t\t\ta tiny bit of complexity in our grammar.  It is hopefully\n\t\t\t\tnot overwhelming complexity.\n\t\t\t\t\n\t\t\t\tNote: the first two matches are special cases.  quoted\n\t\t\t\tsymbols, and quoted empty lists are considered constant.other\n\t\t\t\t\n\t\t\t",
       "patterns": [
         {
+          "name": "constant.other.symbol.scheme",
+          "match": "(?x)\n\t\t\t\t\t\t(')\\s*\n\t\t\t\t\t\t([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*)\n\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "punctuation.section.quoted.symbol.scheme"
             }
-          },
-          "match": "(?x)\n\t\t\t\t\t\t(')\\s*\n\t\t\t\t\t\t([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)\n\t\t\t\t\t",
-          "name": "constant.other.symbol.scheme"
+          }
         },
         {
+          "name": "constant.other.empty-list.schem",
+          "match": "(?x)\n\t\t\t\t\t\t(')\\s*\n\t\t\t\t\t\t((\\()\\s*(\\)))\n\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "punctuation.section.quoted.empty-list.scheme"
@@ -123,43 +114,39 @@
             "4": {
               "name": "punctuation.section.expression.end.scheme"
             }
-          },
-          "match": "(?x)\n\t\t\t\t\t\t(')\\s*\n\t\t\t\t\t\t((\\()\\s*(\\)))\n\t\t\t\t\t",
-          "name": "constant.other.empty-list.schem"
+          }
         },
         {
-          "begin": "(')\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.section.quoted.scheme"
-            }
-          },
-          "comment": "quoted double-quoted string or s-expression",
-          "end": "(?=[\\s()])|(?<=\\n)",
           "name": "string.other.quoted-object.scheme",
+          "begin": "(')\\s*",
+          "end": "(?=[\\s()])|(?\u003c=\\n)",
           "patterns": [
             {
               "include": "#quoted"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.quoted.scheme"
+            }
+          }
         }
       ]
     },
     "quote-sexp": {
-      "begin": "(?<=\\()\\s*(quote)\\b\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.quote.scheme"
-        }
-      },
-      "comment": "\n\t\t\t\tSomething quoted with (quote «thing»).  In this case «thing»\n\t\t\t\twill not be evaluated, so we are considering it a string.\n\t\t\t",
       "contentName": "string.other.quote.scheme",
-      "end": "(?=[\\s)])|(?<=\\n)",
+      "begin": "(?\u003c=\\()\\s*(quote)\\b\\s*",
+      "end": "(?=[\\s)])|(?\u003c=\\n)",
       "patterns": [
         {
           "include": "#quoted"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.quote.scheme"
+        }
+      }
     },
     "quoted": {
       "patterns": [
@@ -167,24 +154,24 @@
           "include": "#string"
         },
         {
+          "name": "meta.expression.scheme",
           "begin": "(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#quoted"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.expression.begin.scheme"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.expression.end.scheme"
             }
-          },
-          "name": "meta.expression.scheme",
-          "patterns": [
-            {
-              "include": "#quoted"
-            }
-          ]
+          }
         },
         {
           "include": "#quote"
@@ -195,28 +182,28 @@
       ]
     },
     "sexp": {
+      "name": "meta.expression.scheme",
       "begin": "(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.section.expression.begin.scheme"
-        }
-      },
       "end": "(\\))(\\n)?",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.section.expression.end.scheme"
-        },
-        "2": {
-          "name": "meta.after-expression.scheme"
-        }
-      },
-      "name": "meta.expression.scheme",
       "patterns": [
         {
           "include": "#comment"
         },
         {
-          "begin": "(?x)\n\t\t\t\t\t\t(?<=\\()       # preceded by (\n\t\t\t\t\t\t(define)\\s+   # define\n\t\t\t\t\t\t(\\()          # list of parameters\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)\n\t\t\t\t\t\t  ((\\s+\n\t\t\t\t\t\t    ([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._])\n\t\t\t\t\t\t   )*\n\t\t\t\t\t\t  )\\s*\n\t\t\t\t\t\t(\\))\n\t\t\t\t\t",
+          "name": "meta.declaration.procedure.scheme",
+          "begin": "(?x)\n\t\t\t\t\t\t(?\u003c=\\()       # preceded by (\n\t\t\t\t\t\t(define)\\s+   # define\n\t\t\t\t\t\t(\\()          # list of parameters\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*)\n\t\t\t\t\t\t  ((\\s+\n\t\t\t\t\t\t    ([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*|[._])\n\t\t\t\t\t\t   )*\n\t\t\t\t\t\t  )\\s*\n\t\t\t\t\t\t(\\))\n\t\t\t\t\t",
+          "end": "(?=\\))",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#sexp"
+            },
+            {
+              "include": "#illegal"
+            }
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -233,9 +220,12 @@
             "7": {
               "name": "punctuation.definition.function.scheme"
             }
-          },
-          "end": "(?=\\))",
+          }
+        },
+        {
           "name": "meta.declaration.procedure.scheme",
+          "begin": "(?x)\n\t\t\t\t\t\t(?\u003c=\\() # preceded by (\n\t\t\t\t\t\t(lambda)\\s+\n\t\t\t\t\t\t(\\() # opening paren\n\t\t\t\t\t\t((?:\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*|[._])\n\t\t\t\t\t\t  \\s+\n\t\t\t\t\t\t)*(?:\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*|[._])\n\t\t\t\t\t\t)?)\n\t\t\t\t\t\t(\\)) # closing paren\n\t\t\t\t\t",
+          "end": "(?=\\))",
           "patterns": [
             {
               "include": "#comment"
@@ -246,10 +236,7 @@
             {
               "include": "#illegal"
             }
-          ]
-        },
-        {
-          "begin": "(?x)\n\t\t\t\t\t\t(?<=\\() # preceded by (\n\t\t\t\t\t\t(lambda)\\s+\n\t\t\t\t\t\t(\\() # opening paren\n\t\t\t\t\t\t((?:\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._])\n\t\t\t\t\t\t  \\s+\n\t\t\t\t\t\t)*(?:\n\t\t\t\t\t\t  ([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*|[._])\n\t\t\t\t\t\t)?)\n\t\t\t\t\t\t(\\)) # closing paren\n\t\t\t\t\t",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -263,10 +250,12 @@
             "6": {
               "name": "punctuation.definition.variable.scheme"
             }
-          },
-          "comment": "\n\t\t\t\t\t\tNot sure this one is quite correct.  That \\s* is\n\t\t\t\t\t\tparticularly troubling\n\t\t\t\t\t",
+          }
+        },
+        {
+          "name": "meta.declaration.variable.scheme",
+          "begin": "(?\u003c=\\()(define)\\s([[:alnum:]][[:alnum:]!$%\u0026*+-./:\u003c=\u003e?@^_~]*)\\s*.*?",
           "end": "(?=\\))",
-          "name": "meta.declaration.procedure.scheme",
           "patterns": [
             {
               "include": "#comment"
@@ -277,10 +266,7 @@
             {
               "include": "#illegal"
             }
-          ]
-        },
-        {
-          "begin": "(?<=\\()(define)\\s([[:alnum:]][[:alnum:]!$%&*+-./:<=>?@^_~]*)\\s*.*?",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -288,20 +274,7 @@
             "2": {
               "name": "variable.other.scheme"
             }
-          },
-          "end": "(?=\\))",
-          "name": "meta.declaration.variable.scheme",
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#sexp"
-            },
-            {
-              "include": "#illegal"
-            }
-          ]
+          }
         },
         {
           "include": "#quote-sexp"
@@ -319,21 +292,20 @@
           "include": "#constants"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\)(space|newline|tab)(?=[\\s\\)])",
-          "name": "constant.character.named.scheme"
+          "name": "constant.character.named.scheme",
+          "match": "(?\u003c=[\\(\\s])(#\\\\)(space|newline|tab)(?=[\\s\\)])"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\)x[0-9A-F]{2,4}(?=[\\s\\)])",
-          "name": "constant.character.hex-literal.scheme"
+          "name": "constant.character.hex-literal.scheme",
+          "match": "(?\u003c=[\\(\\s])(#\\\\)x[0-9A-F]{2,4}(?=[\\s\\)])"
         },
         {
-          "match": "(?<=[\\(\\s])(#\\\\).(?=[\\s\\)])",
-          "name": "constant.character.escape.scheme"
+          "name": "constant.character.escape.scheme",
+          "match": "(?\u003c=[\\(\\s])(#\\\\).(?=[\\s\\)])"
         },
         {
-          "comment": "\n\t\t\t\t\t\tthe . in (a . b) which conses together two elements\n\t\t\t\t\t\ta and b. (a b c) == (a . (b . (c . nil)))\n\t\t\t\t\t",
-          "match": "(?<=[ ()])\\.(?=[ ()])",
-          "name": "punctuation.separator.cons.scheme"
+          "name": "punctuation.separator.cons.scheme",
+          "match": "(?\u003c=[ ()])\\.(?=[ ()])"
         },
         {
           "include": "#sexp"
@@ -341,30 +313,41 @@
         {
           "include": "#illegal"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.expression.begin.scheme"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.expression.end.scheme"
+        },
+        "2": {
+          "name": "meta.after-expression.scheme"
+        }
+      }
     },
     "string": {
+      "name": "string.quoted.double.scheme",
       "begin": "(\")",
+      "end": "(\")",
+      "patterns": [
+        {
+          "name": "constant.character.escape.scheme",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.string.begin.scheme"
         }
       },
-      "end": "(\")",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.scheme"
         }
-      },
-      "name": "string.quoted.double.scheme",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.scheme"
-        }
-      ]
+      }
     }
-  },
-  "scopeName": "source.scheme",
-  "uuid": "3EC2CFD0-909C-4692-AC29-1A60ADBC161E"
-}
+  }
+}

data/grammars/source.scilab.json

@@ -1,84 +1,80 @@
 {
-  "fileTypes": [
-    "sce",
-    "sci",
-    "tst",
-    "dem"
-  ],
   "name": "Scilab",
+  "scopeName": "source.scilab",
   "patterns": [
     {
       "begin": "(^[ \\t]+)?(?=//)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.scilab"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-slash.scilab",
           "begin": "//",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.scilab"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-slash.scilab"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.scilab"
+        }
+      }
     },
     {
-      "match": "\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?\\b",
-      "name": "constant.numeric.scilab"
+      "name": "constant.numeric.scilab",
+      "match": "\\b(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?\\b"
     },
     {
-      "match": "(%inf|%i|%pi|%eps|%e|%nan|%s|%t|%f)\\b",
-      "name": "support.constant.scilab"
+      "name": "support.constant.scilab",
+      "match": "(%inf|%i|%pi|%eps|%e|%nan|%s|%t|%f)\\b"
     },
     {
+      "name": "string.quoted.double.scilab",
       "begin": "\"",
+      "end": "\"(?!\")",
+      "patterns": [
+        {
+          "name": "constant.character.escape.scilab",
+          "match": "''|\"\""
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.scilab"
         }
       },
-      "end": "\"(?!\")",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.scilab"
         }
-      },
-      "name": "string.quoted.double.scilab",
+      }
+    },
+    {
+      "name": "string.quoted.single.scilab",
+      "begin": "(?\u003c![\\w\\]\\)])'",
+      "end": "'(?!')",
       "patterns": [
         {
-          "match": "''|\"\"",
-          "name": "constant.character.escape.scilab"
+          "name": "constant.character.escape.scilab",
+          "match": "''|\"\""
         }
-      ]
-    },
-    {
-      "begin": "(?<![\\w\\]\\)])'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.scilab"
         }
       },
-      "end": "'(?!')",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.scilab"
         }
-      },
-      "name": "string.quoted.single.scilab",
-      "patterns": [
-        {
-          "match": "''|\"\"",
-          "name": "constant.character.escape.scilab"
-        }
-      ]
+      }
     },
     {
+      "match": "\\b(function)\\s+(?:[^=]+=\\s*)?(\\w+)(?:\\s*\\(.*\\))?",
       "captures": {
         "1": {
           "name": "keyword.control.scilab"
@@ -86,18 +82,15 @@
         "2": {
           "name": "entity.name.function.scilab"
         }
-      },
-      "match": "\\b(function)\\s+(?:[^=]+=\\s*)?(\\w+)(?:\\s*\\(.*\\))?"
+      }
     },
     {
-      "match": "\\b(if|then|else|elseif|while|for|function|end|endfunction|return|select|case|break|global)\\b",
-      "name": "keyword.control.scilab"
+      "name": "keyword.control.scilab",
+      "match": "\\b(if|then|else|elseif|while|for|function|end|endfunction|return|select|case|break|global)\\b"
     },
     {
-      "match": "\\.\\.\\.\\s*$",
-      "name": "punctuation.separator.continuation.scilab"
+      "name": "punctuation.separator.continuation.scilab",
+      "match": "\\.\\.\\.\\s*$"
     }
-  ],
-  "scopeName": "source.scilab",
-  "uuid": "14374AA3-A329-4623-8DFA-1ACC2CE222B9"
-}
+  ]
+}