File tree Expand file tree Collapse file tree 9 files changed +217
-210
lines changed Expand file tree Collapse file tree 9 files changed +217
-210
lines changed Original file line number Diff line number Diff line change 1
- nodejs 18.20.1
1
+ nodejs 18.20.7
Original file line number Diff line number Diff line change 18
18
},
19
19
"devDependencies" : {
20
20
"@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" ,
24
24
"eslint" : " 8.57.1" ,
25
25
"eslint-config-prettier" : " 9.1.0" ,
26
26
"eslint-plugin-jest" : " 27.9.0" ,
27
27
"eslint-plugin-prettier" : " 4.2.1" ,
28
- "eslint-plugin-simple-import-sort" : " 12.0.0 " ,
28
+ "eslint-plugin-simple-import-sort" : " 12.1.1 " ,
29
29
"eslint-plugin-sort-class-members" : " 1.21.0" ,
30
30
"jest" : " 29.7.0" ,
31
31
"prettier" : " 2.8.8" ,
32
- "ts-jest" : " 29.2.5 " ,
32
+ "ts-jest" : " 29.2.6 " ,
33
33
"typescript" : " 5.6.3" ,
34
34
"vscode-languageserver" : " 8.0.2" ,
35
35
"vscode-languageserver-textdocument" : " 1.0.12"
36
36
},
37
37
"resolutions" : {
38
- "@types/vscode" : " 1.95 .0"
38
+ "@types/vscode" : " 1.98 .0"
39
39
},
40
40
"engines" : {
41
41
"node" : " >=16" ,
Original file line number Diff line number Diff line change 1
1
# Bash Language Server
2
2
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
+
3
7
## 5.4.2
4
8
5
9
- Fix wrong pnpm engine version
Original file line number Diff line number Diff line change 3
3
"description" : " A language server for Bash" ,
4
4
"author" : " Mads Hartmann" ,
5
5
"license" : " MIT" ,
6
- "version" : " 5.4.2 " ,
6
+ "version" : " 5.4.3 " ,
7
7
"main" : " ./out/server.js" ,
8
8
"typings" : " ./out/server.d.ts" ,
9
9
"bin" : {
17
17
"node" : " >=16"
18
18
},
19
19
"dependencies" : {
20
- "editorconfig" : " 2.0.0 " ,
21
- "fast-glob" : " 3.3.2 " ,
20
+ "editorconfig" : " 2.0.1 " ,
21
+ "fast-glob" : " 3.3.3 " ,
22
22
"fuzzy-search" : " 3.2.1" ,
23
23
"node-fetch" : " 2.7.0" ,
24
24
"turndown" : " 7.2.0" ,
25
25
"vscode-languageserver" : " 8.0.2" ,
26
26
"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 "
29
29
},
30
30
"scripts" : {
31
31
"prepublishOnly" : " cd ../ && pnpm compile && cp README.md server/"
32
32
},
33
33
"devDependencies" : {
34
34
"@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 " ,
37
37
"@types/urijs" : " 1.19.25"
38
38
}
39
39
}
Original file line number Diff line number Diff line change @@ -639,7 +639,7 @@ export default class Analyzer {
639
639
}
640
640
641
641
const searchParams = new URLSearchParams ( { cmd : interestingNode . text } ) . toString ( )
642
- const url = `${ endpoint } /api/ explain?${ searchParams } `
642
+ const url = `${ endpoint } /explain?${ searchParams } `
643
643
644
644
const explainshellRawResponse = await fetch ( url )
645
645
const explainshellResponse =
Original file line number Diff line number Diff line change @@ -102,9 +102,12 @@ export function getConfigFromEnvironmentVariables(): {
102
102
}
103
103
104
104
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 )
108
111
109
112
const config = ConfigSchema . parse ( rawConfig )
110
113
Original file line number Diff line number Diff line change @@ -120,13 +120,19 @@ export class Linter {
120
120
. map ( ( folderName ) => `--source-path=${ folderName } ` )
121
121
122
122
const args = [
123
- `--shell=${ shellName } ` ,
124
123
'--format=json1' ,
125
124
'--external-sources' ,
126
125
...sourcePathsArgs ,
127
126
...additionalArgs ,
128
127
]
129
128
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
+
130
136
logger . debug ( `ShellCheck: running "${ this . executablePath } ${ args . join ( ' ' ) } "` )
131
137
132
138
let out = ''
Original file line number Diff line number Diff line change 4
4
[ ![ 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 )
5
5
[ ![ 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 )
6
6
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 ] .
8
8
9
9
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.
10
10
You can’t perform that action at this time.
0 commit comments