Skip to content

Commit 99ca66d

Browse files
authored
Merge pull request #385 from bash-lsp/renovate/typescript-4.x
Update dependency typescript to v4
2 parents ec543e1 + 18462be commit 99ca66d

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"jest": "25.5.4",
2929
"prettier": "2.6.2",
3030
"ts-jest": "25.5.1",
31-
"typescript": "3.9.10",
31+
"typescript": "4.6.4",
3232
"vscode-languageserver": "6.1.1"
3333
},
3434
"dependencies": {},

server/src/analyser.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ export default class Analyzer {
5959
try {
6060
filePaths = await getFilePaths({ globPattern, rootPath })
6161
} catch (error) {
62+
const errorMessage = error instanceof Error ? error.message : error
6263
connection.window.showWarningMessage(
63-
`Failed to analyze bash files using the glob "${globPattern}". The experience will be degraded. Error: ${error.message}`,
64+
`Failed to analyze bash files using the glob "${globPattern}". The experience will be degraded. Error: ${errorMessage}`,
6465
)
6566
}
6667

@@ -84,7 +85,8 @@ export default class Analyzer {
8485

8586
analyzer.analyze(uri, LSP.TextDocument.create(uri, 'shell', 1, fileContent))
8687
} catch (error) {
87-
connection.console.warn(`Failed analyzing ${uri}. Error: ${error.message}`)
88+
const errorMessage = error instanceof Error ? error.message : error
89+
connection.console.warn(`Failed analyzing ${uri}. Error: ${errorMessage}`)
8890
}
8991
}
9092

server/src/server.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@ export default class BashServer {
248248
}
249249
}
250250
} catch (error) {
251+
const errorMessage = error instanceof Error ? error.message : error
251252
this.connection.console.warn(
252-
`getExplainshellDocumentation exception: ${error.message}`,
253+
`getExplainshellDocumentation exception: ${errorMessage}`,
253254
)
254255
}
255256
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3476,10 +3476,10 @@ typedarray-to-buffer@^3.1.5:
34763476
dependencies:
34773477
is-typedarray "^1.0.0"
34783478

3479-
typescript@3.9.10:
3480-
version "3.9.10"
3481-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
3482-
integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
3479+
typescript@4.6.4:
3480+
version "4.6.4"
3481+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
3482+
integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
34833483

34843484
uri-js@^4.2.2:
34853485
version "4.4.1"

0 commit comments

Comments
 (0)