diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-26 09:07:59 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-08-26 09:07:59 +0100 |
commit | 04c2961d0c5493962e948dc8101445cc76f1d460 (patch) | |
tree | c848162864e46a65733f1ed06f15cda80d5ed721 /editors/code/src/utils | |
parent | 1fbe5ffba8fdcdb47a53a06f2fd6a5fd8fc99bf3 (diff) | |
parent | b58f84626f2976e6dd7f9dad6627e21b352dee84 (diff) |
Merge #1736
1736: Switch to `@types/vscode` and `vscode-test` r=matklad a=bkchr
The old `vscode` package is outdated and it is recommened to switch to
these two new packages. This also solves a problem of a missing `.d.ts`
for `vscode` in Nixos.
Co-authored-by: Bastian Köcher <[email protected]>
Diffstat (limited to 'editors/code/src/utils')
-rw-r--r-- | editors/code/src/utils/diagnostics/rust.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/src/utils/diagnostics/rust.ts b/editors/code/src/utils/diagnostics/rust.ts index bfb494a3a..1fb1f7b6d 100644 --- a/editors/code/src/utils/diagnostics/rust.ts +++ b/editors/code/src/utils/diagnostics/rust.ts | |||
@@ -64,7 +64,7 @@ function mapLevelToSeverity(s: string): vscode.DiagnosticSeverity { | |||
64 | * Converts a Rust span to a VsCode location | 64 | * Converts a Rust span to a VsCode location |
65 | */ | 65 | */ |
66 | function mapSpanToLocation(span: RustDiagnosticSpan): vscode.Location { | 66 | function mapSpanToLocation(span: RustDiagnosticSpan): vscode.Location { |
67 | const fileName = path.join(vscode.workspace.rootPath!, span.file_name); | 67 | const fileName = path.join(vscode.workspace.rootPath || '', span.file_name); |
68 | const fileUri = vscode.Uri.file(fileName); | 68 | const fileUri = vscode.Uri.file(fileName); |
69 | 69 | ||
70 | const range = new vscode.Range( | 70 | const range = new vscode.Range( |