From 3422f6b4d5192e574d19a29bdaee4d497bcd04c7 Mon Sep 17 00:00:00 2001 From: Chris Reeves Date: Fri, 26 Jul 2024 23:51:48 +0100 Subject: [PATCH 1/4] Bump language server to 5.4.0 Fixes #1170, #1174, #1176 --- vscode-client/README.md | 6 ++++-- vscode-client/package.json | 2 +- vscode-client/pnpm-lock.yaml | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/vscode-client/README.md b/vscode-client/README.md index 98774193..81d96297 100644 --- a/vscode-client/README.md +++ b/vscode-client/README.md @@ -4,9 +4,9 @@ [![VS Marketplace downloads](https://badgen.net/vs-marketplace/d/mads-hartmann.bash-ide-vscode?label=VS%20Marketplace%20downloads)](https://marketplace.visualstudio.com/items?itemName=mads-hartmann.bash-ide-vscode) [![Open VSX downloads](https://badgen.net/open-vsx/d/mads-hartmann/bash-ide-vscode?color=purple&label=Open%20VSX%20downloads)](https://open-vsx.org/extension/mads-hartmann/bash-ide-vscode) -Visual Studio Code extension utilizing the [Bash Language Server](bash-lsp) and integrates with [explainshell][explainshell] and [shellcheck][shellcheck]. +Visual Studio Code extension utilizing the [Bash Language Server](bash-lsp) and integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt]. -We strongly recommend that you install [shellcheck][shellcheck] to enable linting: https://github.com/koalaman/shellcheck#installing +We strongly recommend that you [install shellcheck](https://github.com/koalaman/shellcheck#installing) to enable linting and [install shfmt](https://github.com/mvdan/sh?tab=readme-ov-file#shfmt) to enable formatting. ## Features @@ -19,6 +19,7 @@ We strongly recommend that you install [shellcheck][shellcheck] to enable lintin - [x] Documentation for flags on hover - [x] Workspace symbols - [x] Rename symbol +- [x] Format document - [x] Snippets ## Configuration @@ -36,3 +37,4 @@ For security reasons, it defaults to `""`, which disables explainshell integrati [tree-sitter-bash]: https://github.com/tree-sitter/tree-sitter-bash [explainshell]: https://explainshell.com/ [shellcheck]: https://www.shellcheck.net/ +[shfmt]: https://github.com/mvdan/sh diff --git a/vscode-client/package.json b/vscode-client/package.json index 7fe6dee4..c5826554 100644 --- a/vscode-client/package.json +++ b/vscode-client/package.json @@ -138,7 +138,7 @@ "vscode:prepublish": "cd .. && pnpm compile" }, "dependencies": { - "bash-language-server": "5.2.0", + "bash-language-server": "5.4.0", "vscode-languageclient": "8.1.0", "vscode-languageserver": "8.0.2" }, diff --git a/vscode-client/pnpm-lock.yaml b/vscode-client/pnpm-lock.yaml index 2d43fb52..570237dd 100644 --- a/vscode-client/pnpm-lock.yaml +++ b/vscode-client/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: bash-language-server: - specifier: 5.2.0 - version: 5.2.0 + specifier: 5.4.0 + version: 5.4.0 vscode-languageclient: specifier: 8.1.0 version: 8.1.0 @@ -43,6 +43,10 @@ packages: fastq: 1.15.0 dev: false + /@one-ini/wasm@0.1.1: + resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} + dev: false + /@types/vscode@1.44.0: resolution: {integrity: sha512-WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ==} dev: true @@ -51,11 +55,12 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: false - /bash-language-server@5.2.0: - resolution: {integrity: sha512-hELDWc5WkdvNat/dv/pnbrebMxc8UtSmjsY1/ER5K7+LKE6BczC1HZQZ/rMTNOeFgaGSeykL63kDTUFRImxXWA==} + /bash-language-server@5.4.0: + resolution: {integrity: sha512-YLCIBjnwdxvlwlurTA4Be7UfPXDzaWCJKzJwzO8rVjJH0QlbhPvo3FXkYOBXPLg81G4hb0ZbhSAi4+yrs7j5cQ==} engines: {node: '>=16'} hasBin: true dependencies: + editorconfig: 2.0.0 fast-glob: 3.3.2 fuzzy-search: 3.2.1 node-fetch: 2.7.0 @@ -81,10 +86,26 @@ packages: fill-range: 7.0.1 dev: false + /commander@11.1.0: + resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} + engines: {node: '>=16'} + dev: false + /domino@2.1.6: resolution: {integrity: sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==} dev: false + /editorconfig@2.0.0: + resolution: {integrity: sha512-s1NQ63WQ7RNXH6Efb2cwuyRlfpbtdZubvfNe4vCuoyGPewNPY7vah8JUSOFBiJ+jr99Qh8t0xKv0oITc1dclgw==} + engines: {node: '>=16'} + hasBin: true + dependencies: + '@one-ini/wasm': 0.1.1 + commander: 11.1.0 + minimatch: 9.0.2 + semver: 7.5.4 + dev: false + /fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} @@ -164,6 +185,13 @@ packages: brace-expansion: 2.0.1 dev: false + /minimatch@9.0.2: + resolution: {integrity: sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: false + /node-fetch@2.7.0: resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} engines: {node: 4.x || >=6.0.0} From 72eb1d023a991ff1865619aef42dcf37b7856101 Mon Sep 17 00:00:00 2001 From: Chris Reeves Date: Sat, 27 Jul 2024 00:21:22 +0100 Subject: [PATCH 2/4] Bump vulnerable dependencies Fixes #1172 --- pnpm-lock.yaml | 36 ++++++++++++++++++------------------ vscode-client/pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0906b6f..ae930e29 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,7 +632,7 @@ packages: jest-util: 29.7.0 jest-validate: 29.7.0 jest-watcher: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 pretty-format: 29.7.0 slash: 3.0.0 strip-ansi: 6.0.1 @@ -781,7 +781,7 @@ packages: jest-haste-map: 29.7.0 jest-regex-util: 29.6.3 jest-util: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 pirates: 4.0.6 slash: 3.0.0 write-file-atomic: 4.0.2 @@ -1355,11 +1355,11 @@ packages: dependencies: balanced-match: 1.0.2 - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + /braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} dependencies: - fill-range: 7.0.1 + fill-range: 7.1.1 /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} @@ -1867,7 +1867,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.7 /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -1895,8 +1895,8 @@ packages: flat-cache: 3.0.4 dev: true - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + /fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 @@ -2159,7 +2159,7 @@ packages: '@babel/parser': 7.22.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 - semver: 6.3.0 + semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true @@ -2301,7 +2301,7 @@ packages: jest-runner: 29.7.0 jest-util: 29.7.0 jest-validate: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 parse-json: 5.2.0 pretty-format: 29.7.0 slash: 3.0.0 @@ -2369,7 +2369,7 @@ packages: jest-regex-util: 29.6.3 jest-util: 29.7.0 jest-worker: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.7 walker: 1.0.8 optionalDependencies: fsevents: 2.3.2 @@ -2402,7 +2402,7 @@ packages: '@types/stack-utils': 2.0.1 chalk: 4.1.2 graceful-fs: 4.2.11 - micromatch: 4.0.5 + micromatch: 4.0.7 pretty-format: 29.7.0 slash: 3.0.0 stack-utils: 2.0.6 @@ -2718,7 +2718,7 @@ packages: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} dependencies: - semver: 6.3.0 + semver: 6.3.1 dev: true /make-error@1.3.6: @@ -2739,11 +2739,11 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + /micromatch@4.0.7: + resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==} engines: {node: '>=8.6'} dependencies: - braces: 3.0.2 + braces: 3.0.3 picomatch: 2.3.1 /mime-db@1.52.0: @@ -3045,8 +3045,8 @@ packages: dependencies: queue-microtask: 1.2.3 - /semver@6.3.0: - resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true dev: true diff --git a/vscode-client/pnpm-lock.yaml b/vscode-client/pnpm-lock.yaml index 570237dd..52c69c2f 100644 --- a/vscode-client/pnpm-lock.yaml +++ b/vscode-client/pnpm-lock.yaml @@ -79,11 +79,11 @@ packages: balanced-match: 1.0.2 dev: false - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + /braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} dependencies: - fill-range: 7.0.1 + fill-range: 7.1.1 dev: false /commander@11.1.0: @@ -114,7 +114,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.7 dev: false /fastq@1.15.0: @@ -123,8 +123,8 @@ packages: reusify: 1.0.4 dev: false - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + /fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 @@ -170,11 +170,11 @@ packages: engines: {node: '>= 8'} dev: false - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + /micromatch@4.0.7: + resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==} engines: {node: '>=8.6'} dependencies: - braces: 3.0.2 + braces: 3.0.3 picomatch: 2.3.1 dev: false From 68d11f37dab72f67504ff4a49dfc2c86451670ef Mon Sep 17 00:00:00 2001 From: Chris Reeves Date: Sat, 27 Jul 2024 00:27:36 +0100 Subject: [PATCH 3/4] Release vscode-client 1.42.0 --- vscode-client/CHANGELOG.md | 3 +++ vscode-client/package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vscode-client/CHANGELOG.md b/vscode-client/CHANGELOG.md index 4225ee25..0e81c029 100644 --- a/vscode-client/CHANGELOG.md +++ b/vscode-client/CHANGELOG.md @@ -1,5 +1,8 @@ # Bash IDE +## 1.42.0 +- Upgrade language server to 5.4.0 (format document capability). + ## 1.41.0 - Upgrade language server to 5.2.0 diff --git a/vscode-client/package.json b/vscode-client/package.json index c5826554..95d27277 100644 --- a/vscode-client/package.json +++ b/vscode-client/package.json @@ -4,7 +4,7 @@ "description": "A language server for Bash", "author": "Mads Hartmann", "license": "MIT", - "version": "1.41.0", + "version": "1.42.0", "publisher": "mads-hartmann", "repository": { "type": "git", From 49090089be99ab448e9d35ae1dd7436d4c67389d Mon Sep 17 00:00:00 2001 From: Kenneth Skovhus Date: Sun, 28 Jul 2024 21:37:30 +0200 Subject: [PATCH 4/4] Update vscode-client/README.md --- vscode-client/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode-client/README.md b/vscode-client/README.md index 81d96297..a6156d27 100644 --- a/vscode-client/README.md +++ b/vscode-client/README.md @@ -6,7 +6,7 @@ Visual Studio Code extension utilizing the [Bash Language Server](bash-lsp) and integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt]. -We strongly recommend that you [install shellcheck](https://github.com/koalaman/shellcheck#installing) to enable linting and [install shfmt](https://github.com/mvdan/sh?tab=readme-ov-file#shfmt) to enable formatting. +We recommend that you [install shellcheck](https://github.com/koalaman/shellcheck#installing) to enable linting and [install shfmt](https://github.com/mvdan/sh?tab=readme-ov-file#shfmt) to enable formatting. ## Features