diff --git a/package.json b/package.json index 97efd3a7a..4dfe619e9 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "jest": "25.5.4", "prettier": "2.6.2", "ts-jest": "25.5.1", - "typescript": "3.9.10", + "typescript": "4.6.4", "vscode-languageserver": "6.1.1" }, "dependencies": {}, diff --git a/server/src/analyser.ts b/server/src/analyser.ts index 66af8766d..6762ed60a 100644 --- a/server/src/analyser.ts +++ b/server/src/analyser.ts @@ -59,8 +59,9 @@ export default class Analyzer { try { filePaths = await getFilePaths({ globPattern, rootPath }) } catch (error) { + const errorMessage = error instanceof Error ? error.message : error connection.window.showWarningMessage( - `Failed to analyze bash files using the glob "${globPattern}". The experience will be degraded. Error: ${error.message}`, + `Failed to analyze bash files using the glob "${globPattern}". The experience will be degraded. Error: ${errorMessage}`, ) } @@ -84,7 +85,8 @@ export default class Analyzer { analyzer.analyze(uri, LSP.TextDocument.create(uri, 'shell', 1, fileContent)) } catch (error) { - connection.console.warn(`Failed analyzing ${uri}. Error: ${error.message}`) + const errorMessage = error instanceof Error ? error.message : error + connection.console.warn(`Failed analyzing ${uri}. Error: ${errorMessage}`) } } diff --git a/server/src/server.ts b/server/src/server.ts index 50a7002c3..7c4bfbc25 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -248,8 +248,9 @@ export default class BashServer { } } } catch (error) { + const errorMessage = error instanceof Error ? error.message : error this.connection.console.warn( - `getExplainshellDocumentation exception: ${error.message}`, + `getExplainshellDocumentation exception: ${errorMessage}`, ) } } diff --git a/yarn.lock b/yarn.lock index 34e6e257a..f51a293c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3476,10 +3476,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typescript@3.9.10: - version "3.9.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" - integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== +typescript@4.6.4: + version "4.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== uri-js@^4.2.2: version "4.4.1"