github-linguist 7.6.0 → 7.10.0

data/grammars/source.r.json

@@ -119,7 +119,7 @@
     },
     {
       "name": "meta.function.r",
-      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(\u003c-)\\s*(function)",
+      "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))\\s*(\u003c?\u003c-|=(?!=))\\s*(function)",
       "captures": {
         "1": {
           "name": "entity.name.function.r"
@@ -145,10 +145,10 @@
       }
     },
     {
-      "match": "([[:alpha:].][[:alnum:]._]*)\\s*\\("
+      "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))\\s*\\("
     },
     {
-      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(=)(?=[^=])",
+      "match": "([[:alpha:].][[:alnum:]._]*)\\s*(=(?!=))",
       "captures": {
         "1": {
           "name": "variable.parameter.r"
@@ -168,7 +168,7 @@
     },
     {
       "name": "variable.other.r",
-      "match": "\\b([[:alnum:]._]+)\\b"
+      "match": "((?:`[^`\\\\]*(?:\\\\.[^`\\\\]*)*`)|(?:[[:alpha:].][[:alnum:]._]*))"
     },
     {
       "name": "meta.block.r",

data/grammars/source.reason.json

@@ -138,7 +138,6 @@
       }
     },
     "comment": {
-      "name": "comment",
       "patterns": [
         {
           "include": "#comment-line"
@@ -155,31 +154,44 @@
       "name": "comment.block",
       "begin": "/\\*",
       "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#comment"
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.begin"
         }
-      ]
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.end"
+        }
+      }
     },
     "comment-block-doc": {
       "name": "comment.block.documentation",
       "begin": "/\\*\\*(?!/)",
       "end": "\\*/",
-      "patterns": [
-        {
-          "include": "#comment"
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.begin"
         }
-      ]
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment.end"
+        }
+      }
     },
     "comment-line": {
-      "name": "comment.line",
-      "begin": "(^[ \\t]+)?((//))",
-      "end": "(?=^)",
-      "patterns": [
-        {
-          "include": "#comment"
+      "name": "comment.line.double-slash",
+      "begin": "(^[ \\t]+)?(//)",
+      "end": "$",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.leading"
+        },
+        "2": {
+          "name": "punctuation.definition.comment"
         }
-      ]
+      }
     },
     "condition-lhs": {
       "begin": "(?\u003c![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])([\\?])(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])",

data/grammars/source.rego.json

@@ -0,0 +1,124 @@
+{
+  "name": "Rego",
+  "scopeName": "source.rego",
+  "patterns": [
+    {
+      "include": "#comment"
+    },
+    {
+      "include": "#keyword"
+    },
+    {
+      "include": "#operator"
+    },
+    {
+      "include": "#head"
+    },
+    {
+      "include": "#term"
+    }
+  ],
+  "repository": {
+    "call": {
+      "name": "meta.function-call.rego",
+      "match": "([a-zA-Z_][a-zA-Z0-9_]*)\\(",
+      "captures": {
+        "1": {
+          "name": "support.function.any-method.rego"
+        }
+      }
+    },
+    "comment": {
+      "name": "comment.line.number-sign.rego",
+      "match": "(#).*$\\n?",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.comment.rego"
+        }
+      }
+    },
+    "constant": {
+      "name": "constant.language.rego",
+      "match": "\\b(?:true|false|null)\\b"
+    },
+    "head": {
+      "name": "meta.function.rego",
+      "begin": "^([[:alpha:]_][[:alnum:]_]*)",
+      "end": "(=|{|\\n)",
+      "patterns": [
+        {
+          "include": "#term"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.declaration"
+        }
+      }
+    },
+    "keyword": {
+      "name": "keyword.other.rego",
+      "match": "(^|\\s+)(?:(default|not|package|import|as|with|else|some))\\s+"
+    },
+    "number": {
+      "name": "constant.numeric.rego",
+      "match": "(?x:         # turn on extended mode\n                             -?         # an optional minus\n                             (?:\n                               0        # a zero\n                               |        # ...or...\n                               [1-9]    # a 1-9 character\n                               \\d*      # followed by zero or more digits\n                             )\n                             (?:\n                               (?:\n                                 \\.     # a period\n                                 \\d+    # followed by one or more digits\n                               )?\n                               (?:\n                                 [eE]   # an e character\n                                 [+-]?  # followed by an option +/-\n                                 \\d+    # followed by one or more digits\n                               )?       # make exponent optional\n                             )?         # make decimal portion optional\n                           )"
+    },
+    "operator": {
+      "patterns": [
+        {
+          "name": "keyword.operator.comparison.rego",
+          "match": "\\=|\\!\\=|\u003e|\u003c|\u003c\\=|\u003e\\=|\\+|-|\\*|%|/|\\||\u0026|:\\="
+        }
+      ]
+    },
+    "string": {
+      "name": "string.quoted.double.rego",
+      "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.rego",
+          "match": "(?x:                # turn on extended mode\n\t           \\\\                # a literal backslash\n\t           (?:               # ...followed by...\n\t             [\"\\\\/bfnrt]     # one of these characters\n\t             |               # ...or...\n\t             u               # a u\n\t             [0-9a-fA-F]{4}  # and four hex digits\n\t           )\n\t         )"
+        },
+        {
+          "name": "invalid.illegal.unrecognized-string-escape.rego",
+          "match": "\\\\."
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.rego"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.rego"
+        }
+      }
+    },
+    "term": {
+      "patterns": [
+        {
+          "include": "#constant"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#call"
+        },
+        {
+          "include": "#variable"
+        }
+      ]
+    },
+    "variable": {
+      "name": "meta.identifier.rego",
+      "match": "\\b[[:alpha:]_][[:alnum:]_]*\\b"
+    }
+  }
+}

data/grammars/source.sass.json

@@ -258,7 +258,7 @@
     },
     {
       "name": "meta.function.include.sass",
-      "begin": "^\\s*(\\+(?!\\s+)|(?:(@)include(?=\\s+)))\\s*([a-zA-Z0-9_-]+)",
+      "begin": "^\\s*(\\+(?!\\s+)|(?:(@)include(?=\\s+)))\\s*(?:([\\w-]+)(\\.))?([a-zA-Z0-9_-]+)",
       "end": "(;)?$",
       "patterns": [
         {
@@ -273,6 +273,12 @@
           "name": "punctuation.definition.entity.sass"
         },
         "3": {
+          "name": "variable.sass"
+        },
+        "4": {
+          "name": "punctuation.access.module.sass"
+        },
+        "5": {
           "name": "variable.other.sass"
         }
       },
@@ -354,6 +360,112 @@
         }
       }
     },
+    {
+      "name": "meta.at-rule.use.sass",
+      "begin": "^\\s*((@)use\\b)\\s*",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "name": "keyword.control.operator",
+          "match": "\\b(as|with)\\b"
+        },
+        {
+          "name": "variable.sass",
+          "match": "\\b[\\w-]+\\b"
+        },
+        {
+          "name": "variable.language.expanded-namespace.sass",
+          "match": "\\*"
+        },
+        {
+          "include": "#string-single"
+        },
+        {
+          "include": "#string-double"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#property-value"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.module.begin.bracket.round.sass"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.module.end.bracket.round.sass"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.use.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.keyword.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
+    },
+    {
+      "name": "meta.at-rule.forward.sass",
+      "begin": "\\s*((@)forward\\b)\\s*",
+      "end": "\\s*(?=;)",
+      "patterns": [
+        {
+          "name": "keyword.control.operator",
+          "match": "\\b(as|hide|show)\\b"
+        },
+        {
+          "match": "\\b([\\w-]+)(\\*)",
+          "captures": {
+            "1": {
+              "name": "entity.other.attribute-name.module.sass"
+            },
+            "2": {
+              "name": "punctuation.definition.wildcard.sass"
+            }
+          }
+        },
+        {
+          "name": "entity.name.function.sass",
+          "match": "\\b[\\w-]+\\b"
+        },
+        {
+          "include": "#variable-usage"
+        },
+        {
+          "include": "#string-single"
+        },
+        {
+          "include": "#string-double"
+        },
+        {
+          "include": "#comments"
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control.at-rule.forward.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.keyword.sass"
+        }
+      }
+    },
     {
       "name": "meta.variable-usage.sass",
       "begin": "^\\s*(\\+)([a-zA-Z0-9_-]+)",
@@ -826,6 +938,43 @@
         {
           "include": "#string-single"
         },
+        {
+          "begin": "([\\w-]+)(\\.)([\\w-]+)(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#string-double"
+            },
+            {
+              "include": "#string-single"
+            },
+            {
+              "include": "#variable-usage"
+            },
+            {
+              "include": "source.css#numeric-values"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.sass"
+            },
+            "2": {
+              "name": "punctuation.access.module.sass"
+            },
+            "3": {
+              "name": "support.function.misc.sass"
+            },
+            "4": {
+              "name": "punctuation.section.function.sass"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.sass"
+            }
+          }
+        },
         {
           "begin": "(rgb|url|attr|counter|counters|local|format)\\s*(\\()",
           "end": "(\\))",
@@ -920,12 +1069,18 @@
     },
     "variable-usage": {
       "name": "meta.variable-usage.sass",
-      "match": "(!|\\$)([a-zA-Z0-9_-]+)",
+      "match": "(?:([\\w-]+)(\\.)(?=\\$))?(!|\\$)([a-zA-Z0-9_-]+)",
       "captures": {
         "1": {
-          "name": "punctuation.definition.entity.css"
+          "name": "variable.sass"
         },
         "2": {
+          "name": "punctuation.access.module.sass"
+        },
+        "3": {
+          "name": "punctuation.definition.entity.css"
+        },
+        "4": {
           "name": "variable.other.sass"
         }
       }

data/grammars/source.scala.json

@@ -101,7 +101,7 @@
     "char-literal": {
       "name": "string.quoted.other constant.character.literal.scala",
       "begin": "'",
-      "end": "'",
+      "end": "'|$",
       "patterns": [
         {
           "name": "constant.character.escape.scala",
@@ -187,6 +187,9 @@
         {
           "include": "#backQuotedVariable"
         },
+        {
+          "include": "#curly-braces"
+        },
         {
           "include": "#meta-brackets"
         },
@@ -230,7 +233,7 @@
       "patterns": [
         {
           "name": "constant.language.scala",
-          "match": "\\b(false|null|true|Nil|None)\\b"
+          "match": "\\b(false|null|true)\\b"
         },
         {
           "name": "constant.numeric.scala",
@@ -238,18 +241,29 @@
         },
         {
           "name": "variable.language.scala",
-          "match": "\\b(this|super|self)\\b"
-        },
-        {
-          "name": "storage.type.primitive.scala",
-          "match": "\\b(Unit|Boolean|Byte|Char|Short|Int|Float|Long|Double)\\b"
-        },
-        {
-          "name": "storage.type.scala",
-          "match": "\\b(String|Symbol)\\b"
+          "match": "\\b(this|super)\\b"
         }
       ]
     },
+    "curly-braces": {
+      "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#code"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.block.begin.scala"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.block.end.scala"
+        }
+      }
+    },
     "declarations": {
       "patterns": [
         {
@@ -300,7 +314,7 @@
           }
         },
         {
-          "match": "\\b(val)\\s+([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?)\\b",
+          "match": "\\b(val)\\s+([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?(\\s*,\\s*[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?)*)\\b",
           "captures": {
             "1": {
               "name": "keyword.declaration.stable.scala"
@@ -380,6 +394,10 @@
         {
           "include": "#comments"
         },
+        {
+          "name": "keyword.given.import.scala",
+          "match": "(given)(?=\\s)"
+        },
         {
           "name": "entity.name.import.scala",
           "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+))"
@@ -407,6 +425,17 @@
                 }
               }
             },
+            {
+              "match": "(given)(\\s+(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+))?(?=\\s*[,}])",
+              "captures": {
+                "1": {
+                  "name": "keyword.given.import.scala"
+                },
+                "2": {
+                  "name": "entity.name.type.import.scala"
+                }
+              }
+            },
             {
               "name": "entity.name.import.scala",
               "match": "([^\\s.,}]+)"
@@ -433,7 +462,7 @@
     "inheritance": {
       "patterns": [
         {
-          "match": "(extends|with|derives|as)\\s+([^\\s\\{\\(\\[\\]]+)",
+          "match": "(extends|with|derives)\\s+([^\\s\\{\\(\\[\\]]+)",
           "captures": {
             "1": {
               "name": "keyword.declaration.scala"
@@ -468,7 +497,11 @@
         },
         {
           "name": "keyword.control.flow.scala",
-          "match": "\\b(else|if|do|while|for|yield|match|case)\\b"
+          "match": "\\b(else|if|then|do|while|for|yield|match|case)\\b"
+        },
+        {
+          "name": "keyword.control.flow.end.scala",
+          "match": "^\\s*end(?=\\s+(if|while|for|match|(?:[A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?\u003c=_)[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\u0026*+\\-\\/:\u003c\u003e=?@^|~\\p{Sm}\\p{So}]+))\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)"
         },
         {
           "name": "keyword.control.exception.scala",
@@ -545,7 +578,7 @@
     },
     "scala-quoted": {
       "name": "constant.other.quoted.scala",
-      "match": "'\\{'|'\\('|'\\['|'\\{|'\\(|'\\["
+      "match": "('\\{|'\\[)(?!')"
     },
     "scala-symbol": {
       "name": "constant.other.symbol.scala",
@@ -568,7 +601,7 @@
         },
         {
           "name": "storage.modifier.other",
-          "match": "\\b(synchronized|@volatile|abstract|final|lazy|sealed|implicit|given|erased|enum|inline |opaque |override|@transient|@native)\\b"
+          "match": "\\b(synchronized|@volatile|abstract|final|lazy|sealed|implicit|given|enum|inline |opaque |override|@transient|@native)\\b"
         }
       ]
     },
@@ -579,7 +612,8 @@
           "match": "\\$\\$"
         },
         {
-          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*)",
+          "name": "meta.template.expression.scala",
+          "match": "(\\$)([A-Z\\p{Lt}\\p{Lu}_a-z\\$\\p{Lo}\\p{Nl}\\p{Ll}][[A-Z\\p{Lt}\\p{Lu}_a-z\\p{Lo}\\p{Nl}\\p{Ll}0-9]]*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.template-expression.begin.scala"
@@ -587,7 +621,8 @@
           }
         },
         {
-          "name": "punctuation.definition.template-expression.scala",
+          "name": "meta.template.expression.scala",
+          "contentName": "meta.embedded.line.scala",
           "begin": "\\$\\{",
           "end": "\\}",
           "patterns": [