Rewrite the grammar once again

.editorconfig

@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8

.gitattributes

@@ -1,2 +1,5 @@
 /src/** linguist-vendored
-/examples/* linguist-vendored
+/test/libs/* linguist-vendored
+/src/parser.c -diff
+/src/grammar.json -diff
+/src/node-types.json -diff

.github/workflows/assets.yml

@@ -0,0 +1,33 @@
+name: Publish assets
+
+on:
+  workflow_run:
+    workflows: [CI]
+    types: [completed]
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - run: nix -L build .#parser-src
+      - name: Upload parser sources
+        uses: actions/upload-artifact@v4
+        with:
+          name: tree-sitter-haskell-src
+          path: result/src
+
+      - run: nix -L build .#parser-wasm
+      - name: Upload wasm binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: tree-sitter-haskell-wasm
+          path: result/tree-sitter-haskell.wasm

.github/workflows/ci.yml

@@ -2,17 +2,16 @@ name: CI
 
 on:
   push:
-    branches:
-      - "**"
+    branches: [main]
+    tags: ['**']
   pull_request:
-    types:
-      - opened
-      - synchronize
+    types: [opened, synchronize]
 
 jobs:
   test:
-    name: test / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: test / ${{matrix.os}}
+    runs-on: ${{matrix.os}}
+    if: github.event.pull_request.merged == true || github.event.action != 'closed'
     strategy:
       fail-fast: false
       matrix:
@@ -27,20 +26,39 @@ jobs:
         with:
           node-version: '18'
 
-      # - name: Install emscripten
-      #   uses: mymindstorm/setup-emsdk@v10
-      #   with:
-      #     version: '2.0.24'
+      - name: Install emscripten
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: '3.1.47'
 
-      - name: Build tree-sitter-haskell
+      - name: Build dependencies
         run: npm install
 
       - name: Run tests
         run: npm test
 
-      - name: Parse examples
-        run: npm run examples
+      - name: Parse libraries
+        run: npm run libs
+
+      - name: Parse libraries with wasm
+        run: npm run libs-wasm
+
+      - name: Run fuzzer
+        if: ${{matrix.os == 'ubuntu-latest'}}
+        uses: tree-sitter/fuzz-action@v4
 
-      # - name: Parse examples with web binding
-      #   run: npm run examples-wasm
+  legacy:
+    permissions:
+      contents: write
+      id-token: write
+    needs: test
+    if: github.ref_type == 'tag'
+    uses: ./.github/workflows/legacy.yml
 
+  release:
+    permissions:
+      contents: read
+      id-token: write
+    needs: test
+    if: github.ref_type == 'tag'
+    uses: ./.github/workflows/release.yml

.github/workflows/legacy.yml

@@ -0,0 +1,36 @@
+name: Update legacy branch
+
+on:
+  workflow_call:
+
+jobs:
+  commit:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{github.ref}}
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+
+      - name: Reset worktree to ${{github.ref_name}}
+        run: |
+          git restore --source=${{github.ref}} .
+          git restore .gitignore
+
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - name: Generate parser
+        run: nix -L run .#gen-parser
+
+      - name: Commit and push to legacy branch
+        uses: actions-js/push@v1.4
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          message: "Legacy release ${{github.ref_name}}"
+          branch: master

.github/workflows/release.yml

@@ -1,8 +1,7 @@
 name: Publish package
 
 on:
-  push:
-    tags: ["*"]
+  workflow_call:
 
 concurrency:
   group: ${{github.workflow}}-${{github.ref}}
@@ -17,3 +16,7 @@ jobs:
     uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
     secrets:
       CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_TOKEN}}
+  pypi:
+    uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main
+    secrets:
+      PYPI_API_TOKEN: ${{secrets.PYPI_TOKEN}}

.gitignore

@@ -1,11 +1,13 @@
-node_modules
-build
+/src/parser.c
+/dist-newstyle
+/result
+/test/libs/*
+!/test/libs/.gitkeep
+/build/
+/target/
+/.lib/
+/node_modules/
 *.log
-package-lock.json
-repos
-examples/*
-!examples/.gitkeep
 .gdb_history
 *.o
 *.so
-/.build/

Cargo.toml

@@ -1,12 +1,11 @@
 [package]
 name = "tree-sitter-haskell"
 description = "haskell grammar for the tree-sitter parsing library"
-version = "0.15.0"
+version = "1.0.0"
 keywords = ["incremental", "parsing", "haskell"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-haskell"
-edition = "2018"
-license = "MIT"
+edition = "2021"
 
 build = "bindings/rust/build.rs"
 include = [
@@ -19,6 +18,24 @@ include = [
 [lib]
 path = "bindings/rust/lib.rs"
 
+[[test]]
+name = "parse-test"
+path = "test/rust/parse-test.rs"
+
+[[bin]]
+name = "parse"
+path = "test/rust/parse.rs"
+test = false
+bench = false
+doc = false
+
+[[bin]]
+name = "show"
+path = "test/rust/show.rs"
+test = false
+bench = false
+doc = false
+
 [dependencies]
 tree-sitter = "0.20"