Merge upstream

.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

@@ -0,0 +1,11 @@
+* text eol=lf
+
+src/*.json linguist-generated
+src/parser.c linguist-generated
+src/tree_sitter/* linguist-generated
+
+bindings/** linguist-generated
+binding.gyp linguist-generated
+setup.py linguist-generated
+Makefile linguist-generated
+Package.swift linguist-generated

.github/workflows/helix.yml

@@ -0,0 +1,35 @@
+name: check against helix tree-sitter queries
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: |
+        npm install yarn -g
+        npm install tree-sitter-cli -g
+    - name: Generate tree-sitter parser
+      run: tree-sitter generate
+    - name: pull queries from helix
+      working-directory: ./queries
+      run: |
+       wget "https://raw.githubusercontent.com/helix-editor/helix/refs/heads/master/runtime/queries/solidity/highlights.scm"
+       wget "https://raw.githubusercontent.com/helix-editor/helix/refs/heads/master/runtime/queries/solidity/locals.scm"
+       wget "https://raw.githubusercontent.com/helix-editor/helix/refs/heads/master/runtime/queries/solidity/textobjects.scm"
+    - run: yarn
+    - run: yarn test

.github/workflows/nvim-treesitter.yml

@@ -0,0 +1,34 @@
+name: nvim-treesitter queries
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: |
+        npm install yarn -g
+        npm install tree-sitter-cli -g
+    - name: Generate tree-sitter parser
+      run: tree-sitter generate
+    - name: pull queries from nvim-treesitter
+      working-directory: ./queries
+      run: |
+       wget "https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/solidity/highlights.scm"
+       wget "https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/solidity/folds.scm"
+    - run: yarn
+    - run: yarn test

.github/workflows/publish.yml

@@ -0,0 +1,26 @@
+name: 🚢 Publish package
+
+on:
+  workflow_dispatch:
+  push:
+    tags: ["*"]
+
+concurrency:
+  group: ${{github.workflow}}-${{github.ref}}
+  cancel-in-progress: true
+
+jobs:
+  npm:
+    uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
+    with:
+      node-version: v20.11.1
+    secrets:
+      NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+  crates:
+    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}}

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
       - name: 📥  Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 18
 
       - name: 📥  Install js dependencies
         run: |

.github/workflows/node.js.yml → .github/workflows/test.yaml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Node.js CI
+name: Test grammar
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,8 +27,13 @@ jobs:
     - name: Install dependencies
       run: |
         npm install yarn -g
-        npm install tree-sitter-cli -g 
+        npm install tree-sitter-cli -g
+
     - name: Generate tree-sitter parser
       run: tree-sitter generate
+
+    - name: Generated files are up to date
+      run: git diff --quiet && git diff --cached --quiet
+
     - run: yarn
     - run: yarn test

.gitignore

@@ -6,9 +6,8 @@
 node_modules/
 
 .vscode/
-index.js
 
 # Rust
 Cargo.lock
 target
-build
+build

.npmignore

@@ -2,13 +2,19 @@
 corpus
 examples
 script
+test
 
 # Other compilation artefacts
 build
 
 # Rust 
 target
 Cargo.lock
+Cargo.toml
+
+# python 
+typed-libraries
+binding.gyp
 
 # Js
 node_modules

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-solidity"
 description = "Solidity grammar for the tree-sitter parsing library"
-version = "0.0.3"
+version = "1.2.11"
 keywords = ["incremental", "parsing", "Solidity"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/JoranHonig/tree-sitter-solidity"
@@ -20,7 +20,10 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "0.19.5"
+tree-sitter-language = "0.1"
 
 [build-dependencies]
-cc = "1.0"
+cc = "1.1"
+
+[dev-dependencies]
+tree-sitter = "0.24"