Skip to content

Commit cd62a5b

Browse files
authored
Merge branch 'main' into fix-1183
2 parents 4a02d94 + ba8e6eb commit cd62a5b

File tree

9 files changed

+217
-210
lines changed

9 files changed

+217
-210
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs 18.20.1
1+
nodejs 18.20.7

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
},
1919
"devDependencies": {
2020
"@types/jest": "29.5.14",
21-
"@types/node": "18.19.30",
22-
"@typescript-eslint/eslint-plugin": "7.5.0",
23-
"@typescript-eslint/parser": "7.5.0",
21+
"@types/node": "18.19.80",
22+
"@typescript-eslint/eslint-plugin": "7.18.0",
23+
"@typescript-eslint/parser": "7.18.0",
2424
"eslint": "8.57.1",
2525
"eslint-config-prettier": "9.1.0",
2626
"eslint-plugin-jest": "27.9.0",
2727
"eslint-plugin-prettier": "4.2.1",
28-
"eslint-plugin-simple-import-sort": "12.0.0",
28+
"eslint-plugin-simple-import-sort": "12.1.1",
2929
"eslint-plugin-sort-class-members": "1.21.0",
3030
"jest": "29.7.0",
3131
"prettier": "2.8.8",
32-
"ts-jest": "29.2.5",
32+
"ts-jest": "29.2.6",
3333
"typescript": "5.6.3",
3434
"vscode-languageserver": "8.0.2",
3535
"vscode-languageserver-textdocument": "1.0.12"
3636
},
3737
"resolutions": {
38-
"@types/vscode": "1.95.0"
38+
"@types/vscode": "1.98.0"
3939
},
4040
"engines": {
4141
"node": ">=16",

pnpm-lock.yaml

Lines changed: 184 additions & 190 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Bash Language Server
22

3+
## 5.4.3
4+
5+
- Do not overwrite user-provided shellcheck `--shell` argument https://github.com/bash-lsp/bash-language-server/pull/1133
6+
37
## 5.4.2
48

59
- Fix wrong pnpm engine version

server/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A language server for Bash",
44
"author": "Mads Hartmann",
55
"license": "MIT",
6-
"version": "5.4.2",
6+
"version": "5.4.3",
77
"main": "./out/server.js",
88
"typings": "./out/server.d.ts",
99
"bin": {
@@ -17,23 +17,23 @@
1717
"node": ">=16"
1818
},
1919
"dependencies": {
20-
"editorconfig": "2.0.0",
21-
"fast-glob": "3.3.2",
20+
"editorconfig": "2.0.1",
21+
"fast-glob": "3.3.3",
2222
"fuzzy-search": "3.2.1",
2323
"node-fetch": "2.7.0",
2424
"turndown": "7.2.0",
2525
"vscode-languageserver": "8.0.2",
2626
"vscode-languageserver-textdocument": "1.0.12",
27-
"web-tree-sitter": "0.24.3",
28-
"zod": "3.23.8"
27+
"web-tree-sitter": "0.24.5",
28+
"zod": "3.24.2"
2929
},
3030
"scripts": {
3131
"prepublishOnly": "cd ../ && pnpm compile && cp README.md server/"
3232
},
3333
"devDependencies": {
3434
"@types/fuzzy-search": "2.1.5",
35-
"@types/node-fetch": "2.6.11",
36-
"@types/turndown": "5.0.4",
35+
"@types/node-fetch": "2.6.12",
36+
"@types/turndown": "5.0.5",
3737
"@types/urijs": "1.19.25"
3838
}
3939
}

server/src/analyser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ export default class Analyzer {
639639
}
640640

641641
const searchParams = new URLSearchParams({ cmd: interestingNode.text }).toString()
642-
const url = `${endpoint}/api/explain?${searchParams}`
642+
const url = `${endpoint}/explain?${searchParams}`
643643

644644
const explainshellRawResponse = await fetch(url)
645645
const explainshellResponse =

server/src/config.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,12 @@ export function getConfigFromEnvironmentVariables(): {
102102
}
103103

104104
const environmentVariablesUsed = Object.entries(rawConfig)
105-
.map(([key, value]) => (typeof value !== 'undefined' ? key : null))
106-
.filter((key): key is string => key !== null)
107-
.filter((key) => key !== 'logLevel') // logLevel is a special case that we ignore
105+
.filter(
106+
([key, value]) =>
107+
!['undefined', 'object'].includes(typeof value) &&
108+
![null, 'logLevel'].includes(key),
109+
)
110+
.map(([key]) => key)
108111

109112
const config = ConfigSchema.parse(rawConfig)
110113

server/src/shellcheck/index.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,19 @@ export class Linter {
120120
.map((folderName) => `--source-path=${folderName}`)
121121

122122
const args = [
123-
`--shell=${shellName}`,
124123
'--format=json1',
125124
'--external-sources',
126125
...sourcePathsArgs,
127126
...additionalArgs,
128127
]
129128

129+
// only add `--shell` argument if non is provided by the user in their
130+
// config. This allows to the user to override the shell. See #1064.
131+
const userArgs = additionalArgs.join(' ')
132+
if (!(userArgs.includes('--shell') || userArgs.includes('-s '))) {
133+
args.unshift(`--shell=${shellName}`)
134+
}
135+
130136
logger.debug(`ShellCheck: running "${this.executablePath} ${args.join(' ')}"`)
131137

132138
let out = ''

vscode-client/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![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)
55
[![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)
66

7-
Visual Studio Code extension utilizing the [Bash Language Server](bash-lsp) and integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt].
7+
Visual Studio Code extension utilizing the [Bash Language Server][bash-lsp] and integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt].
88

99
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.
1010

0 commit comments

Comments
 (0)