github-linguist 7.1.3 → 7.2.0

data/grammars/source.hsig.json

@@ -256,6 +256,9 @@
             {
               "include": "#deriving"
             },
+            {
+              "include": "#via"
+            },
             {
               "include": "#assignment_op"
             },
@@ -354,7 +357,7 @@
         {
           "name": "meta.declaration.instance.deriving.haskell.hsig",
           "contentName": "meta.type-signature.haskell.hsig",
-          "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": [
             {
@@ -362,11 +365,24 @@
             },
             {
               "include": "#type_signature"
+            },
+            {
+              "include": "#deriving_via"
             }
           ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.haskell.hsig"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "4": {
+              "name": "keyword.other.haskell.hsig"
             }
           }
         }
@@ -376,10 +392,17 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell.hsig",
-          "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.hsig"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -389,7 +412,7 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell.hsig",
-          "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": [
             {
@@ -404,6 +427,13 @@
           "beginCaptures": {
             "1": {
               "name": "keyword.other.haskell.hsig"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
             }
           }
         }
@@ -413,18 +443,38 @@
       "patterns": [
         {
           "name": "meta.deriving.haskell.hsig",
-          "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.hsig"
             },
             "2": {
+              "patterns": [
+                {
+                  "include": "#deriving_strategies"
+                }
+              ]
+            },
+            "3": {
               "name": "entity.other.inherited-class.haskell.hsig"
             }
           }
         }
       ]
     },
+    "deriving_strategies": {
+      "patterns": [
+        {
+          "name": "meta.deriving.strategy.haskell.hsig",
+          "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.hsig"
+            }
+          }
+        }
+      ]
+    },
     "double_colon_operator": {
       "patterns": [
         {
@@ -1477,6 +1527,71 @@
         }
       ]
     },
+    "via": {
+      "patterns": [
+        {
+          "include": "#via_list"
+        },
+        {
+          "include": "#via_simple"
+        },
+        {
+          "include": "#via_keyword"
+        }
+      ]
+    },
+    "via_keyword": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell.hsig",
+          "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.hsig"
+            }
+          }
+        }
+      ]
+    },
+    "via_list": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell.hsig",
+          "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.hsig"
+            }
+          }
+        }
+      ]
+    },
+    "via_simple": {
+      "patterns": [
+        {
+          "name": "meta.via.haskell.hsig",
+          "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.hsig"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type_signature"
+                }
+              ]
+            }
+          }
+        }
+      ]
+    },
     "where": {
       "patterns": [
         {

data/grammars/source.hx.json

@@ -1162,7 +1162,7 @@
     "metadata": {
       "patterns": [
         {
-          "begin": "(@)(:(abi|abstract|access|allow|analyzer|annotation|arrayAccess|astSource|autoBuild|bind|bitmap|bridgeProperties|build|buildXml|callable|classCode|commutative|compilerGenerated|const|coreApi|coreType|cppFileCode|cppInclude|cppNamespaceCode|dce|debug|decl|delegate|depend|deprecated|eager|enum|event|expose|extern|fakeEnum|file|fileXml|final|fixed|font|forward|forwardStatics|from|functionCode|functionTailCode|generic|genericBuild|getter|hack|headerClassCode|headerCode|headerInclude|headerNamespaceCode|hxGen|ifFeature|include|internal|isVar|javaCanonical|jsRequire|keep|keepInit|keepSub|luaDotMethod|luaRequire|macro|mergeBlock|meta|multiReturn|multiType|native|nativeChildren|nativeGen|nativeProperty|nativeStaticExtension|noCompletion|noDebug|noDoc|noImportGlobal|noPrivateAccess|noStack|noUsing|nonVirtual|notNull|ns|objc|objcProtocol|op|optional|overload|phpConstants|phpGlobal|phpClassConst|phpMagic|phpNoConstructor|pos|privateAccess|property|protected|publicFields|pure|pythonImport|readOnly|remove|require|resolve|rtti|runtime|runtimeValue|scalar|selfCall|setter|sound|sourceFile|stackOnly|strict|struct|structAccess|structInit|suppressWarnings|templatedCall|throws|to|transient|unifyMinDynamic|unreflective|unsafe|value|void|volatile)\\b)\\s*(\\()",
+          "begin": "(@)(:(abi|abstract|access|allow|analyzer|annotation|arrayAccess|astSource|autoBuild|bind|bitmap|bridgeProperties|build|buildXml|callable|classCode|commutative|compilerGenerated|const|coreApi|coreType|cppFileCode|cppInclude|cppNamespaceCode|dce|debug|decl|delegate|depend|deprecated|eager|enum|event|expose|extern|fakeEnum|file|fileXml|final|fixed|font|forward|forwardStatics|from|functionCode|functionTailCode|generic|genericBuild|getter|hack|headerClassCode|headerCode|headerInclude|headerNamespaceCode|hlNative|hxGen|ifFeature|include|inline|internal|isVar|javaCanonical|jsRequire|keep|keepInit|keepSub|luaDotMethod|luaRequire|macro|markup|mergeBlock|meta|multiReturn|multiType|native|nativeChildren|nativeGen|nativeProperty|nativeStaticExtension|noCompletion|noDebug|noDoc|noImportGlobal|noPrivateAccess|noStack|noUsing|nonVirtual|notNull|ns|nullSafety|objc|objcProtocol|op|optional|overload|phpClassConst|phpGlobal|phpMagic|phpNoConstructor|pos|private|privateAccess|property|protected|publicFields|pure|pythonImport|readOnly|remove|require|resolve|rtti|runtime|runtimeValue|scalar|selfCall|semantics|setter|sound|sourceFile|stackOnly|strict|struct|structAccess|structInit|suppressWarnings|templatedCall|throws|to|transient|unifyMinDynamic|unreflective|unsafe|using|value|void|volatile)\\b)\\s*(\\()",
           "end": "\\)",
           "patterns": [
             {
@@ -1187,7 +1187,7 @@
           }
         },
         {
-          "match": "((@)(:(abi|abstract|access|allow|analyzer|annotation|arrayAccess|astSource|autoBuild|bind|bitmap|bridgeProperties|build|buildXml|callable|classCode|commutative|compilerGenerated|const|coreApi|coreType|cppFileCode|cppInclude|cppNamespaceCode|dce|debug|decl|delegate|depend|deprecated|eager|enum|event|expose|extern|fakeEnum|file|fileXml|final|fixed|font|forward|forwardStatics|from|functionCode|functionTailCode|generic|genericBuild|getter|hack|headerClassCode|headerCode|headerInclude|headerNamespaceCode|hxGen|ifFeature|include|internal|isVar|javaCanonical|jsRequire|keep|keepInit|keepSub|luaDotMethod|luaRequire|macro|mergeBlock|meta|multiReturn|multiType|native|nativeChildren|nativeGen|nativeProperty|nativeStaticExtension|noCompletion|noDebug|noDoc|noImportGlobal|noPrivateAccess|noStack|noUsing|nonVirtual|notNull|ns|objc|objcProtocol|op|optional|overload|phpConstants|phpGlobal|phpClassConst|phpMagic|phpNoConstructor|pos|privateAccess|property|protected|publicFields|pure|pythonImport|readOnly|remove|require|resolve|rtti|runtime|runtimeValue|scalar|selfCall|setter|sound|sourceFile|stackOnly|strict|struct|structAccess|structInit|suppressWarnings|templatedCall|throws|to|transient|unifyMinDynamic|unreflective|unsafe|value|void|volatile)\\b))",
+          "match": "((@)(:(abi|abstract|access|allow|analyzer|annotation|arrayAccess|astSource|autoBuild|bind|bitmap|bridgeProperties|build|buildXml|callable|classCode|commutative|compilerGenerated|const|coreApi|coreType|cppFileCode|cppInclude|cppNamespaceCode|dce|debug|decl|delegate|depend|deprecated|eager|enum|event|expose|extern|fakeEnum|file|fileXml|final|fixed|font|forward|forwardStatics|from|functionCode|functionTailCode|generic|genericBuild|getter|hack|headerClassCode|headerCode|headerInclude|headerNamespaceCode|hlNative|hxGen|ifFeature|include|inline|internal|isVar|javaCanonical|jsRequire|keep|keepInit|keepSub|luaDotMethod|luaRequire|macro|markup|mergeBlock|meta|multiReturn|multiType|native|nativeChildren|nativeGen|nativeProperty|nativeStaticExtension|noCompletion|noDebug|noDoc|noImportGlobal|noPrivateAccess|noStack|noUsing|nonVirtual|notNull|ns|nullSafety|objc|objcProtocol|op|optional|overload|phpClassConst|phpGlobal|phpMagic|phpNoConstructor|pos|private|privateAccess|property|protected|publicFields|pure|pythonImport|readOnly|remove|require|resolve|rtti|runtime|runtimeValue|scalar|selfCall|semantics|setter|sound|sourceFile|stackOnly|strict|struct|structAccess|structInit|suppressWarnings|templatedCall|throws|to|transient|unifyMinDynamic|unreflective|unsafe|using|value|void|volatile)\\b))",
           "captures": {
             "2": {
               "name": "punctuation.metadata.hx"

data/grammars/source.jison.json

@@ -656,7 +656,7 @@
     }
   },
   "injections": {
-    "L:(meta.action.jison - (comment | string)), source.js.embedded.jison - (comment | string)": {
+    "L:(meta.action.jison - (comment | string)), source.js.embedded.jison - (comment | string), source.js.embedded.source - (comment | string.quoted.double | string.quoted.single)": {
       "patterns": [
         {
           "name": "variable.language.semantic-value.jison",

data/grammars/source.ltspice.symbol.json

@@ -0,0 +1,294 @@
+{
+  "name": "LTspice Symbol",
+  "scopeName": "source.ltspice.symbol",
+  "patterns": [
+    {
+      "include": "#main"
+    }
+  ],
+  "repository": {
+    "attr": {
+      "name": "meta.attribute.ltspice.symbol",
+      "begin": "^\\s*(SYMATTR)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "match": "\\G\\s+(\\S+)",
+          "captures": {
+            "1": {
+              "name": "entity.attribute.name.ltspice.symbol"
+            }
+          }
+        },
+        {
+          "name": "string.unquoted.attribute.value.ltspice.symbol",
+          "match": ".+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.var.attribute.ltspice.symbol"
+        }
+      }
+    },
+    "main": {
+      "patterns": [
+        {
+          "include": "#version"
+        },
+        {
+          "include": "#symbolType"
+        },
+        {
+          "include": "#shapes"
+        },
+        {
+          "include": "#window"
+        },
+        {
+          "include": "#pinAttr"
+        },
+        {
+          "include": "#pin"
+        },
+        {
+          "include": "#attr"
+        },
+        {
+          "include": "#text"
+        }
+      ]
+    },
+    "number": {
+      "patterns": [
+        {
+          "name": "constant.numeric.float.real.decimal.ltspice.symbol",
+          "match": "[-+]?[0-9]+\\.[0-9]+"
+        },
+        {
+          "name": "constant.numeric.integer.int.decimal.ltspice.symbol",
+          "match": "[-+]?[0-9]+"
+        }
+      ]
+    },
+    "pin": {
+      "name": "meta.pin.ltspice.symbol",
+      "begin": "^\\s*(PIN)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "#number"
+        },
+        {
+          "name": "constant.language.pin-alignment.ltspice.symbol",
+          "match": "\\w+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.pin.ltspice.symbol"
+        }
+      }
+    },
+    "pinAttr": {
+      "name": "meta.pin.attribute.ltspice.symbol",
+      "begin": "^\\s*(PINATTR)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "match": "\\G\\s+(SpiceOrder)\\s+(\\d+)",
+          "patterns": [
+            {
+              "include": "#number"
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "entity.pin.attribute.name.ltspice.symbol"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "match": "\\G\\s+(\\S+)",
+          "captures": {
+            "1": {
+              "name": "entity.attribute.name.ltspice.symbol"
+            }
+          }
+        },
+        {
+          "match": "(\\[)([^\\]]+)(\\])",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.brace.square.bracket.begin.ltspice.symbol"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "name": "punctuation.delimiter.separator.colon.key-value.ltspice.symbol",
+                  "match": ":"
+                },
+                {
+                  "include": "#number"
+                }
+              ]
+            },
+            "3": {
+              "name": "punctuation.definition.brace.square.bracket.begin.ltspice.symbol"
+            }
+          }
+        },
+        {
+          "name": "string.unquoted.attribute.value.ltspice.symbol",
+          "match": "[^\\s\\[]+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.var.attribute.ltspice.symbol"
+        }
+      }
+    },
+    "shapes": {
+      "name": "meta.shape.${1:/downcase}.ltspice.symbol",
+      "begin": "^\\s*(ARC|LINE|CIRCLE|RECTANGLE)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "variable.parameter.type.ltspice.symbol",
+          "match": "\\G\\s*(?!\\d)(\\w+)"
+        },
+        {
+          "include": "#number"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.var.shape.ltspice.symbol"
+        }
+      }
+    },
+    "symbolType": {
+      "name": "meta.symbol-type.ltspice.symbol",
+      "begin": "^\\s*(SymbolType)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "constant.language.symbol-type.ltspice.symbol",
+          "match": "[A-Za-z_$]+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.symbol-type.ltspice.symbol"
+        }
+      }
+    },
+    "text": {
+      "name": "meta.text.ltspice.symbol",
+      "begin": "^\\s*(TEXT)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "meta.function-call.arguments.ltspice.symbol",
+          "match": "(?x) \\G\n\\s+ ([-\\d.]+) # X\n\\s+ ([-\\d.]+) # Y\n\\s+ ([-\\w$]+) # Alignment\n\\s+ ([-\\d.]+) # Text-size",
+          "captures": {
+            "1": {
+              "name": "meta.vector.x-axis.ltspice.symbol",
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            },
+            "2": {
+              "name": "meta.vector.y-axis.ltspice.symbol",
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            },
+            "3": {
+              "name": "constant.language.text-alignment.ltspice.symbol"
+            },
+            "4": {
+              "name": "meta.text-size.ltspice.symbol",
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "name": "string.unquoted.text.ltspice.symbol",
+          "match": ".+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.var.text.ltspice.symbol"
+        }
+      }
+    },
+    "version": {
+      "name": "meta.version.ltspice.symbol",
+      "begin": "^\\s*(Version)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "#number"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.file-version.ltspice.symbol"
+        }
+      }
+    },
+    "window": {
+      "name": "meta.window.ltspice.symbol",
+      "begin": "^\\s*(WINDOW)(?=\\s|$)",
+      "end": "$",
+      "patterns": [
+        {
+          "name": "meta.function-call.arguments.ltspice.symbol",
+          "match": "\\G((?:\\s+[-\\d.]+){3})\\s+(\\w+)\\s+([-\\d.]+)",
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            },
+            "2": {
+              "name": "constant.language.window-alignment.ltspice.symbol"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#number"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.window.ltspice.symbol"
+        }
+      }
+    }
+  }
+}