diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index fc99e0d23a..262f0cc800 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -30,6 +30,11 @@ jobs: - name: Set up Node.js uses: ./.github/actions/setup-node + # pre-commit passes --allow-git=root when installing Node hooks. npm 11 + # rejects the hook repository's git dependency despite that setting. + - name: Use npm 10 for pre-commit Node hooks + run: npm install --global npm@10.9.4 + - name: Install lua uses: leafo/gh-actions-lua@v12 @@ -39,11 +44,11 @@ jobs: - name: Run pre-commit hooks uses: pre-commit/action@v3.0.1 - - name: Auto-fix pre-commit issues - uses: pre-commit-ci/lite-action@v1.1.0 - if: always() - - name: Pyright uses: jakebailey/pyright-action@v3 with: pylance-version: latest-release + + - name: pre-commit-ci-lite + uses: pre-commit-ci/lite-action@v1.2.0 + if: always() diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4bbfc98410..2840fd1acc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -98,7 +98,7 @@ repos: - id: ruff-format - repo: https://github.com/cursorless-dev/talon-tools - rev: v0.11.2 + rev: v0.12.1 hooks: - id: talon-fmt - id: tree-sitter-fmt diff --git a/resources/queries/html.scm b/resources/queries/html.scm index 4e8d4856a3..97b8cdd19f 100644 --- a/resources/queries/html.scm +++ b/resources/queries/html.scm @@ -25,7 +25,7 @@ [ (quoted_attribute_value) (attribute_value) - ] ? @collectionKey.trailing.startOf + ]? @collectionKey.trailing.startOf ) @collectionKey.domain ;;!! diff --git a/resources/queries/kotlin.scm b/resources/queries/kotlin.scm index 7e8f8032bd..5336634ea2 100644 --- a/resources/queries/kotlin.scm +++ b/resources/queries/kotlin.scm @@ -414,7 +414,7 @@ [ (line_comment) (multiline_comment) - ] * + ]* . (parameter_modifiers)? @argumentOrParameter.start . @@ -423,7 +423,7 @@ [ (line_comment) (multiline_comment) - ] * + ]* . [ "," @@ -472,7 +472,7 @@ [ (line_comment) (multiline_comment) - ] * + ]* . (parameter_modifiers)? @argumentOrParameter.start.startOf . @@ -484,7 +484,7 @@ [ (line_comment) (multiline_comment) - ] * + ]* . [ ","