Merge commit 'a9a8efad446f78db3989d7ed8517987daf510c83'

vendor/tree-sitter-elm/.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" 
+    directory: "/" 
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directory: "/" 
+    schedule:
+      interval: "daily"

vendor/tree-sitter-elm/.github/workflows/publish-prebuild.yml

@@ -1,29 +0,0 @@
-name: Publish prebuilds
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  prebuild:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        node-version: [14]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Npm install
-        run: |
-          npm i
-      - run: npm run prebuild && npm run prebuild:upload -u ${PREBUILD_UPLOAD}
-        env:
-          PREBUILD_UPLOAD: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash

vendor/tree-sitter-elm/.github/workflows/test-full.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node-version: [14]
+        node-version: [14, 16]
 
     steps:
       - uses: actions/checkout@v2

vendor/tree-sitter-elm/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test OSX, Windows and Linux
+name: Test Linux
 
 on:
   push:
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-        node-version: [12, 14]
+        os: [ubuntu-latest]
+        node-version: [14, 16]
 
     steps:
       - uses: actions/checkout@v2
@@ -32,9 +32,7 @@ jobs:
           npx tree-sitter test
       - name: Test examples
         run: |
-          if [ "$RUNNER_OS" != "Windows" ]; then
-              script/parse-examples
-          fi
+          script/parse-examples
         shell: bash
 
   rust:
@@ -43,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v2

vendor/tree-sitter-elm/.gitignore

@@ -3,7 +3,6 @@ Cargo.lock
 node_modules
 build
 *.log
-prebuilds
 .idea
 .vscode/ipch
 target/

vendor/tree-sitter-elm/.npmignore

@@ -7,8 +7,7 @@ elm-stuff
 examples
 examples-full
 build
-prebuilds
 script
 HOW_TO_RELEASE.md
 rust
-Cargo.toml
+Cargo.toml

vendor/tree-sitter-elm/Cargo.toml

@@ -22,7 +22,7 @@ include = [
 ]
 
 # Keep in sync with package.json
-version = "5.5.1"
+version = "5.6.0"
 
 [lib]
 path = "bindings/rust/lib.rs"

vendor/tree-sitter-elm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elm-tooling/tree-sitter-elm",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "description": "Tree sitter definitions for elm",
   "main": "bindings/node",
   "publishConfig": {
@@ -16,19 +16,14 @@
   "author": "Razze",
   "license": "MIT",
   "dependencies": {
-    "nan": "^2.15.0",
-    "prebuild-install": "^6.1.4"
+    "nan": "^2.15.0"
   },
   "devDependencies": {
     "@asgerf/dts-tree-sitter": "^0.1.0",
-    "prebuild": "^10.0.1",
-    "tree-sitter-cli": "^0.20.4"
+    "tree-sitter-cli": "^0.20.6"
   },
   "scripts": {
-    "build": "tree-sitter generate && node-gyp build --debug",
-    "install": "prebuild-install || node-gyp rebuild",
-    "prebuild": "prebuild -r electron --all --strip --verbose",
-    "prebuild:upload": "prebuild --upload-all",
+    "build": "tree-sitter generate",
     "parse-basic": "tree-sitter parse ./examples/Basic.elm",
     "parse-test": "tree-sitter parse --debug ./examples/test.elm",
     "test": "tree-sitter test && script/parse-examples",

vendor/tree-sitter-elm/src/scanner.cc

@@ -227,7 +227,7 @@ namespace
                 {
 
                     advance(lexer);
-                    auto lookahead = lexer->lookahead;
+                    int32_t lookahead = lexer->lookahead;
 
                     // Handle minus without a whitespace for negate
                     if (valid_symbols[MINUS_WITHOUT_TRAILING_WHITESPACE]