Merge branch 'main' into patch-1

Author: skovhus

server/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 5.1.1
+
+- Add --help fallback for documentation https://github.com/bash-lsp/bash-language-server/pull/1052
+
 ## 5.1.0
 
 - Support for renaming symbol! https://github.com/bash-lsp/bash-language-server/pull/915

server/package.json

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
   "bin": {

server/src/util/sh.ts

@@ -74,6 +74,7 @@ export async function getShellDocumentationWithoutCache({
     // The default line width of the terminal works fine for hover, but could be better
     // for completions.
     { type: 'man', command: `man -P cat ${word} | col -bx` },
+    { type: 'help flag', command: `${word} --help | col -bx` },
   ]
 
   for (const { type, command } of DOCUMENTATION_COMMANDS) {

vscode-client/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Bash IDE
 
+## 1.40.0
+- Upgrade language server to 5.1.1 (rename capability).
+
 ## 1.39.0
 - Upgrade language server to 5.0.0.
 

vscode-client/package.json

@@ -4,7 +4,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "publisher": "mads-hartmann",
   "repository": {
     "type": "git",
@@ -85,7 +85,7 @@
     "vscode:prepublish": "cd .. && pnpm compile"
   },
   "dependencies": {
-    "bash-language-server": "5.0.0",
+    "bash-language-server": "5.1.1",
     "vscode-languageclient": "8.1.0",
     "vscode-languageserver": "8.0.2"
   },