Some more fixes, 0.20.4

.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  'env': {
+    'commonjs': true,
+    'es2021': true,
+  },
+  'extends': 'google',
+  'overrides': [
+  ],
+  'parserOptions': {
+    'ecmaVersion': 'latest',
+    'sourceType': 'module',
+  },
+  'rules': {
+    'indent': ['error', 2, {'SwitchCase': 1}],
+    'max-len': [
+      'error',
+      {'code': 120, 'ignoreComments': true, 'ignoreUrls': true, 'ignoreStrings': true},
+    ],
+  },
+};

.gitattributes

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

.github/workflows/ci.yml

@@ -1,12 +1,11 @@
-name: Build/test
+name: CI
 on:
   push:
     branches:
       - master
   pull_request:
     branches:
-      - "**"
-
+      - master
 jobs:
   test:
     runs-on: ${{ matrix.os }}
@@ -15,19 +14,24 @@ jobs:
       matrix:
         os: [macos-latest, ubuntu-latest]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: npm install
       - run: npm test
-
   test_windows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - run: npm install
       - run: npm run-script test-windows

.github/workflows/fuzz.yml

@@ -0,0 +1,22 @@
+name: Fuzz Parser
+
+on:
+  push:
+    paths:
+      - src/scanner.c
+  pull_request:
+    paths:
+      - src/scanner.c
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Parser fuzzing
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: vigoux/tree-sitter-fuzz-action@v1
+        with:
+          language: bash
+          external-scanner: src/scanner.c
+          time: 60

.github/workflows/lint.yml

@@ -0,0 +1,19 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install modules
+        run: npm install
+      - name: Run ESLint
+        run: npm run lint

.github/workflows/publish.yml

@@ -0,0 +1,103 @@
+name: Release
+
+on:
+  workflow_run:
+    workflows: ["CI"]
+    branches:
+      - master
+    types:
+      - completed
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Get previous commit SHA
+        id: get_previous_commit
+        run: |
+          LATEST_TAG=$(git describe --tags --abbrev=0)
+          if [[ -z "$LATEST_TAG" ]]; then
+            echo "No tag found. Failing..."
+            exit 1
+          fi
+          echo "latest_tag=${LATEST_TAG#v}" >> "$GITHUB_ENV" # Remove 'v' prefix from the tag
+
+      - name: Check if version changed and is greater than the previous
+        id: version_check
+        run: |
+          # Compare the current version with the version from the previous commit
+          PREVIOUS_NPM_VERSION=${{ env.latest_tag }}
+          CURRENT_NPM_VERSION=$(jq -r '.version' package.json)
+          CURRENT_CARGO_VERSION=$(awk -F '"' '/^version/ {print $2}' Cargo.toml)
+          if [[ "$CURRENT_NPM_VERSION" != "$CURRENT_CARGO_VERSION" ]]; then # Cargo.toml and package.json versions must match
+            echo "Mismatch: NPM version ($CURRENT_NPM_VERSION) and Cargo.toml version ($CURRENT_CARGO_VERSION)"
+            echo "version_changed=false" >> "$GITHUB_ENV"
+          else
+            if [[ "$PREVIOUS_NPM_VERSION" ==  "$CURRENT_NPM_VERSION" ]]; then
+              echo "version_changed=" >> "$GITHUB_ENV"
+            else
+              IFS='.' read -ra PREVIOUS_VERSION_PARTS <<< "$PREVIOUS_NPM_VERSION"
+              IFS='.' read -ra CURRENT_VERSION_PARTS <<< "$CURRENT_NPM_VERSION"
+              VERSION_CHANGED=false
+              for i in "${!PREVIOUS_VERSION_PARTS[@]}"; do
+                if [[ ${CURRENT_VERSION_PARTS[i]} -gt ${PREVIOUS_VERSION_PARTS[i]} ]]; then
+                  VERSION_CHANGED=true
+                  break
+                elif [[ ${CURRENT_VERSION_PARTS[i]} -lt ${PREVIOUS_VERSION_PARTS[i]} ]]; then
+                  break
+                fi
+              done
+
+              echo "version_changed=$VERSION_CHANGED" >> "$GITHUB_ENV"
+              echo "current_version=${CURRENT_NPM_VERSION}" >> "$GITHUB_ENV"
+            fi
+          fi
+
+      - name: Display result
+        run: |
+          echo "Version bump detected: ${{ env.version_changed }}"
+
+      - name: Fail if version is lower
+        if: env.version_changed == 'false'
+        run: exit 1
+
+      - name: Setup Node
+        if: env.version_changed == 'true'
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: "https://registry.npmjs.org"
+      - name: Publish to NPM
+        if: env.version_changed == 'true'
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+        run: npm publish
+
+      - name: Setup Rust
+        if: env.version_changed == 'true'
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - name: Publish to Crates.io
+        if: env.version_changed == 'true'
+        uses: katyo/publish-crates@v2
+        with:
+          registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
+      - name: Tag versions
+        if: env.version_changed == 'true'
+        run: |
+          git checkout master
+          git config user.name github-actions[bot]
+          git config user.email github-actions[bot]@users.noreply.github.com
+          git tag -d "v${{ env.current_version }}" || true
+          git push origin --delete "v${{ env.current_version }}" || true
+          git tag -a "v${{ env.current_version }}" -m "Version ${{ env.current_version }}"
+          git push origin "v${{ env.current_version }}"

.gitignore

@@ -3,8 +3,6 @@ node_modules
 build
 *.log
 package-lock.json
-examples
+/examples
 !examples/ast.rs
 /target/
-.build/
-/.idea/

.npmignore

@@ -1,5 +1,6 @@
-corpus
-build
-script
-examples
-target
+/test
+/examples
+/build
+/script
+/target
+bindings/rust

Cargo.toml

@@ -1,29 +1,24 @@
 [package]
 name = "tree-sitter-rust"
-description = "Rust grammar for the tree-sitter parsing library"
-version = "0.20.3"
+description = "Rust grammar for tree-sitter"
+version = "0.20.4"
 authors = ["Max Brunsfeld <[email protected]>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "rust"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-rust"
-edition = "2018"
+edition = "2021"
+autoexamples = false
 
 build = "bindings/rust/build.rs"
-include = [
-  "bindings/rust/*",
-  "grammar.js",
-  "queries/*",
-  "src/*",
-]
-autoexamples = false
+include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = ">= 0.20"
+tree-sitter = "~0.20.10"
 
 [build-dependencies]
-cc = "1.0"
+cc = "~1.0.82"

README.md

@@ -1,29 +1,38 @@
 # tree-sitter-rust
 
-[![Build/test](https://github.com/tree-sitter/tree-sitter-rust/actions/workflows/ci.yml/badge.svg)](https://github.com/tree-sitter/tree-sitter-rust/actions/workflows/ci.yml)
+[![CI](https://github.com/tree-sitter/tree-sitter-c/actions/workflows/ci.yml/badge.svg)](https://github.com/tree-sitter/tree-sitter-c/actions/workflows/ci.yml)
 
 Rust grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter)
 
 ## Features
 
-* **Speed** - When initially parsing a file, `tree-sitter-rust` takes around twice as long as Rustc's hand-coded parser.
+- **Speed** — When initially parsing a file, `tree-sitter-rust` takes around twice
+  as long as Rustc's hand-coded parser.
 
   ```sh
   $ wc -l examples/ast.rs
     2157 examples/ast.rs
 
   $ rustc -Z ast-json-noexpand -Z time-passes examples/ast.rs | head -n1
-    time: 0.007	parsing # (7 ms)
+    time: 0.007    parsing # (7 ms)
 
   $ tree-sitter parse examples/ast.rs --quiet --time
-    examples/ast.rs	16 ms
+    examples/ast.rs    16 ms
   ```
 
-  But if you *edit* the file after parsing it, this parser can generally *update* the previous existing syntax tree to reflect your edit in less than a millisecond, thanks to Tree-sitter's incremental parsing system.
+  But if you _edit_ the file after parsing it, this parser can generally _update_
+  the previous existing syntax tree to reflect your edit in less than a millisecond,
+  thanks to Tree-sitter's incremental parsing system.
 
 ## References
 
-* [The Rust Grammar Reference](https://doc.rust-lang.org/grammar.html) - The grammar reference provides chapters that formally define the language grammar.
-* [The Rust Reference](https://doc.rust-lang.org/reference/) - While Rust does not have a specification, the reference tries to describe its working in detail. It tends to be out of date.
-* [Keywords](https://doc.rust-lang.org/stable/book/appendix-01-keywords.html) and [Operators and Symbols](https://doc.rust-lang.org/stable/book/appendix-02-operators.html).
-* Archive of the outdated [Syntax Index](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/syntax-index.html) that contains examples of all syntax in Rust cross-referenced with the section of The Book that describes it.
+- [The Rust Grammar Reference](https://doc.rust-lang.org/grammar.html) — The grammar
+  reference provides chapters that formally define the language grammar.
+- [The Rust Reference](https://doc.rust-lang.org/reference/) — While Rust does
+  not have a specification, the reference tries to describe its working in detail.
+  It tends to be out of date.
+- [Keywords](https://doc.rust-lang.org/stable/book/appendix-01-keywords.html) and
+  [Operators and Symbols](https://doc.rust-lang.org/stable/book/appendix-02-operators.html).
+- Archive of the outdated [Syntax Index](https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/syntax-index.html)
+  that contains examples of all syntax in Rust cross-referenced with the section
+  of The Book that describes it.