Merge branch 'main' into renovate/typescript-5.x

bash-lsp · Jun 10, 2023 · 0dc961e · 0dc961e
2 parents 32b5786 + 8034b8f
commit 0dc961e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Bash Language Server
 
+## 4.9.3
+
+- Fix flags/options insertion issue for some clients by using textEdits https://github.com/bash-lsp/bash-language-server/pull/861
+- Dependency upgrades
+
 ## 4.9.2
 
 - Fix flags/options insertion issue for some clients https://github.com/bash-lsp/bash-language-server/pull/847
-- Dependencies
+- Dependency upgrades
 
 ## 4.9.1
 

diff --git a/server/package.json b/server/package.json
@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "4.9.2",
+  "version": "4.9.3",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
   "bin": {

diff --git a/server/src/__tests__/server.test.ts b/server/src/__tests__/server.test.ts
@@ -327,7 +327,19 @@ describe('server', () => {
             },
             kind: expect.any(Number),
             label: '--line-buffered',
-            insertText: 'buffered',
+            textEdit: {
+              newText: 'buffered',
+              range: {
+                start: {
+                  character: 12,
+                  line: 2,
+                },
+                end: {
+                  character: 12,
+                  line: 2,
+                },
+              },
+            },
           },
         ]),
       )

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -516,11 +516,23 @@ export default class BashServer {
       if (commandName) {
         optionsCompletions = getCommandOptions(commandName, word).map((option) => ({
           label: option,
-          insertText: option.slice(word.length),
           kind: LSP.CompletionItemKind.Constant,
           data: {
             type: CompletionItemDataType.Symbol,
           },
+          textEdit: {
+            newText: option.slice(word.length),
+            range: {
+              start: {
+                character: params.position.character,
+                line: params.position.line,
+              },
+              end: {
+                character: params.position.character,
+                line: params.position.line,
+              },
+            },
+          },
         }))
       }
     }