Skip to content

Commit 396a404

Browse files
committed
Upgrade treesitter
1 parent 4353aab commit 396a404

File tree

10 files changed

+2442
-1925
lines changed

10 files changed

+2442
-1925
lines changed

Diff for: .github/workflows/deploy.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ jobs:
1414
- name: Install shellcheck and shfmt (used for testing)
1515
run: sudo apt-get install -y shellcheck shfmt
1616

17-
- uses: pnpm/action-setup@v2
17+
- uses: pnpm/action-setup@v4
1818
with:
19-
version: 8
19+
version: 9
2020

2121
- uses: actions/setup-node@v4
2222
with:
2323
node-version: 20
2424
registry-url: https://registry.npmjs.org/
25+
cache: "pnpm"
2526

2627
- run: |
2728
git config --local user.email "[email protected]"

Diff for: .github/workflows/upgrade-tree-sitter.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- uses: pnpm/action-setup@v2
14+
- uses: pnpm/action-setup@v4
1515
with:
16-
version: 8
16+
version: 9
1717

1818
- uses: actions/setup-node@v4
1919
with:
2020
node-version: 20
2121
cache: "pnpm"
22-
cache-dependency-path: '**/pnpm-lock.yaml'
2322

2423
- run: pnpm install --frozen-lockfile
2524

Diff for: .github/workflows/verify.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ jobs:
1717
- name: Install shellcheck and shfmt (used for testing)
1818
run: sudo apt-get install -y shellcheck shfmt
1919

20-
- uses: pnpm/action-setup@v2
20+
- uses: pnpm/action-setup@v4
2121
with:
22-
version: 8
22+
version: 9
2323

2424
- name: Use Node.js ${{ matrix.node-version }}
2525
uses: actions/setup-node@v4
2626
with:
2727
cache: "pnpm"
28-
cache-dependency-path: '**/pnpm-lock.yaml'
2928
node-version: ${{ matrix.node-version }}
3029

3130
- run: pnpm install --frozen-lockfile

Diff for: pnpm-lock.yaml

+2,190-1,727
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: server/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"url": "https://github.com/bash-lsp/bash-language-server"
1515
},
1616
"engines": {
17-
"node": ">=16"
17+
"node": ">=16",
18+
"pnpm": ">=9.1.1"
1819
},
1920
"dependencies": {
2021
"editorconfig": "2.0.0",
@@ -24,7 +25,7 @@
2425
"turndown": "7.1.3",
2526
"vscode-languageserver": "8.0.2",
2627
"vscode-languageserver-textdocument": "1.0.11",
27-
"web-tree-sitter": "0.22.5",
28+
"web-tree-sitter": "0.23.0",
2829
"zod": "3.22.4"
2930
},
3031
"scripts": {

Diff for: server/parser.info

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
"https://api.github.com/repos/tree-sitter/tree-sitter-bash/git/commits/f8fb3274f72a30896075585b32b0c54cad65c086"
2-
tree-sitter-cli "0.22.5"
1+
"https://api.github.com/repos/tree-sitter/tree-sitter-bash/git/commits/c8713e50f0bd77d080832fc61ad128bc8f2934e9"
2+
tree-sitter-cli "0.23.0"

Diff for: server/src/__tests__/server.test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,9 @@ describe('server', () => {
661661
...item,
662662
documentation: {
663663
kind: 'markdown',
664-
value: expect.stringContaining('Write arguments to the standard output'),
664+
value: expect.stringMatching(
665+
/Write arguments to the standard output|Output the ARGs/,
666+
),
665667
},
666668
})
667669
})

Diff for: server/src/shfmt/__tests__/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('formatter', () => {
6969
shfmtConfig: { languageDialect: 'posix' },
7070
})
7171
}).rejects.toThrow(
72-
/Shfmt: exited with status 1: .*\/testing\/fixtures\/shfmt\.sh:25:14: (the "function" builtin exists in bash; tried parsing as posix|a command can only contain words and redirects; encountered \()/,
72+
/Shfmt: exited with status 1: .*\/testing\/fixtures\/shfmt\.sh:25:14: (the "function" builtin|a command can only contain words and redirects; encountered \()/,
7373
)
7474
})
7575

Diff for: server/tree-sitter-bash.wasm

-35.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)