Merge remote-tracking branch 'github/master'

.editorconfig

@@ -2,8 +2,6 @@ root = true
 
 [*]
 charset = utf-8
-insert_final_newline = true
-trim_trailing_whitespace = true
 
 [*.{json,toml,yml,gyp}]
 indent_style = space
@@ -13,14 +11,18 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.rs]
+[*.scm]
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.{c,cc,h}]
 indent_style = space
 indent_size = 4
 
+[*.rs]
+indent_style = space
+indent_size = 4
+
 [*.{py,pyi}]
 indent_style = space
 indent_size = 4
@@ -36,3 +38,9 @@ indent_size = 8
 [Makefile]
 indent_style = tab
 indent_size = 8
+
+[parser.c]
+indent_size = 2
+
+[{alloc,array,parser}.h]
+indent_size = 2

.gitattributes

@@ -1,15 +1,37 @@
 * text=auto eol=lf
 
-examples/crlf-line-endings.py eol=crlf
-examples/python2-grammar-crlf.py eol=crlf
-examples/python3-grammar-crlf.py eol=crlf
-
+# Generated source files
 src/*.json linguist-generated
 src/parser.c linguist-generated
 src/tree_sitter/* linguist-generated
 
-bindings/** linguist-generated
+# C bindings
+bindings/c/* linguist-generated
+CMakeLists.txt linguist-generated
+Makefile linguist-generated
+
+# Rust bindings
+bindings/rust/* linguist-generated
+Cargo.toml linguist-generated
+Cargo.lock linguist-generated
+
+# Node.js bindings
+bindings/node/* linguist-generated
 binding.gyp linguist-generated
+package.json linguist-generated
+package-lock.json linguist-generated
+
+# Python bindings
+bindings/python/** linguist-generated
 setup.py linguist-generated
-Makefile linguist-generated
+pyproject.toml linguist-generated
+
+# Go bindings
+bindings/go/* linguist-generated
+go.mod linguist-generated
+go.sum linguist-generated
+
+# Swift bindings
+bindings/swift/** linguist-generated
 Package.swift linguist-generated
+Package.resolved linguist-generated

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: ["*"]
+    branches: [master]
     paths:
       - grammar.js
       - src/**
@@ -43,32 +43,21 @@ jobs:
       - name: Run tests
         uses: tree-sitter/parser-test-action@v2
         with:
-          test-rust: ${{runner.os == 'Linux'}}
+          test-rust: true
+          test-node: true
+          test-python: true
+          test-go: true
+          test-swift: true
       - name: Parse examples
         uses: tree-sitter/parse-action@v4
         with:
           files: |
             examples/**/*.py
+            !examples/cpython/Lib/test/test_annotationlib.py
+            !examples/cpython/Lib/test/test_type_params.py
             !examples/cpython/Lib/test/test_compile.py
             !examples/cpython/Tools/build/generate_re_casefix.py
+            !examples/cpython/Lib/test/test_annotationlib.py
+            !examples/cpython/Lib/test/test_type_params.py
           invalid-files: |
             examples/cpython/Lib/test/tokenizedata/badsyntax_3131.py
-  fuzz:
-    name: Fuzz parser
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Check for scanner changes
-        id: scanner-changes
-        run: |-
-          if git diff --quiet HEAD^ -- src/scanner.c; then
-            printf 'changed=false\n' >> "$GITHUB_OUTPUT"
-          else
-            printf 'changed=true\n' >> "$GITHUB_OUTPUT"
-          fi
-      - name: Fuzz parser
-        uses: tree-sitter/fuzz-action@v4
-        if: steps.scanner-changes.outputs.changed == 'true'

.github/workflows/fuzz.yml

@@ -0,0 +1,19 @@
+name: Fuzz Parser
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - src/scanner.c
+  pull_request:
+    paths:
+      - src/scanner.c
+
+jobs:
+  fuzz:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run fuzzer
+        uses: tree-sitter/fuzz-action@v4

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - grammar.js
+  pull_request:
+    paths:
+      - grammar.js
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          node-version: ${{vars.NODE_VERSION}}
+      - name: Install modules
+        run: npm ci --legacy-peer-deps
+      - name: Run ESLint
+        run: npm run lint

.github/workflows/publish.yml

@@ -1,23 +1,35 @@
-name: Publish package
+name: Publish packages
 
 on:
   push:
     tags: ["*"]
 
-concurrency:
-  group: ${{github.workflow}}-${{github.ref}}
-  cancel-in-progress: true
+permissions:
+  contents: write
+  id-token: write
+  attestations: write
 
 jobs:
+  github:
+    uses: tree-sitter/workflows/.github/workflows/release.yml@main
+    with:
+      generate: true
+      attestations: true
   npm:
     uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
     secrets:
       NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+    with:
+      generate: true
   crates:
     uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
     secrets:
       CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_REGISTRY_TOKEN}}
+    with:
+      generate: true
   pypi:
     uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main
     secrets:
       PYPI_API_TOKEN: ${{secrets.PYPI_API_TOKEN}}
+    with:
+      generate: true

.gitignore

@@ -1,18 +1,15 @@
 # Rust artifacts
-Cargo.lock
 target/
 
 # Node artifacts
 build/
 prebuilds/
 node_modules/
-*.tgz
 
 # Swift artifacts
 .build/
 
 # Go artifacts
-go.sum
 _obj/
 
 # Python artifacts
@@ -36,3 +33,8 @@ dist/
 *.wasm
 *.obj
 *.o
+
+# Archives
+*.tar.gz
+*.tgz
+*.zip