github-linguist 5.2.0 → 5.3.0

data/grammars/source.elixir.json

@@ -21,10 +21,6 @@
       "patterns": [
         {
           "include": "#core_syntax"
-        },
-        {
-          "match": "\\b[a-z_]\\w*(?!\\()\\b",
-          "name": "variable.parameter.function.anonymous.elixir"
         }
       ]
     },
@@ -50,10 +46,6 @@
       "patterns": [
         {
           "include": "#core_syntax"
-        },
-        {
-          "match": "\\b[a-z_]\\w*(?!\\()\\b",
-          "name": "variable.parameter.function.anonymous.elixir"
         }
       ]
     },
@@ -82,10 +74,6 @@
       "patterns": [
         {
           "include": "#core_syntax"
-        },
-        {
-          "match": "\\b[a-z_]\\w*(?!\\()\\b",
-          "name": "variable.parameter.function.anonymous.elixir"
         }
       ]
     }
@@ -197,30 +185,9 @@
                 }
               ]
             },
-            {
-              "begin": "(\\b[a-z_]\\w*)(\\\\\\\\)",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.parameter.function.public.elixir"
-                },
-                "2": {
-                  "name": "keyword.operator.other.elixir"
-                }
-              },
-              "end": ",|$",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
-            },
             {
               "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b",
               "name": "keyword.control.elixir"
-            },
-            {
-              "match": "\\b[a-z_]\\w*\\b",
-              "name": "variable.parameter.function.public.elixir"
             }
           ]
         },
@@ -265,30 +232,9 @@
                 }
               ]
             },
-            {
-              "begin": "(\\b[a-z_]\\w*)(\\\\\\\\)",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.parameter.function.private.elixir"
-                },
-                "2": {
-                  "name": "keyword.operator.other.elixir"
-                }
-              },
-              "end": ",|$",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
-            },
             {
               "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b",
               "name": "keyword.control.elixir"
-            },
-            {
-              "match": "\\b[a-z_]\\w*\\b",
-              "name": "variable.parameter.function.private.elixir"
             }
           ]
         },
@@ -381,7 +327,7 @@
         },
         {
           "comment": " as above, just doesn't need a 'end' and does a logic operation",
-          "match": "(?<!\\.)\\b(and|not|or|when|xor|in|inlist|inbits)\\b",
+          "match": "(?<!\\.)\\b(and|not|or|when|xor|in)\\b",
           "name": "keyword.operator.elixir"
         },
         {
@@ -809,7 +755,7 @@
             }
           },
           "comment": "symbols",
-          "match": "(?<!:)(:)(?>[a-zA-Z_][\\w@]*(?>[?!]|=(?![>=]))?|\\<\\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\\-|\\|>|=>|~|~=|=|/|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|>=?|<=?|&&?&?|\\+\\+?|\\-\\-?|\\|\\|?\\|?|\\!|@|\\%?\\{\\}|%|\\[\\]|\\^(\\^\\^)?)",
+          "match": "(?<!:)(:)(?>[a-zA-Z_][\\w@]*(?>[?!]|=(?![>=]))?|\\<\\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\\-|\\|>|=>|=~|=|/|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|>=?|<=?|&&?&?|\\+\\+?|\\-\\-?|\\|\\|?\\|?|\\!|@|\\%?\\{\\}|%|\\[\\]|\\^(\\^\\^)?)",
           "name": "constant.other.symbol.elixir"
         },
         {
@@ -845,10 +791,6 @@
           "match": "(?<!\\w)\\?(\\\\(x[0-9A-Fa-f]{1,2}(?![0-9A-Fa-f])\\b|[^xMC])|[^\\s\\\\])",
           "name": "constant.numeric.elixir"
         },
-        {
-          "match": "\\+=|\\-=|\\|\\|=|~=|&&=",
-          "name": "keyword.operator.assignment.augmented.elixir"
-        },
         {
           "match": "===?|!==?|<=?|>=?",
           "name": "keyword.operator.comparison.elixir"
@@ -866,7 +808,7 @@
           "name": "keyword.operator.arithmetic.elixir"
         },
         {
-          "match": "\\||\\+\\+|\\-\\-|\\*\\*|\\\\\\\\|\\<\\-|\\<\\>|\\<\\<|\\>\\>|\\:\\:|\\.\\.|\\|>|~|=>",
+          "match": "\\||\\+\\+|\\-\\-|\\*\\*|\\\\\\\\|\\<\\-|\\<\\>|\\<\\<|\\>\\>|\\:\\:|\\.\\.|\\|>|~|=>|&",
           "name": "keyword.operator.other.elixir"
         },
         {

data/grammars/source.elm.json

@@ -1,10 +1,14 @@
 {
+  "name": "Elm",
+  "scopeName": "source.elm",
   "fileTypes": [
     "elm"
   ],
-  "name": "Elm",
+  "uuid": "2cb90e5e-6e98-456d-9a8a-b59935dbc4b0",
   "patterns": [
     {
+      "name": "keyword.operator.function.infix.elm",
+      "match": "(`)[a-zA-Z_']*?(`)",
       "captures": {
         "1": {
           "name": "punctuation.definition.entity.elm"
@@ -12,15 +16,14 @@
         "2": {
           "name": "punctuation.definition.entity.elm"
         }
-      },
-      "match": "(`)[a-zA-Z_']*?(`)",
-      "name": "keyword.operator.function.infix.elm"
+      }
     },
     {
-      "match": "\\(\\)",
-      "name": "constant.language.unit.elm"
+      "name": "constant.language.unit.elm",
+      "match": "\\(\\)"
     },
     {
+      "name": "meta.declaration.module.elm",
       "begin": "^\\b((effect|port)\\s+)?(module)\\s+",
       "beginCaptures": {
         "1": {
@@ -36,7 +39,6 @@
           "name": "keyword.other.elm"
         }
       },
-      "name": "meta.declaration.module.elm",
       "patterns": [
         {
           "include": "#module_name"
@@ -56,23 +58,24 @@
           ]
         },
         {
-          "match": "(exposing)",
-          "name": "keyword.other.elm"
+          "name": "keyword.other.elm",
+          "match": "(exposing)"
         },
         {
           "include": "#module_exports"
         },
         {
-          "match": "(where)",
-          "name": "keyword.other.elm"
+          "name": "keyword.other.elm",
+          "match": "(where)"
         },
         {
-          "match": "[a-z]+",
-          "name": "invalid"
+          "name": "invalid",
+          "match": "[a-z]+"
         }
       ]
     },
     {
+      "name": "meta.import.elm",
       "begin": "^\\b(import)\\s+((open)\\s+)?",
       "beginCaptures": {
         "1": {
@@ -83,11 +86,10 @@
         }
       },
       "end": "($|;)",
-      "name": "meta.import.elm",
       "patterns": [
         {
-          "match": "(as|exposing)",
-          "name": "keyword.import.elm"
+          "name": "keyword.import.elm",
+          "match": "(as|exposing)"
         },
         {
           "include": "#module_name"
@@ -98,6 +100,7 @@
       ]
     },
     {
+      "name": "entity.glsl.elm",
       "begin": "(\\[)(glsl)(\\|)",
       "beginCaptures": {
         "1": {
@@ -116,7 +119,6 @@
           "name": "keyword.other.elm"
         }
       },
-      "name": "entity.glsl.elm",
       "patterns": [
         {
           "include": "source.glsl"
@@ -124,23 +126,24 @@
       ]
     },
     {
-      "match": "\\b(type alias|type|case|of|let|in|as)\\s+",
-      "name": "keyword.other.elm"
+      "name": "keyword.other.elm",
+      "match": "\\b(type alias|type|case|of|let|in|as)\\s+"
     },
     {
-      "match": "\\b(if|then|else)\\s+",
-      "name": "keyword.control.elm"
+      "name": "keyword.control.elm",
+      "match": "\\b(if|then|else)\\s+"
     },
     {
       "comment": "Floats are always decimal",
-      "match": "\\b([0-9]+\\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\\b",
-      "name": "constant.numeric.float.elm"
+      "name": "constant.numeric.float.elm",
+      "match": "\\b([0-9]+\\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\\b"
     },
     {
-      "match": "\\b([0-9]+)\\b",
-      "name": "constant.numeric.elm"
+      "name": "constant.numeric.elm",
+      "match": "\\b([0-9]+)\\b"
     },
     {
+      "name": "string.quoted.double.elm",
       "begin": "\"\"\"",
       "beginCaptures": {
         "0": {
@@ -153,19 +156,19 @@
           "name": "punctuation.definition.string.end.elm"
         }
       },
-      "name": "string.quoted.double.elm",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\'\\&])",
-          "name": "constant.character.escape.elm"
+          "name": "constant.character.escape.elm",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\'\\&])"
         },
         {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
-          "name": "constant.character.escape.control.elm"
+          "name": "constant.character.escape.control.elm",
+          "match": "\\^[A-Z@\\[\\]\\\\\\^_]"
         }
       ]
     },
     {
+      "name": "string.quoted.double.elm",
       "begin": "\"",
       "beginCaptures": {
         "0": {
@@ -178,19 +181,20 @@
           "name": "punctuation.definition.string.end.elm"
         }
       },
-      "name": "string.quoted.double.elm",
       "patterns": [
         {
-          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])",
-          "name": "constant.character.escape.elm"
+          "name": "constant.character.escape.elm",
+          "match": "\\\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\\\\\"'\\&])"
         },
         {
-          "match": "\\^[A-Z@\\[\\]\\\\\\^_]",
-          "name": "constant.character.escape.control.elm"
+          "name": "constant.character.escape.control.elm",
+          "match": "\\^[A-Z@\\[\\]\\\\\\^_]"
         }
       ]
     },
     {
+      "name": "string.quoted.single.elm",
+      "match": "(?x)\n(')\n(?:\n\t[\\ -\\[\\]-~]\t\t\t\t\t\t\t\t# Basic Char\n  | (\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE\n\t\t|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS\n\t\t|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]))\t\t# Escapes\n  | (\\^[A-Z@\\[\\]\\\\\\^_])\t\t\t\t\t\t# Control Chars\n)\n(')",
       "captures": {
         "1": {
           "name": "punctuation.definition.string.begin.elm"
@@ -201,11 +205,10 @@
         "3": {
           "name": "punctuation.definition.string.end.elm"
         }
-      },
-      "match": "(?x)\n(')\n(?:\n\t[\\ -\\[\\]-~]\t\t\t\t\t\t\t\t# Basic Char\n  | (\\\\(?:NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE\n\t\t|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS\n\t\t|US|SP|DEL|[abfnrtv\\\\\\\"'\\&]))\t\t# Escapes\n  | (\\^[A-Z@\\[\\]\\\\\\^_])\t\t\t\t\t\t# Control Chars\n)\n(')",
-      "name": "string.quoted.single.elm"
+      }
     },
     {
+      "name": "meta.function.type-declaration.elm",
       "begin": "^(port\\s+)?([a-z_][a-zA-Z0-9_']*|\\([|!%$+\\-.,=</>]+\\))\\s*((:)([:]+)?)",
       "beginCaptures": {
         "1": {
@@ -222,7 +225,6 @@
         }
       },
       "end": "$\\n?",
-      "name": "meta.function.type-declaration.elm",
       "patterns": [
         {
           "include": "#type_signature"
@@ -230,68 +232,68 @@
       ]
     },
     {
-      "match": "\\bport\\s+",
-      "name": "keyword.other.port.elm"
+      "name": "keyword.other.port.elm",
+      "match": "\\bport\\s+"
     },
     {
-      "match": "\\b[A-Z]\\w*\\b",
-      "name": "constant.other.elm"
+      "name": "constant.other.elm",
+      "match": "\\b[A-Z]\\w*\\b"
     },
     {
       "include": "#comments"
     },
     {
-      "match": "^[a-z][A-Za-z0-9_']*\\s+",
-      "name": "entity.name.function.elm"
+      "name": "entity.name.function.elm",
+      "match": "^[a-z][A-Za-z0-9_']*\\s+"
     },
     {
       "include": "#infix_op"
     },
     {
-      "match": "[|!%$?~+:\\-.=</>&\\\\*^]+",
-      "name": "keyword.operator.elm"
+      "name": "keyword.operator.elm",
+      "match": "[|!%$?~+:\\-.=</>&\\\\*^]+"
     },
     {
+      "name": "constant.language.delimiter.elm",
+      "match": "([\\[\\]\\{\\},])",
       "captures": {
         "1": {
           "name": "support.function.delimiter.elm"
         }
-      },
-      "match": "([\\[\\]\\{\\},])",
-      "name": "constant.language.delimiter.elm"
+      }
     },
     {
-      "match": "([\\(\\)])",
-      "name": "keyword.other.parenthesis.elm"
+      "name": "keyword.other.parenthesis.elm",
+      "match": "([\\(\\)])"
     }
   ],
   "repository": {
     "block_comment": {
-      "applyEndPatternLast": 1,
+      "name": "comment.block.elm",
       "begin": "\\{-(?!#)",
+      "end": "-\\}",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.elm"
         }
       },
-      "end": "-\\}",
-      "name": "comment.block.elm",
       "patterns": [
         {
           "include": "#block_comment"
         }
-      ]
+      ],
+      "applyEndPatternLast": 1
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.line.double-dash.elm",
+          "match": "(--).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.elm"
             }
-          },
-          "match": "(--).*$\\n?",
-          "name": "comment.line.double-dash.elm"
+          }
         },
         {
           "include": "#block_comment"
@@ -299,43 +301,45 @@
       ]
     },
     "infix_op": {
-      "match": "(\\([|!%$+:\\-.=</>]+\\)|\\(,+\\))",
-      "name": "entity.name.function.infix.elm"
+      "name": "entity.name.function.infix.elm",
+      "match": "(\\([|!%$+:\\-.=</>]+\\)|\\(,+\\))"
     },
     "module_exports": {
+      "name": "meta.declaration.exports.elm",
       "begin": "\\(",
       "end": "\\)",
-      "name": "meta.declaration.exports.elm",
       "patterns": [
         {
-          "match": "\\b[a-z][a-zA-Z_'0-9]*",
-          "name": "entity.name.function.elm"
+          "name": "entity.name.function.elm",
+          "match": "\\b[a-z][a-zA-Z_'0-9]*"
         },
         {
-          "match": "\\b[A-Z][A-Za-z_'0-9]*",
-          "name": "storage.type.elm"
+          "name": "storage.type.elm",
+          "match": "\\b[A-Z][A-Za-z_'0-9]*"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.comma.elm"
+          "name": "punctuation.separator.comma.elm",
+          "match": ","
         },
         {
           "include": "#infix_op"
         },
         {
           "comment": "So named because I don't know what to call this.",
-          "match": "\\(.*?\\)",
-          "name": "meta.other.unknown.elm"
+          "name": "meta.other.unknown.elm",
+          "match": "\\(.*?\\)"
         }
       ]
     },
     "module_name": {
-      "match": "[A-Z][A-Za-z._']*",
-      "name": "support.other.module.elm"
+      "name": "support.other.module.elm",
+      "match": "[A-Z][A-Za-z._']*"
     },
     "type_signature": {
       "patterns": [
         {
+          "name": "meta.class-constraint.elm",
+          "match": "\\(\\s*([A-Z][A-Za-z]*)\\s+([a-z][A-Za-z_']*)\\)\\s*(=>)",
           "captures": {
             "1": {
               "name": "entity.other.inherited-class.elm"
@@ -346,36 +350,32 @@
             "3": {
               "name": "keyword.other.big-arrow.elm"
             }
-          },
-          "match": "\\(\\s*([A-Z][A-Za-z]*)\\s+([a-z][A-Za-z_']*)\\)\\s*(=>)",
-          "name": "meta.class-constraint.elm"
+          }
         },
         {
-          "match": "->",
-          "name": "keyword.other.arrow.elm"
+          "name": "keyword.other.arrow.elm",
+          "match": "->"
         },
         {
-          "match": "=>",
-          "name": "keyword.other.big-arrow.elm"
+          "name": "keyword.other.big-arrow.elm",
+          "match": "=>"
         },
         {
-          "match": "\\b[a-z][a-zA-Z0-9_']*\\b",
-          "name": "variable.other.generic-type.elm"
+          "name": "variable.other.generic-type.elm",
+          "match": "\\b[a-z][a-zA-Z0-9_']*\\b"
         },
         {
-          "match": "\\b[A-Z][a-zA-Z0-9_']*\\b",
-          "name": "storage.type.elm"
+          "name": "storage.type.elm",
+          "match": "\\b[A-Z][a-zA-Z0-9_']*\\b"
         },
         {
-          "match": "\\(\\)",
-          "name": "support.constant.unit.elm"
+          "name": "support.constant.unit.elm",
+          "match": "\\(\\)"
         },
         {
           "include": "#comments"
         }
       ]
     }
-  },
-  "scopeName": "source.elm",
-  "uuid": "2cb90e5e-6e98-456d-9a8a-b59935dbc4b0"
+  }
 }