grammars/hint.haskell.json in github-linguist-7.4.0 vs grammars/hint.haskell.json in github-linguist-7.5.0
- old
+ new
@@ -357,21 +357,18 @@
"deriving_instance_decl": {
"patterns": [
{
"name": "meta.declaration.instance.deriving.haskell",
"contentName": "meta.type-signature.haskell",
- "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}']))",
+ "begin": "^([ \\t]*)(?:(?:(deriving)(?:\\s+([\\p{Ll}_][\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']*))?)\\s+|(deriving)\\s+(via)\\s+(.*)\\s+)?(instance)(?:(?\u003c=[\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}'])(?![\\p{Ll}_\\p{Lu}\\p{Lt}\\p{Nd}']))",
"end": "^(?!\\1[ \\t]|[ \\t]*$)",
"patterns": [
{
"include": "#pragma"
},
{
"include": "#type_signature"
- },
- {
- "include": "#deriving_via"
}
],
"beginCaptures": {
"2": {
"name": "keyword.other.haskell"
@@ -382,9 +379,23 @@
"include": "#deriving_strategies"
}
]
},
"4": {
+ "name": "keyword.other.haskell"
+ },
+ "5": {
+ "name": "keyword.other.haskell"
+ },
+ "6": {
+ "name": "meta.type-signature.haskell",
+ "patterns": [
+ {
+ "include": "#type_signature"
+ }
+ ]
+ },
+ "7": {
"name": "keyword.other.haskell"
}
}
}
]