Merge pull request #753 from bash-lsp/fix-strikethrough

ShellCheck: avoid using deprecated tag

Author: skovhus

server/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 4.8.2
+
+- ShellCheck: avoid using the diagnostic tag "deprecated" that allow clients to render diagnostics with a strike through https://github.com/bash-lsp/bash-language-server/pull/753
+
 ## 4.8.1
 
 - Ensure ShellCheck directive parse does not throw on malformed input https://github.com/bash-lsp/bash-language-server/pull/749

server/package.json

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

server/src/shellcheck/config.ts

@@ -6,12 +6,7 @@ export const SUPPORTED_BASH_DIALECTS = ['sh', 'bash', 'dash', 'ksh']
 
 // https://github.com/koalaman/shellcheck/wiki
 export const CODE_TO_TAGS: Record<number, LSP.DiagnosticTag[] | undefined> = {
-  2006: [LSP.DiagnosticTag.Deprecated],
-  2007: [LSP.DiagnosticTag.Deprecated],
   2034: [LSP.DiagnosticTag.Unnecessary],
-  2186: [LSP.DiagnosticTag.Deprecated],
-  2196: [LSP.DiagnosticTag.Deprecated],
-  2197: [LSP.DiagnosticTag.Deprecated],
 }
 
 // https://github.com/koalaman/shellcheck/blob/364c33395e2f2d5500307f01989f70241c247d5a/src/ShellCheck/Formatter/Format.hs#L50

server/src/util/__tests__/sourcing.test.ts

@@ -173,6 +173,8 @@ describe('getSourcedUris', () => {
 
       # shellcheck source-path=SCRIPTDIR # note that this is already the behaviour of bash language server
       source ./testing/fixtures/issue101.sh
+
+      source # not finished
       `
 
     const sourceCommands = getSourceCommands({

server/src/util/sourcing.ts

@@ -59,6 +59,11 @@ function getSourcedPathInfoFromNode({
 }): null | { sourcedPath?: string; parseError?: string } {
   if (node.type === 'command') {
     const [commandNameNode, argumentNode] = node.namedChildren
+
+    if (!commandNameNode || !argumentNode) {
+      return null
+    }
+
     if (
       commandNameNode.type === 'command_name' &&
       SOURCING_COMMANDS.includes(commandNameNode.text)