github-linguist 5.0.5 → 5.0.6

data/grammars/source.terraform.json

@@ -0,0 +1,196 @@
+{
+  "fileTypes": [
+    "tf",
+    "tfvars",
+    "hcl"
+  ],
+  "name": "Terraform",
+  "patterns": [
+    {
+      "begin": "#|//",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.terraform"
+        }
+      },
+      "comment": "Comments",
+      "end": "$\\n?",
+      "name": "comment.line.number-sign.terraform"
+    },
+    {
+      "begin": "/\\*",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.comment.terraform"
+        }
+      },
+      "comment": "Block comments",
+      "end": "\\*/",
+      "name": "comment.block.terraform"
+    },
+    {
+      "comment": "Language constants (true, false, yes, no, on, off)",
+      "match": "\\b(true|false|yes|no|on|off)\\b",
+      "name": "constant.language.terraform"
+    },
+    {
+      "comment": "Numbers",
+      "match": "\\b([0-9]+)([kKmMgG]b?)?\\b",
+      "name": "constant.numeric.terraform"
+    },
+    {
+      "comment": "Hex numbers",
+      "match": "\\b(0x[0-9A-Fa-f]+)([kKmMgG]b?)?\\b",
+      "name": "constant.numeric.terraform"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "storage.type.function.terraform"
+        },
+        "2": {
+          "name": "string.terraform punctuation.definition.string.begin.terraform"
+        },
+        "3": {
+          "name": "string.value.terraform"
+        },
+        "4": {
+          "name": "string.terraform punctuation.definition.string.end.terraform"
+        },
+        "5": {
+          "name": "string.terraform punctuation.definition.string.begin.terraform"
+        },
+        "6": {
+          "name": "string.value.terraform"
+        },
+        "7": {
+          "name": "string.terraform punctuation.definition.string.end.terraform"
+        },
+        "8": {
+          "name": "punctuation.definition.tag.terraform"
+        }
+      },
+      "match": "(resource|data)\\s+(\")?(\\w+)(\")?\\s+(\")?([\\w-]+)(\")?\\s+({)",
+      "name": "meta.resource.terraform"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "storage.type.function.terraform"
+        },
+        "2": {
+          "name": "string.terraform punctuation.definition.string.begin.terraform"
+        },
+        "3": {
+          "name": "string.value.terraform"
+        },
+        "4": {
+          "name": "string.terraform punctuation.definition.string.end.terraform"
+        },
+        "5": {
+          "name": "punctuation.definition.tag.terraform"
+        }
+      },
+      "match": "(provider|provisioner|variable|output|module|atlas)\\s+(\")?([\\w-]+)(\")?\\s+({)"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "variable.other.assignment.terraform"
+        },
+        "2": {
+          "name": "keyword.operator.terraform"
+        }
+      },
+      "comment": "Value assignments (left hand side not in double quotes)",
+      "match": "([\\w_-]+)\\s*(=)\\s*"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "punctuation.quote.double.terraform"
+        },
+        "2": {
+          "name": "variable.assignment.terraform"
+        },
+        "3": {
+          "name": "punctuation.quote.double.terraform"
+        },
+        "4": {
+          "name": "keyword.operator.terraform"
+        }
+      },
+      "comment": "Value assignments (left hand side in double quotes)",
+      "match": "(\")([\\w_-]+)(\")\\s*(=)\\s*"
+    },
+    {
+      "captures": {
+        "1": {
+          "name": "entity.name.section.terraform"
+        },
+        "2": {
+          "name": "punctuation.definition.tag.terraform"
+        }
+      },
+      "comment": "Maps",
+      "match": "([\\w\\-_]+)\\s+({)"
+    },
+    {
+      "begin": "\\\"",
+      "beginCaptures": {
+        "0": {
+          "name": "string.terraform punctuation.definition.string.begin.terraform"
+        }
+      },
+      "comment": "Strings",
+      "end": "\\\"",
+      "endCaptures": {
+        "0": {
+          "name": "string.terraform punctuation.definition.string.end.terraform"
+        }
+      },
+      "name": "string.quoted.double.terraform",
+      "patterns": [
+        {
+          "include": "#string_interpolation"
+        }
+      ]
+    }
+  ],
+  "repository": {
+    "string_interpolation": {
+      "patterns": [
+        {
+          "begin": "\\$\\{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.terraform"
+            }
+          },
+          "end": "\\}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.terraform"
+            }
+          },
+          "name": "source.terraform.embedded.source",
+          "patterns": [
+            {
+              "captures": {
+                "0": {
+                  "name": "keyword.control.period.terraform"
+                }
+              },
+              "match": "(\\.)"
+            },
+            {
+              "include": "#string_interpolation"
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "scopeName": "source.terraform",
+  "uuid": "9060ca81-906d-4f19-a91a-159f4eb119d6"
+}

data/grammars/source.turing.json

@@ -576,7 +576,7 @@
       ]
     },
     "procedure": {
-      "name": "meta.scope.$1.procedure.turing",
+      "name": "meta.scope.procedure.turing",
       "begin": "\\b(?:(body)\\s+)?(procedure|proc)\\s+(\\w+)",
       "end": "\\b(end)\\s+(\\3)",
       "patterns": [

data/grammars/source.viml.json

@@ -244,7 +244,7 @@
       "patterns": [
         {
           "name": "constant.numeric.hex.viml",
-          "match": "(?:#|0[xX])[0-9A-Fa-f]+"
+          "match": "0[xX][0-9A-Fa-f]+"
         },
         {
           "name": "constant.numeric.float.exponential.viml",

data/grammars/source.yaml.json

@@ -322,9 +322,11 @@
             }
           },
           "name": "string.quoted.single.yaml",
+          "applyEndPatternLast": true,
           "patterns": [
             {
-              "include": "#escaped_char"
+              "match": "''",
+              "name": "constant.character.escape.yaml"
             },
             {
               "include": "#erb"

data/grammars/text.html.php.blade.json

@@ -8,7 +8,7 @@
   "foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
   "foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
   "injections": {
-    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:text.html.php.blade meta.tag - comment.block.blade, L:source.js.embedded.html - comment.block.blade": {
+    "text.html.php.blade - (meta.embedded | meta.tag | comment.block.blade), L:(text.html.php.blade meta.tag - comment.block.blade), L:(source.js.embedded.html - comment.block.blade)": {
       "patterns": [
         {
           "begin": "{{--",
@@ -215,7 +215,7 @@
           ]
         },
         {
-          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n  break\n|can\n|cannot\n|choice\n|continue\n|each\n|elsecan\n|elsecannot\n|elseif\n|extends\n|for\n|foreach\n|forelse\n|hasSection\n|if\n|include\n|includeIf\n|inject\n|lang\n|php\n|push\n|section\n|stack\n|unless\n|unset\n|while\n|yield\n)\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n [Bb]reak\n|[Cc]an\n|[Cc]annot\n|[Cc]hoice\n|[Cc]omponent\n|[Cc]ontinue\n|[Ee]ach\n|[Ee]lsecan\n|[Ee]lsecannot\n|[Ee]lseif\n|[Ee]xtends\n|[Ff]or\n|[Ff]oreach\n|[Ff]orelse\n|[Hh]asSection\n|[Ii]f\n|[Ii]nclude\n|[Ii]ncludeIf\n|[Ii]nject\n|[Ll]ang\n|[Pp]hp\n|[Pp]repend\n|[Pp]ush\n|[Ss]ection\n|[Ss]lot\n|[Ss]tack\n|[Uu]nless\n|[Uu]nset\n|[Ww]hile\n|[Yy]ield\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "keyword.blade"
@@ -231,7 +231,7 @@
           ]
         },
         {
-          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n append\n|else\n|empty\n|endcan\n|endcannot\n|endfor\n|endforeach\n|endforelse\n|endif\n|endphp\n|endpush\n|endsection\n|endunless\n|endwhile\n|overwrite\n|show\n|stop\n)\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to opening parentheses\n [Aa]ppend\n|[Ee]lse\n|[Ee]mpty\n|[Ee]ndcan\n|[Ee]ndcannot\n|[Ee]ndcomponent\n|[Ee]ndfor\n|[Ee]ndforeach\n|[Ee]ndforelse\n|[Ee]ndif\n|[Ee]ndlang\n|[Ee]ndprepend\n|[Ee]ndpush\n|[Ee]ndsection\n|[Ee]ndslot\n|[Ee]ndunless\n|[Ee]ndwhile\n|[Oo]verwrite\n|[Pp]arent\n|[Ss]how\n|[Ss]top\n)\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "keyword.blade"
@@ -242,12 +242,12 @@
           "name": "meta.directive.blade"
         },
         {
-          "match": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n append\n|break\n|continue\n|else\n|empty\n|endcan\n|endcannot\n|endfor\n|endforeach\n|endforelse\n|endif\n|endinject\n|endphp\n|endpush\n|endsection\n|endunless\n|endverbatim\n|endwhile\n|overwrite\n|show\n|stop\n|verbatim\n)\n\\b\n|\n(?<!@) # @parent can only be escaped using another @\n@parent",
+          "match": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n(?: # Ordering not important as we everything will be matched up to word boundary\n [Aa]ppend\n|[Bb]reak\n|[Cc]ontinue\n|[Ee]lse\n|[Ee]mpty\n|[Ee]ndcan\n|[Ee]ndcannot\n|[Ee]ndcomponent\n|[Ee]ndfor\n|[Ee]ndforeach\n|[Ee]ndforelse\n|[Ee]ndif\n|[Ee]ndlang\n|[Ee]ndprepend\n|[Ee]ndpush\n|[Ee]ndsection\n|[Ee]ndslot\n|[Ee]ndunless\n|endverbatim\n|[Ee]ndwhile\n|[Ll]ang\n|[Oo]verwrite\n|[Pp]arent\n|[Ss]how\n|[Ss]top\n|verbatim\n)\n\\b",
           "name": "keyword.blade"
         },
         {
-          "begin": "(?<![A-Za-z0-9_@])@php",
-          "end": "(?<![A-Za-z0-9_@])@endphp",
+          "begin": "(?<![A-Za-z0-9_@])@[Pp]hp",
+          "end": "(?<![A-Za-z0-9_@])@[Ee]ndphp([\\t ]*\\(.*\\)(?!.*\\)))?",
           "beginCaptures": {
             "0": {
               "name": "keyword.begin.blade"
@@ -256,6 +256,9 @@
           "endCaptures": {
             "0": {
               "name": "keyword.end.blade"
+            },
+            "1": {
+              "name": "comment.blade"
             }
           },
           "contentName": "source.php",
@@ -267,7 +270,7 @@
           ]
         },
         {
-          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n\\s* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
+          "begin": "(?x)\n(?<![A-Za-z0-9_@]) # Prepended @ or literal character escapes the sequence\n@\n\\w+(?:::w+)? # Any number/letter sequence, can also be postfixed by ::someOtherString\n[\\t ]* # Whitespace between name and parentheses, consumed\n(?=\\() # Followed by opening parentheses, not consumed",
           "beginCaptures": {
             "0": {
               "name": "entity.name.function.blade"

data/grammars/text.restructuredtext.json

@@ -212,7 +212,27 @@
         "1": {
           "name": "punctuation.definition.intepreted.restructuredtext"
         }
-      }
+      },
+      "patterns": [
+        {
+          "name": "meta.manpage.link.inline.restructuredtext",
+          "match": "(?<=:manpage:`)\\G([-.\\w]+)(\\()(\\d+)(\\))",
+          "captures": {
+            "1": {
+              "name": "markup.bold.manpage-name.restructuredtext"
+            },
+            "2": {
+              "name": "punctuation.definition.round.bracket.begin.restructuredtext"
+            },
+            "3": {
+              "name": "constant.numeric.integer.restructuredtext"
+            },
+            "4": {
+              "name": "punctuation.definition.round.bracket.begin.restructuredtext"
+            }
+          }
+        }
+      ]
     },
     "interpreted-line": {
       "name": "markup.other.command.restructuredtext",
@@ -444,7 +464,7 @@
       "patterns": [
         {
           "name": "meta.link.reference.def.restructuredtext",
-          "match": "(\\.\\.)\\s+(_)([-.\\d\\w\\s()/]+)(:)\\s+(.*)",
+          "match": "(\\.\\.)\\s+(_)([-.:+\\d\\w\\s()/]+?)(:)\\s+(.*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.link.restructuredtext"
@@ -510,15 +530,15 @@
         },
         {
           "name": "meta.link.reference",
-          "begin": "(`)",
-          "end": "(`_)",
+          "begin": "`",
+          "end": "`__?",
           "beginCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.definition.link.restructuredtext"
             }
           },
           "endCaptures": {
-            "1": {
+            "0": {
               "name": "punctuation.definition.link.restructuredtext"
             }
           },
@@ -1202,6 +1222,37 @@
             }
           }
         },
+        {
+          "name": "meta.option.directive.restructuredtext",
+          "match": "^\\s*(\\.\\.)\\s(option)(::)\\s*(.+)?$",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.directive.restructuredtext"
+            },
+            "2": {
+              "name": "support.directive.restructuredtext"
+            },
+            "3": {
+              "name": "punctuation.separator.key-value.restructuredtext"
+            },
+            "4": {
+              "patterns": [
+                {
+                  "match": "<|>",
+                  "name": "punctuation.definition.bracket.angle.restructuredtext"
+                },
+                {
+                  "match": ",",
+                  "name": "punctuation.delimiter.comma.restructuredtext"
+                },
+                {
+                  "match": "[^\\s<>,]+",
+                  "name": "entity.name.directive.restructuredtext"
+                }
+              ]
+            }
+          }
+        },
         {
           "name": "meta.other.directive.restructuredtext",
           "match": "^\\s*(\\.\\.)\\s([A-z][-A-z0-9_]+)(::)\\s*$",

data/grammars/text.roff.json

@@ -1682,7 +1682,7 @@
         {
           "name": "constant.character.escape.function.named-char.gnu.roff",
           "begin": "(\\\\)(\\[)",
-          "end": "(\\S*)(\\])|(?<!\\\\)(?=$)",
+          "end": "(\\S*?)(\\])|(?<!\\\\)(?=$)",
           "patterns": [
             {
               "include": "#params"

data/grammars/text.slim.json

@@ -31,7 +31,7 @@
         }
       },
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "text.javascript.filter.slim",
+      "name": "source.js.filter.slim",
       "patterns": [
         {
           "include": "source.js"

data/grammars/text.tex.latex.haskell.json

@@ -689,6 +689,9 @@
             },
             {
               "include": "#haskell_expr"
+            },
+            {
+              "include": "#comments"
             }
           ]
         }
@@ -719,6 +722,9 @@
                   "name": "keyword.other.haskell"
                 }
               }
+            },
+            {
+              "include": "#comments"
             }
           ]
         }
@@ -868,7 +874,7 @@
         },
         {
           "name": "keyword.control.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(do|if|then|else|case|of|let|in|default)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(do|if|then|else|case|of|let|in|default|mdo|rec|proc)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
         }
       ]
     },
@@ -1077,7 +1083,7 @@
                   "include": "#module_name_prefix"
                 },
                 {
-                  "name": "support.function.prelude.haskell",
+                  "name": "support.function.prelude.$1.haskell",
                   "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(abs|acos|acosh|all|and|any|appendFile|asTypeOf|asin|asinh|atan|atan2|atanh|break|ceiling|compare|concat|concatMap|const|cos|cosh|curry|cycle|decodeFloat|div|divMod|drop|dropWhile|either|elem|encodeFloat|enumFrom|enumFromThen|enumFromThenTo|enumFromTo|error|even|exp|exponent|fail|filter|flip|floatDigits|floatRadix|floatRange|floor|fmap|foldMap|foldl|foldl1|foldr|foldr1|fromEnum|fromInteger|fromIntegral|fromRational|fst|gcd|getChar|getContents|getLine|head|id|init|interact|ioError|isDenormalized|isIEEE|isInfinite|isNaN|isNegativeZero|iterate|last|lcm|length|lex|lines|log|logBase|lookup|map|mapM|mapM_|mappend|max|maxBound|maximum|maybe|mconcat|mempty|min|minBound|minimum|mod|negate|not|notElem|null|odd|or|otherwise|pi|pred|print|product|properFraction|pure|putChar|putStr|putStrLn|quot|quotRem|read|readFile|readIO|readList|readLn|readParen|reads|readsPrec|realToFrac|recip|rem|repeat|replicate|return|reverse|round|scaleFloat|scanl|scanl1|scanr|scanr1|seq|sequence|sequenceA|sequence_|show|showChar|showList|showParen|showString|shows|showsPrec|significand|signum|sin|sinh|snd|span|splitAt|sqrt|subtract|succ|sum|tail|take|takeWhile|tan|tanh|toEnum|toInteger|toRational|traverse|truncate|uncurry|undefined|unlines|until|unwords|unzip|unzip3|userError|words|writeFile|zip|zip3|zipWith|zipWith3)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
                 }
               ]
@@ -1098,11 +1104,11 @@
                   "include": "#module_name_prefix"
                 },
                 {
-                  "name": "entity.other.inherited-class.prelude.haskell",
+                  "name": "entity.other.inherited-class.prelude.$1.haskell",
                   "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Applicative|Bounded|Enum|Eq|Floating|Foldable|Fractional|Functor|Integral|Monad|Monoid|Num|Ord|Read|Real|RealFloat|RealFrac|Show|Traversable)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
                 },
                 {
-                  "name": "support.class.prelude.haskell",
+                  "name": "support.class.prelude.$1.haskell",
                   "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(Either|FilePath|IO|IOError|Integer|Maybe|Ordering|Rational|ReadS|ShowS|String|Bool|Char|Double|Float|Int|Word)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
                 }
               ]
@@ -1123,7 +1129,7 @@
                   "include": "#module_name_prefix"
                 },
                 {
-                  "name": "support.tag.prelude.haskell",
+                  "name": "support.tag.prelude.$1.haskell",
                   "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?<![\\p{Ll}_\\p{Lu}\\p{Lt}']))(EQ|GT|Just|LT|Left|Nothing|Right|True|False)(?:(?<=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))"
                 }
               ]