github-linguist 5.3.3 → 6.0.0

data/grammars/text.shell-session.json

@@ -1,12 +1,9 @@
 {
-  "scopeName": "text.shell-session",
   "name": "Shell Session",
-  "fileTypes": [
-    "sh-session"
-  ],
+  "scopeName": "text.shell-session",
   "patterns": [
     {
-      "match": "(?x) ^ (?: ( (?:\\(\\S+\\))? (?: sh\\S*?                       | \\w+\\S+[@:]\\S+(?:\\s+\\S+)? | \\[\\S+[@:][^\\n]+\\].+ ) ) \\s* )? ( [>$#%] | \\p{Greek} ) \\s+ (.*) $",
+      "match": "(?x) ^ (?: ( (?:\\(\\S+\\))? (?: sh\\S*?                       | \\w+\\S+[@:]\\S+(?:\\s+\\S+)? | \\[\\S+[@:][^\\n]+\\].+ ) ) \\s* )? ( [\u003e$#%] | \\p{Greek} ) \\s+ (.*) $",
       "captures": {
         "1": {
           "name": "entity.other.prompt-prefix.shell-session"
@@ -25,8 +22,8 @@
       }
     },
     {
-      "match": "^.+$",
-      "name": "meta.output.shell-session"
+      "name": "meta.output.shell-session",
+      "match": "^.+$"
     }
   ]
-}
+}

data/grammars/text.slim.json

@@ -1,186 +1,180 @@
 {
-  "fileTypes": [
-    "slim",
-    "skim"
-  ],
-  "foldingStartMarker": "^\\s*([-%#\\:\\.\\w\\=].*)\\s$",
-  "foldingStopMarker": "^\\s*$",
-  "keyEquivalent": "^~S",
   "name": "Ruby Slim",
+  "scopeName": "text.slim",
   "patterns": [
     {
+      "name": "text.ruby.filter.slim",
       "begin": "^(\\s*)(ruby):$",
-      "beginCaptures": {
-        "2": {
-          "name": "constant.language.name.ruby.filter.slim"
-        }
-      },
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.ruby.filter.slim",
       "patterns": [
         {
           "include": "source.ruby"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(javascript):$",
+      ],
       "beginCaptures": {
         "2": {
-          "name": "constant.language.name.javascript.filter.slim"
+          "name": "constant.language.name.ruby.filter.slim"
         }
-      },
-      "end": "^(?!(\\1\\s)|\\s*$)",
+      }
+    },
+    {
       "name": "source.js.filter.slim",
+      "begin": "^(\\s*)(javascript):$",
+      "end": "^(?!(\\1\\s)|\\s*$)",
       "patterns": [
         {
           "include": "source.js"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "constant.language.name.javascript.filter.slim"
+        }
+      }
     },
     {
+      "name": "source.yaml.meta.slim",
       "begin": "^(---)\\s*\\n",
+      "end": "^(---)\\s*\\n",
+      "patterns": [
+        {
+          "include": "source.yaml"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.frontmatter.slim"
         }
       },
-      "end": "^(---)\\s*\\n",
       "endCaptures": {
         "1": {
           "name": "storage.frontmatter.slim"
         }
-      },
-      "name": "source.yaml.meta.slim",
-      "patterns": [
-        {
-          "include": "source.yaml"
-        }
-      ]
+      }
     },
     {
+      "name": "text.coffeescript.filter.slim",
       "begin": "^(\\s*)(coffee):$",
-      "beginCaptures": {
-        "2": {
-          "name": "constant.language.name.coffeescript.filter.slim"
-        }
-      },
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.coffeescript.filter.slim",
       "patterns": [
         {
           "include": "source.coffee"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "constant.language.name.coffeescript.filter.slim"
+        }
+      }
     },
     {
+      "name": "text.markdown.filter.slim",
       "begin": "^(\\s*)(markdown):$",
+      "end": "^(?!(\\1\\s)|\\s*$)",
+      "patterns": [
+        {
+          "include": "source.gfm"
+        }
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.markdown.filter.slim"
         }
-      },
+      }
+    },
+    {
+      "name": "text.css.filter.slim",
+      "begin": "^(\\s*)(css):$",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.markdown.filter.slim",
       "patterns": [
         {
-          "include": "text.html.markdown"
+          "include": "source.css"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(css):$",
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.css.filter.slim"
         }
-      },
+      }
+    },
+    {
+      "name": "text.sass.filter.slim",
+      "begin": "^(\\s*)(sass):$",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.css.filter.slim",
       "patterns": [
         {
-          "include": "source.css"
+          "include": "source.sass"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(sass):$",
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.sass.filter.slim"
         }
-      },
+      }
+    },
+    {
+      "name": "text.scss.filter.slim",
+      "begin": "^(\\s*)(scss):$",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.sass.filter.slim",
       "patterns": [
         {
-          "include": "source.sass"
+          "include": "source.scss"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(scss):$",
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.scss.filter.slim"
         }
-      },
+      }
+    },
+    {
+      "name": "text.less.filter.slim",
+      "begin": "^(\\s*)(less):$",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.scss.filter.slim",
       "patterns": [
         {
-          "include": "source.scss"
+          "include": "source.css.less"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(less):$",
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.less.filter.slim"
         }
-      },
+      }
+    },
+    {
+      "name": "text.erb.filter.slim",
+      "begin": "^(\\s*)(erb):$",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.less.filter.slim",
       "patterns": [
         {
-          "include": "source.less"
+          "include": "text.html.erb"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(erb):$",
+      ],
       "beginCaptures": {
         "2": {
           "name": "constant.language.name.erb.filter.slim"
         }
-      },
-      "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.erb.filter.slim",
-      "patterns": [
-        {
-          "include": "source.erb"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.prolog.slim",
+      "match": "^(! )($|\\s.*)",
       "captures": {
         "1": {
           "name": "punctuation.definition.prolog.slim"
         }
-      },
-      "match": "^(! )($|\\s.*)",
-      "name": "meta.prolog.slim"
+      }
     },
     {
+      "name": "comment.block.slim",
       "begin": "^(\\s*)(/)\\s*.*$",
+      "end": "^(?!(\\1\\s)|\\s*$)",
       "beginCaptures": {
         "2": {
           "name": "comment.line.slash.slim"
         }
-      },
-      "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "comment.block.slim"
+      }
     },
     {
       "begin": "^\\s*(?=-)",
@@ -208,7 +202,6 @@
     },
     {
       "begin": "^(\\s*)(\\||')\\s*",
-      "comment": "Verbatim text (can include HTML tags and copied lines)",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "patterns": [
         {
@@ -220,27 +213,26 @@
       ]
     },
     {
+      "name": "meta.tag",
       "begin": "^\\s*(\\.|#|[-a-zA-Z0-9]+)([\\w-]+)?",
-      "captures": {
-        "1": {
-          "name": "entity.name.tag.slim"
-        },
-        "2": {
-          "name": "entity.other.attribute-name.event.slim"
-        }
-      },
-      "comment": "1 - dot OR hash OR any combination of word, number; 2 - OPTIONAL any combination of word, number, dash or underscore (following a . or",
       "end": "$|(?!\\.|#|:|-|~|/|\\}|\\]|\\*|\\s?[\\*\\{])",
-      "name": "meta.tag",
       "patterns": [
         {
+          "name": "entity.name.tag.slim",
           "begin": "(:[\\w\\d]+)+",
-          "comment": "XML",
-          "end": "$|\\s",
-          "name": "entity.name.tag.slim"
+          "end": "$|\\s"
         },
         {
           "begin": "(:\\s)(\\.|#|[a-zA-Z0-9]+)([\\w-]+)?",
+          "end": "$|(?!\\.|#|=|-|~|/|\\}|\\]|\\*|\\s?[\\*\\{])",
+          "patterns": [
+            {
+              "include": "#root-class-id-tag"
+            },
+            {
+              "include": "#tag-attribute"
+            }
+          ],
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.end.slim"
@@ -251,38 +243,27 @@
             "3": {
               "name": "entity.other.attribute-name.event.slim"
             }
-          },
-          "comment": "Inline HTML / 1 - colon; 2 - dot OR hash OR any combination of word, number; 3 - OPTIONAL any combination of word, number, dash or underscore (following a . or",
-          "end": "$|(?!\\.|#|=|-|~|/|\\}|\\]|\\*|\\s?[\\*\\{])",
-          "patterns": [
-            {
-              "include": "#root-class-id-tag"
-            },
-            {
-              "include": "#tag-attribute"
-            }
-          ]
+          }
         },
         {
+          "name": "source.ruby.embedded.slim",
           "begin": "(\\*\\{)(?=.*\\}|.*\\|\\s*$)",
+          "end": "(\\})|$|^(?!.*\\|\\s*$)",
+          "patterns": [
+            {
+              "include": "#embedded-ruby"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.ruby"
             }
           },
-          "comment": "Splat attributes",
-          "end": "(\\})|$|^(?!.*\\|\\s*$)",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.embedded.ruby"
             }
-          },
-          "name": "source.ruby.embedded.slim",
-          "patterns": [
-            {
-              "include": "#embedded-ruby"
-            }
-          ]
+          }
         },
         {
           "include": "#root-class-id-tag"
@@ -291,18 +272,26 @@
           "include": "#rubyline"
         },
         {
-          "match": "/",
-          "name": "punctuation.terminator.tag.slim"
+          "name": "punctuation.terminator.tag.slim",
+          "match": "/"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.name.tag.slim"
+        },
+        "2": {
+          "name": "entity.other.attribute-name.event.slim"
+        }
+      }
     },
     {
+      "match": "^\\s*(\\\\.)",
       "captures": {
         "1": {
           "name": "meta.escape.slim"
         }
-      },
-      "match": "^\\s*(\\\\.)"
+      }
     },
     {
       "begin": "^\\s*(?=\\||')",
@@ -317,9 +306,8 @@
       ]
     },
     {
-      "begin": "(?=<[\\w\\d\\:]+)",
-      "comment": "Inline and root-level HTML tags",
-      "end": "$|\\/\\>",
+      "begin": "(?=\u003c[\\w\\d\\:]+)",
+      "end": "$|\\/\\\u003e",
       "patterns": [
         {
           "include": "text.html.basic"
@@ -329,66 +317,60 @@
   ],
   "repository": {
     "continuation": {
+      "match": "([\\\\,])\\s*\\n",
       "captures": {
         "1": {
           "name": "punctuation.separator.continuation.slim"
         }
-      },
-      "match": "([\\\\,])\\s*\\n"
+      }
     },
     "delimited-ruby-a": {
+      "name": "source.ruby.embedded.slim",
       "begin": "=\\(",
       "end": "\\)(?=( \\w|$))",
-      "name": "source.ruby.embedded.slim",
       "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
+        {}
       ]
     },
     "delimited-ruby-b": {
+      "name": "source.ruby.embedded.slim",
       "begin": "=\\[",
       "end": "\\](?=( \\w|$))",
-      "name": "source.ruby.embedded.slim",
       "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
+        {}
       ]
     },
     "delimited-ruby-c": {
+      "name": "source.ruby.embedded.slim",
       "begin": "=\\{",
       "end": "\\}(?=( \\w|$))",
-      "name": "source.ruby.embedded.slim",
       "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
+        {}
       ]
     },
     "embedded-ruby": {
-      "begin": "(?<!\\\\)#\\{{1,2}",
+      "name": "source.ruby.embedded.html",
+      "begin": "(?\u003c!\\\\)#\\{{1,2}",
+      "end": "\\}{1,2}",
+      "patterns": [
+        {}
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.embedded.ruby"
         }
       },
-      "end": "\\}{1,2}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.embedded.ruby"
         }
-      },
-      "name": "source.ruby.embedded.html",
-      "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
-      ]
+      }
     },
     "entities": {
       "patterns": [
         {
+          "name": "constant.character.entity.html",
+          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
           "captures": {
             "1": {
               "name": "punctuation.definition.entity.html"
@@ -396,22 +378,21 @@
             "3": {
               "name": "punctuation.definition.entity.html"
             }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          }
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
         }
       ]
     },
     "interpolated-ruby": {
+      "name": "source.ruby.embedded.html",
       "begin": "=(?=\\b)",
-      "end": "\\s|\\w$",
-      "name": "source.ruby.embedded.html"
+      "end": "\\s|\\w$"
     },
     "root-class-id-tag": {
+      "match": "(\\.|#)([\\w\\d\\-]+)",
       "captures": {
         "1": {
           "name": "punctuation.separator.key-value.html"
@@ -419,49 +400,58 @@
         "2": {
           "name": "entity.other.attribute-name.html"
         }
-      },
-      "match": "(\\.|#)([\\w\\d\\-]+)"
+      }
     },
     "rubyline": {
-      "begin": "(==|=)(<>|><|<'|'<|<|>)?|-",
-      "comment": "Hack to thwart Sublime's Ruby highlighter. It thinks do without a variable continues the next line (this can be muted with a / at the end of the line). For things like yields, do is unnecessary without an argument, so this hack will suffice",
-      "contentName": "source.ruby.embedded.slim",
-      "end": "(do\\s*\\n$)|(?<!\\\\|,|,\\n|\\\\\\n)$",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.control.start-block.ruby"
-        }
-      },
       "name": "meta.line.ruby.slim",
+      "contentName": "source.ruby.embedded.slim",
+      "begin": "(==|=)(\u003c\u003e|\u003e\u003c|\u003c'|'\u003c|\u003c|\u003e)?|-",
+      "end": "(do\\s*\\n$)|(?\u003c!\\\\|,|,\\n|\\\\\\n)$",
       "patterns": [
         {
-          "comment": "Hack to let ruby comments work in this context properly",
-          "match": "#.*$",
-          "name": "comment.line.number-sign.ruby"
+          "name": "comment.line.number-sign.ruby",
+          "match": "#.*$"
         },
         {
           "include": "#continuation"
         },
-        {
-          "include": "source.ruby.rails"
+        {}
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "keyword.control.start-block.ruby"
         }
-      ]
+      }
     },
     "string-double-quoted": {
+      "name": "string.quoted.double.html",
+      "contentName": "meta.toc-list.id.html",
       "begin": "(\")(?=.*\")",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#embedded-ruby"
+        },
+        {
+          "include": "#entities"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "contentName": "meta.toc-list.id.html",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
-      "name": "string.quoted.double.html",
+      }
+    },
+    "string-single-quoted": {
+      "name": "string.quoted.single.html",
+      "contentName": "meta.toc-list.id.html",
+      "begin": "(')(?=.*')",
+      "end": "'",
       "patterns": [
         {
           "include": "#embedded-ruby"
@@ -469,34 +459,33 @@
         {
           "include": "#entities"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "(')(?=.*')",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "contentName": "meta.toc-list.id.html",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
-      "name": "string.quoted.single.html",
+      }
+    },
+    "tag-attribute": {
+      "name": "meta.attribute-with-value.slim",
+      "begin": "([\\w.#_-]+)(=)(?!\\s)(true|false|nil)?(\\s*\\(|\\{)?",
+      "end": "\\}|\\)|$",
       "patterns": [
         {
-          "include": "#embedded-ruby"
+          "include": "#tag-stuff"
         },
         {
-          "include": "#entities"
+          "include": "#string-double-quoted"
+        },
+        {
+          "include": "#string-single-quoted"
         }
-      ]
-    },
-    "tag-attribute": {
-      "begin": "([\\w.#_-]+)(=)(?!\\s)(true|false|nil)?(\\s*\\(|\\{)?",
+      ],
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.event.slim"
@@ -507,20 +496,7 @@
         "3": {
           "name": "constant.language.slim"
         }
-      },
-      "end": "\\}|\\)|$",
-      "name": "meta.attribute-with-value.slim",
-      "patterns": [
-        {
-          "include": "#tag-stuff"
-        },
-        {
-          "include": "#string-double-quoted"
-        },
-        {
-          "include": "#string-single-quoted"
-        }
-      ]
+      }
     },
     "tag-stuff": {
       "patterns": [
@@ -547,7 +523,5 @@
         }
       ]
     }
-  },
-  "scopeName": "text.slim",
-  "uuid": "36302CC1-1E76-4910-B7B6-F1915EBBA0D3"
-}
+  }
+}