Merge branch 'master' into master

Author: eed3si9n

.github/workflows/publish.yml

@@ -10,15 +10,17 @@ concurrency:
 
 jobs:
   npm:
-    uses: tree-sitter/workflows/.github/workflows/package-npm.yml@main
+    uses: tree-sitter/workflows/.github/workflows/package-npm.yml@66df2de139d7a77a89644f67a88c803d4a8cf67e
     secrets:
       NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
   # TODO: comment this out for now since we publish the crate manually
   # crates:
   #   uses: tree-sitter/workflows/.github/workflows/package-crates.yml@main
   #   secrets:
   #     CARGO_REGISTRY_TOKEN: ${{secrets.CARGO_REGISTRY_TOKEN}}
-  pypi:
-    uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main
-    secrets:
-      PYPI_API_TOKEN: ${{secrets.PYPI_API_TOKEN}}
+
+  # TODO: uncomment when it works
+  # pypi:
+  #   uses: tree-sitter/workflows/.github/workflows/package-pypi.yml@main
+  #   secrets:
+  #     PYPI_API_TOKEN: ${{secrets.PYPI_API_TOKEN}}

.github/workflows/sync.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   check-and-sync:
     runs-on: ubuntu-latest
+    if: github.repository == "tree-sitter/tree-sitter-scala"
     outputs:
       all: ${{ steps.changes.outputs.all}}
       c: ${{ steps.changes.outputs.c }}

.gitignore

@@ -4,7 +4,6 @@ build
 target
 *.log
 test.scala
-package-lock.json
 Cargo.lock
 .scalafmt.conf
 *worksheet.sc

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-scala"
 description = "scala grammar for the tree-sitter parsing library"
-version = "0.22.0"
+version = "0.22.1"
 keywords = ["incremental", "parsing", "scala"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-scala"

grammar.js

@@ -877,7 +877,12 @@ module.exports = grammar({
     _infix_type_choice: $ =>
       prec.left(
         PREC.infix,
-        choice($.compound_type, $.infix_type, $._annotated_type, $.literal_type),
+        choice(
+          $.compound_type,
+          $.infix_type,
+          $._annotated_type,
+          $.literal_type,
+        ),
       ),
 
     infix_type: $ =>