@willbooster/tree-sitter-haskell 12.1.0 → 13.1.0

package/README.md

@@ -22,6 +22,8 @@ the supported language extensions. The fork's node and query contracts are descr
 The fork's main differences from upstream 0.23.1 are:
 
 - **Whitespace**: horizontal tabs separate tokens, are accepted before Haddock markers, and advance layout to the next eight-column tab stop.
+- **ExplicitNamespaces**: import and export items, including subordinate items, accept the `data` namespace, and fixity declarations accept `type` and `data`. A namespaced subordinate item such as `type (#)` or `data P` is a `namespaced_child` node with a `namespace` child; a `data` item puts a constructor name in a `constructor` field and a variable or operator in the `variable` or `operator` field.
+- **NamedDefaults**: `default` declarations accept a class name before the type list, such as `default Monoid ([Int])`, in a `class` field, and export lists accept `default` items such as `default Monoid` as `default_export` nodes.
 - **OrPatterns**: parenthesized alternatives separated by semicolons, such as `(A; B)`, parse as an `or_pattern` node with an `alternative` field for each pattern.
 - **MultilineStrings**: triple-quoted literals retain their complete source as a single `string` node, including embedded quotes, escapes, and string gaps.
 - **Comment scanning**: comments and Haddock nodes expose a named `content` child, preserving body whitespace and excluding outer delimiters. Ordinary comment injection captures this child.

package/grammar/decl.js

@@ -33,6 +33,7 @@ module.exports = {
     seq(
       field('associativity', choice('infixl', 'infixr', 'infix')),
       field('precedence', optional($.integer)),
+      optional(field('namespace', alias(choice('type', 'data'), $.namespace))),
       field('operator', sep1(',', choice($._operator_minus, $._varop, $._conop))),
     ),
   ),
@@ -186,6 +187,6 @@ module.exports = {
     field('signature', $._foreign_signature),
   ),
 
-  default_types: $ => seq('default', parens($, optional(sep1(',', field('type', $._ktype))))),
+  default_types: $ => seq('default', optional(field('class', $._tyconids)), parens($, optional(sep1(',', field('type', $._ktype))))),
 
 }

package/grammar/module.js

@@ -49,23 +49,37 @@ module.exports = {
 
   namespace: _ => choice('pattern', 'type'),
 
-  _child_type: $ => seq(field('namespace', 'type'), field('type', $._tyconids)),
+  _ie_value: $ => choice(
+    field('variable', $._varids),
+    field('operator', choice($._sym_prefix, $._pqsym)),
+  ),
+
+  _ie_name: $ => choice($._ie_value, field('type', $._tyconids)),
+
+  _ie_data: $ => seq(
+    field('namespace', alias('data', $.namespace)),
+    choice($._ie_value, field('constructor', choice($._qconid, $._constructor))),
+  ),
+
+  _child_namespaced: $ => choice(
+    seq(field('namespace', alias('type', $.namespace)), $._ie_name),
+    $._ie_data,
+  ),
 
   _child: $ => choice(
-    alias($._child_type, $.associated_type),
+    alias($._child_namespaced, $.namespaced_child),
     $._qname,
   ),
 
   children: $ => parens($, sep(',', field('element', choice(alias('..', $.all_names), $._child)))),
 
-  _ie_entity: $ => seq(
-    optional(field('namespace', $.namespace)),
-    choice(
-      field('variable', $._varids),
-      field('type', $._tyconids),
-      field('operator', choice($._sym_prefix, $._pqsym)),
+  _ie_entity: $ => choice(
+    seq(
+      optional(field('namespace', $.namespace)),
+      $._ie_name,
+      optional(field('children', $.children)),
     ),
-    optional(field('children', $.children)),
+    $._ie_data,
   ),
 
   // ------------------------------------------------------------------------
@@ -97,9 +111,11 @@ module.exports = {
 
   module_export: $ => seq('module', field('module', $.module)),
 
+  default_export: $ => seq('default', field('class', $._tyconids)),
+
   exports: $ => parens(
     $,
-    optional(sep1(',', choice(field('export', alias($._ie_entity, $.export)), $.module_export))),
+    optional(sep1(',', choice(field('export', alias($._ie_entity, $.export)), $.module_export, $.default_export))),
     optional(','),
   ),
 

package/hsc/src/node-types.json

@@ -1177,36 +1177,6 @@
       }
     }
   },
-  {
-    "type": "associated_type",
-    "named": true,
-    "fields": {
-      "namespace": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "type",
-            "named": false
-          }
-        ]
-      },
-      "type": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "name",
-            "named": true
-          },
-          {
-            "type": "qualified",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "bind",
     "named": true,
@@ -1417,15 +1387,15 @@
             "named": true
           },
           {
-            "type": "associated_type",
+            "type": "constructor",
             "named": true
           },
           {
-            "type": "constructor",
+            "type": "hsc",
             "named": true
           },
           {
-            "type": "hsc",
+            "type": "namespaced_child",
             "named": true
           },
           {
@@ -2058,6 +2028,26 @@
       ]
     }
   },
+  {
+    "type": "default_export",
+    "named": true,
+    "fields": {
+      "class": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "default_signature",
     "named": true,
@@ -2078,6 +2068,20 @@
     "type": "default_types",
     "named": true,
     "fields": {
+      "class": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "type": {
         "multiple": true,
         "required": false,
@@ -2518,6 +2522,20 @@
           }
         ]
       },
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "namespace": {
         "multiple": false,
         "required": false,
@@ -2597,6 +2615,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "default_export",
+          "named": true
+        },
         {
           "type": "module_export",
           "named": true
@@ -2861,6 +2883,16 @@
           }
         ]
       },
+      "namespace": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "namespace",
+            "named": true
+          }
+        ]
+      },
       "operator": {
         "multiple": true,
         "required": true,
@@ -3636,6 +3668,20 @@
           }
         ]
       },
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "namespace": {
         "multiple": false,
         "required": false,
@@ -4643,6 +4689,74 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "namespaced_child",
+    "named": true,
+    "fields": {
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
+      "namespace": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "namespace",
+            "named": true
+          }
+        ]
+      },
+      "operator": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "prefix_id",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
+      "variable": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "qualified",
+            "named": true
+          },
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "negation",
     "named": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-haskell",
-  "version": "12.1.0",
+  "version": "13.1.0",
   "description": "Haskell grammar for tree-sitter",
   "keywords": [
     "incremental",

package/queries/highlights.scm

@@ -105,6 +105,7 @@
   "as"
   "hiding"
   "deriving"
+  "default"
   "via"
   "stock"
   "anyclass"
@@ -116,6 +117,8 @@
   "infixr"
 ] @keyword
 
+(namespace) @keyword
+
 [
   (function name: (variable) @function)
   (bind name: (variable) @function)

package/src/node-types.json

@@ -1157,36 +1157,6 @@
       }
     }
   },
-  {
-    "type": "associated_type",
-    "named": true,
-    "fields": {
-      "namespace": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "type",
-            "named": false
-          }
-        ]
-      },
-      "type": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "name",
-            "named": true
-          },
-          {
-            "type": "qualified",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "bind",
     "named": true,
@@ -1389,11 +1359,11 @@
             "named": true
           },
           {
-            "type": "associated_type",
+            "type": "constructor",
             "named": true
           },
           {
-            "type": "constructor",
+            "type": "namespaced_child",
             "named": true
           },
           {
@@ -2010,6 +1980,26 @@
       ]
     }
   },
+  {
+    "type": "default_export",
+    "named": true,
+    "fields": {
+      "class": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "default_signature",
     "named": true,
@@ -2030,6 +2020,20 @@
     "type": "default_types",
     "named": true,
     "fields": {
+      "class": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "type": {
         "multiple": true,
         "required": false,
@@ -2458,6 +2462,20 @@
           }
         ]
       },
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "namespace": {
         "multiple": false,
         "required": false,
@@ -2527,6 +2545,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "default_export",
+          "named": true
+        },
         {
           "type": "module_export",
           "named": true
@@ -2791,6 +2813,16 @@
           }
         ]
       },
+      "namespace": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "namespace",
+            "named": true
+          }
+        ]
+      },
       "operator": {
         "multiple": true,
         "required": true,
@@ -3520,6 +3552,20 @@
           }
         ]
       },
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
       "namespace": {
         "multiple": false,
         "required": false,
@@ -4488,6 +4534,74 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "namespaced_child",
+    "named": true,
+    "fields": {
+      "constructor": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "constructor",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
+      "namespace": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "namespace",
+            "named": true
+          }
+        ]
+      },
+      "operator": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "prefix_id",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          },
+          {
+            "type": "qualified",
+            "named": true
+          }
+        ]
+      },
+      "variable": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "qualified",
+            "named": true
+          },
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "negation",
     "named": true,

package/tree-sitter.json

@@ -35,7 +35,7 @@
     }
   ],
   "metadata": {
-    "version": "12.1.0",
+    "version": "13.1.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [