github-linguist 7.1.3 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b3ea5a5906330d9b8dd8414eff457e494d9497f7cad7cb484599c7780725cf10
-  data.tar.gz: e1426243b33111ffe5083f16af40ed4e7d9e53e2206fe51e1cfdec4ee7a08277
+SHA1:
+  metadata.gz: e1b5d82326588ce899ff67555ffc5291f7888ae8
+  data.tar.gz: 709367930b683b77eaedda5205333f4b0136b658
 SHA512:
-  metadata.gz: 9462b8da7b7f5cba224fbb2a25c55a5e99b4651d8125f837330a48786b5814f31a0a19d8e5bdcc46f4a7dc27a00b99c582f984aacbde6550cf1fd6854a42ec02
-  data.tar.gz: 1a2a83bd4953486a783c3e863ccea35057686a54e5a853027f53d7a89ba5f08f02e6160da475a26076e4314f01c62fc5f47d60c4e538fb9d7ba2dff958af594b
+  metadata.gz: 28926e0d20748c753db47c29a52e5e5e483f98a88e7aa49f3a730047bc1c5894045570b86c1b8ab1675f13456e858cf993dbfb6959a411ab7ad799cc5c0101ec
+  data.tar.gz: 806e10bcd8fcb66b11a0fa01552856f6b03ab814084ad21949f72f829eb3ef519e01815bb5e62e4aa41e96d7c651071a3b32ab615d5c515224c91bc81d69ad84

data/grammars/annotation.liquidhaskell.haskell.json

@@ -276,6 +276,9 @@
             {
               "include": "#deriving"
             },
+            {
+              "include": "#via"
+            },
             {
               "include": "#assignment_op"
             },
@@ -374,7 +377,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(deriving\\s+instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "(?:\\G(?:\\s*\\w+\\s)?|^)([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "(?:^(?!\\1[ \\t]|[ \\t]*$)|(?=@-}))",
           "patterns": [
             {
@@ -382,11 +385,24 @@
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "4": {
+              "name": "keyword.other.haskell"
             }
           }
         }
@@ -396,10 +412,17 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -409,7 +432,7 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*\\(",
           "end": "\\)",
           "patterns": [
             {
@@ -424,6 +447,13 @@
           "beginCaptures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -433,18 +463,38 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
             },
             "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "3": {
               "name": "entity.other.inherited-class.haskell"
             }
           }
         }
       ]
     },
+    "deriving_strategies": {
+      "patterns": [
+        {
+          "name": "meta.deriving.strategy.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(stock|newtype|anyclass)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
     "double_colon_operator": {
       "patterns": [
         {
@@ -1552,6 +1602,71 @@
         }
       ]
     },
+    "via": {
+      "patterns": [
+        {
+          "include": "#via_list"
+        },
+        {
+          "include": "#via_simple"
+        },
+        {
+          "include": "#via_keyword"
+        }
+      ]
+    },
+    "via_keyword": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_list": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_simple": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
     "where": {
       "patterns": [
         {

data/grammars/etc.json

@@ -0,0 +1,148 @@
+{
+  "scopeName": "etc",
+  "patterns": [
+    {
+      "include": "#comment"
+    },
+    {
+      "include": "#esc"
+    },
+    {
+      "include": "#float"
+    },
+    {
+      "include": "#int"
+    },
+    {
+      "include": "#str"
+    },
+    {
+      "include": "#colon"
+    },
+    {
+      "include": "#eql"
+    },
+    {
+      "include": "#bareword"
+    }
+  ],
+  "repository": {
+    "bareword": {
+      "name": "string.unquoted.bareword",
+      "match": "[^\"\\s][\\S]*"
+    },
+    "colon": {
+      "name": "keyword.operator.assignment.key-value.colon",
+      "match": ":"
+    },
+    "comment": {
+      "name": "comment.line.number-sign",
+      "begin": "#",
+      "end": "$",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.comment"
+        }
+      }
+    },
+    "eql": {
+      "name": "keyword.operator.assignment.key-value.equals-sign",
+      "match": "="
+    },
+    "esc": {
+      "name": "constant.character.escape.backslash",
+      "match": "(\\\\).",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.escape.backslash"
+        }
+      }
+    },
+    "float": {
+      "patterns": [
+        {
+          "include": "#floatExp"
+        },
+        {
+          "include": "#floatNoExp"
+        }
+      ]
+    },
+    "floatExp": {
+      "name": "constant.numeric.float.real.decimal.dec.exponential.scientific",
+      "match": "[-+]?(?:[0-9]*\\.[0-9]+|[0-9]+\\.)(?:[eE][-+]?[0-9]+)++"
+    },
+    "floatNoExp": {
+      "name": "constant.numeric.float.real.decimal.dec",
+      "match": "[-+]?(?:[0-9]*\\.[0-9]+|[0-9]+\\.)++"
+    },
+    "int": {
+      "patterns": [
+        {
+          "include": "#intExp"
+        },
+        {
+          "include": "#intNoExp"
+        }
+      ]
+    },
+    "intExp": {
+      "name": "constant.numeric.integer.int.decimal.dec.exponential.scientific",
+      "match": "[-+]?[0-9]+[eE][-+]?[0-9]+"
+    },
+    "intNoExp": {
+      "name": "constant.numeric.integer.int.decimal.dec",
+      "match": "[-+]?[0-9]+"
+    },
+    "str": {
+      "patterns": [
+        {
+          "include": "#strDouble"
+        },
+        {
+          "include": "#strSingle"
+        }
+      ]
+    },
+    "strDouble": {
+      "name": "string.quoted.double",
+      "begin": "\"",
+      "end": "\"|(?=$)",
+      "patterns": [
+        {
+          "include": "#esc"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end"
+        }
+      }
+    },
+    "strSingle": {
+      "name": "string.quoted.single",
+      "begin": "'",
+      "end": "'|(?=$)",
+      "patterns": [
+        {
+          "include": "#esc"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end"
+        }
+      }
+    }
+  }
+}

data/grammars/hint.haskell.json

@@ -258,6 +258,9 @@
             {
               "include": "#deriving"
             },
+            {
+              "include": "#via"
+            },
             {
               "include": "#assignment_op"
             },
@@ -356,7 +359,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell",
           "contentName": "meta.type-signature.haskell",
-          "begin": "^([ \\t]*)(deriving\\s+instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "begin": "^([ \\t]*)(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "end": "^(?!\\1[ \\t]|[ \\t]*$)",
           "patterns": [
             {
@@ -364,11 +367,24 @@
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "4": {
+              "name": "keyword.other.haskell"
             }
           }
         }
@@ -378,10 +394,17 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -391,7 +414,7 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*\\(",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*\\(",
           "end": "\\)",
           "patterns": [
             {
@@ -406,6 +429,13 @@
           "beginCaptures": {
             "1": {
               "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -415,18 +445,38 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell",
-          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(deriving)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
           "captures": {
             "1": {
               "name": "keyword.other.haskell"
             },
             "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "3": {
               "name": "entity.other.inherited-class.haskell"
             }
           }
         }
       ]
     },
+    "deriving_strategies": {
+      "patterns": [
+        {
+          "name": "meta.deriving.strategy.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(stock|newtype|anyclass)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
     "double_colon_operator": {
       "patterns": [
         {
@@ -1479,6 +1529,71 @@
         }
       ]
     },
+    "via": {
+      "patterns": [
+        {
+          "include": "#via_list"
+        },
+        {
+          "include": "#via_simple"
+        },
+        {
+          "include": "#via_keyword"
+        }
+      ]
+    },
+    "via_keyword": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_list": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "begin": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#type_signature"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            }
+          }
+        }
+      ]
+    },
+    "via_simple": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell",
+          "match": "(?:(?=[\\p{Ll}_\\p{Lu}\\p{Lt}])(?\u003c![\\p{Ll}_\\p{Lu}\\p{Lt}']))(via)\\s*([\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*(?:\\.[\\p{Lu}\\p{Lt}][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*)*)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
+          "captures": {
+            "1": {
+              "name": "keyword.other.haskell"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
     "where": {
       "patterns": [
         {