Merge branch 'main' into fix-1183

Author: skovhus

.tool-versions

@@ -1 +1 @@
-nodejs 18.20.1
+nodejs 18.20.7

package.json

@@ -18,24 +18,24 @@
   },
   "devDependencies": {
     "@types/jest": "29.5.14",
-    "@types/node": "18.19.30",
-    "@typescript-eslint/eslint-plugin": "7.5.0",
-    "@typescript-eslint/parser": "7.5.0",
+    "@types/node": "18.19.80",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
     "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-jest": "27.9.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-simple-import-sort": "12.0.0",
+    "eslint-plugin-simple-import-sort": "12.1.1",
     "eslint-plugin-sort-class-members": "1.21.0",
     "jest": "29.7.0",
     "prettier": "2.8.8",
-    "ts-jest": "29.2.5",
+    "ts-jest": "29.2.6",
     "typescript": "5.6.3",
     "vscode-languageserver": "8.0.2",
     "vscode-languageserver-textdocument": "1.0.12"
   },
   "resolutions": {
-    "@types/vscode": "1.95.0"
+    "@types/vscode": "1.98.0"
   },
   "engines": {
     "node": ">=16",

pnpm-lock.yaml

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 5.4.3
+
+- Do not overwrite user-provided shellcheck `--shell` argument https://github.com/bash-lsp/bash-language-server/pull/1133
+
 ## 5.4.2
 
 - Fix wrong pnpm engine version

server/CHANGELOG.md

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
   "bin": {
@@ -17,23 +17,23 @@
     "node": ">=16"
   },
   "dependencies": {
-    "editorconfig": "2.0.0",
-    "fast-glob": "3.3.2",
+    "editorconfig": "2.0.1",
+    "fast-glob": "3.3.3",
     "fuzzy-search": "3.2.1",
     "node-fetch": "2.7.0",
     "turndown": "7.2.0",
     "vscode-languageserver": "8.0.2",
     "vscode-languageserver-textdocument": "1.0.12",
-    "web-tree-sitter": "0.24.3",
-    "zod": "3.23.8"
+    "web-tree-sitter": "0.24.5",
+    "zod": "3.24.2"
   },
   "scripts": {
     "prepublishOnly": "cd ../ && pnpm compile && cp README.md server/"
   },
   "devDependencies": {
     "@types/fuzzy-search": "2.1.5",
-    "@types/node-fetch": "2.6.11",
-    "@types/turndown": "5.0.4",
+    "@types/node-fetch": "2.6.12",
+    "@types/turndown": "5.0.5",
     "@types/urijs": "1.19.25"
   }
 }

server/package.json

@@ -639,7 +639,7 @@ export default class Analyzer {
     }
 
     const searchParams = new URLSearchParams({ cmd: interestingNode.text }).toString()
-    const url = `${endpoint}/api/explain?${searchParams}`
+    const url = `${endpoint}/explain?${searchParams}`
 
     const explainshellRawResponse = await fetch(url)
     const explainshellResponse =

server/src/analyser.ts

@@ -102,9 +102,12 @@ export function getConfigFromEnvironmentVariables(): {
   }
 
   const environmentVariablesUsed = Object.entries(rawConfig)
-    .map(([key, value]) => (typeof value !== 'undefined' ? key : null))
-    .filter((key): key is string => key !== null)
-    .filter((key) => key !== 'logLevel') // logLevel is a special case that we ignore
+    .filter(
+      ([key, value]) =>
+        !['undefined', 'object'].includes(typeof value) &&
+        ![null, 'logLevel'].includes(key),
+    )
+    .map(([key]) => key)
 
   const config = ConfigSchema.parse(rawConfig)
 

server/src/config.ts

@@ -120,13 +120,19 @@ export class Linter {
       .map((folderName) => `--source-path=${folderName}`)
 
     const args = [
-      `--shell=${shellName}`,
       '--format=json1',
       '--external-sources',
       ...sourcePathsArgs,
       ...additionalArgs,
     ]
 
+    // only add `--shell` argument if non is provided by the user in their
+    // config. This allows to the user to override the shell. See #1064.
+    const userArgs = additionalArgs.join(' ')
+    if (!(userArgs.includes('--shell') || userArgs.includes('-s '))) {
+      args.unshift(`--shell=${shellName}`)
+    }
+
     logger.debug(`ShellCheck: running "${this.executablePath} ${args.join(' ')}"`)
 
     let out = ''

server/src/shellcheck/index.ts

@@ -4,7 +4,7 @@
 [![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 integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt].
+Visual Studio Code extension utilizing the [Bash Language Server][bash-lsp] and integrating with [explainshell][explainshell], [shellcheck][shellcheck] and [shfmt][shfmt].
 
 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.