diff options
Diffstat (limited to 'editors/code/src/util.ts')
-rw-r--r-- | editors/code/src/util.ts | 51 |
1 files changed, 41 insertions, 10 deletions
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts index fec4c3295..78fe6f5da 100644 --- a/editors/code/src/util.ts +++ b/editors/code/src/util.ts | |||
@@ -1,7 +1,9 @@ | |||
1 | import * as lc from "vscode-languageclient"; | 1 | import * as lc from "vscode-languageclient"; |
2 | import * as fs from "fs"; | ||
2 | import * as vscode from "vscode"; | 3 | import * as vscode from "vscode"; |
3 | import { strict as nativeAssert } from "assert"; | 4 | import { strict as nativeAssert } from "assert"; |
4 | import { spawnSync } from "child_process"; | 5 | import { spawnSync } from "child_process"; |
6 | import { inspect } from "util"; | ||
5 | 7 | ||
6 | export function assert(condition: boolean, explanation: string): asserts condition { | 8 | export function assert(condition: boolean, explanation: string): asserts condition { |
7 | try { | 9 | try { |
@@ -14,21 +16,46 @@ export function assert(condition: boolean, explanation: string): asserts conditi | |||
14 | 16 | ||
15 | export const log = new class { | 17 | export const log = new class { |
16 | private enabled = true; | 18 | private enabled = true; |
19 | private readonly output = vscode.window.createOutputChannel("Rust Analyzer Client"); | ||
17 | 20 | ||
18 | setEnabled(yes: boolean): void { | 21 | setEnabled(yes: boolean): void { |
19 | log.enabled = yes; | 22 | log.enabled = yes; |
20 | } | 23 | } |
21 | 24 | ||
22 | debug(message?: any, ...optionalParams: any[]): void { | 25 | // Hint: the type [T, ...T[]] means a non-empty array |
26 | debug(...msg: [unknown, ...unknown[]]): void { | ||
23 | if (!log.enabled) return; | 27 | if (!log.enabled) return; |
24 | // eslint-disable-next-line no-console | 28 | log.write("DEBUG", ...msg); |
25 | console.log(message, ...optionalParams); | 29 | log.output.toString(); |
26 | } | 30 | } |
27 | 31 | ||
28 | error(message?: any, ...optionalParams: any[]): void { | 32 | info(...msg: [unknown, ...unknown[]]): void { |
33 | log.write("INFO", ...msg); | ||
34 | } | ||
35 | |||
36 | warn(...msg: [unknown, ...unknown[]]): void { | ||
37 | debugger; | ||
38 | log.write("WARN", ...msg); | ||
39 | } | ||
40 | |||
41 | error(...msg: [unknown, ...unknown[]]): void { | ||
29 | debugger; | 42 | debugger; |
30 | // eslint-disable-next-line no-console | 43 | log.write("ERROR", ...msg); |
31 | console.error(message, ...optionalParams); | 44 | log.output.show(true); |
45 | } | ||
46 | |||
47 | private write(label: string, ...messageParts: unknown[]): void { | ||
48 | const message = messageParts.map(log.stringify).join(" "); | ||
49 | const dateTime = new Date().toLocaleString(); | ||
50 | log.output.appendLine(`${label} [${dateTime}]: ${message}`); | ||
51 | } | ||
52 | |||
53 | private stringify(val: unknown): string { | ||
54 | if (typeof val === "string") return val; | ||
55 | return inspect(val, { | ||
56 | colors: false, | ||
57 | depth: 6, // heuristic | ||
58 | }); | ||
32 | } | 59 | } |
33 | }; | 60 | }; |
34 | 61 | ||
@@ -46,7 +73,7 @@ export async function sendRequestWithRetry<TParam, TRet>( | |||
46 | ); | 73 | ); |
47 | } catch (error) { | 74 | } catch (error) { |
48 | if (delay === null) { | 75 | if (delay === null) { |
49 | log.error("LSP request timed out", { method: reqType.method, param, error }); | 76 | log.warn("LSP request timed out", { method: reqType.method, param, error }); |
50 | throw error; | 77 | throw error; |
51 | } | 78 | } |
52 | 79 | ||
@@ -55,7 +82,7 @@ export async function sendRequestWithRetry<TParam, TRet>( | |||
55 | } | 82 | } |
56 | 83 | ||
57 | if (error.code !== lc.ErrorCodes.ContentModified) { | 84 | if (error.code !== lc.ErrorCodes.ContentModified) { |
58 | log.error("LSP request failed", { method: reqType.method, param, error }); | 85 | log.warn("LSP request failed", { method: reqType.method, param, error }); |
59 | throw error; | 86 | throw error; |
60 | } | 87 | } |
61 | 88 | ||
@@ -87,11 +114,15 @@ export function isRustEditor(editor: vscode.TextEditor): editor is RustEditor { | |||
87 | export function isValidExecutable(path: string): boolean { | 114 | export function isValidExecutable(path: string): boolean { |
88 | log.debug("Checking availability of a binary at", path); | 115 | log.debug("Checking availability of a binary at", path); |
89 | 116 | ||
117 | if (!fs.existsSync(path)) return false; | ||
118 | |||
90 | const res = spawnSync(path, ["--version"], { encoding: 'utf8' }); | 119 | const res = spawnSync(path, ["--version"], { encoding: 'utf8' }); |
91 | 120 | ||
92 | log.debug(res, "--version output:", res.output); | 121 | const isSuccess = res.status === 0; |
122 | const printOutput = isSuccess ? log.debug : log.warn; | ||
123 | printOutput(path, "--version:", res); | ||
93 | 124 | ||
94 | return res.status === 0; | 125 | return isSuccess; |
95 | } | 126 | } |
96 | 127 | ||
97 | /** Sets ['when'](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts) clause contexts */ | 128 | /** Sets ['when'](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts) clause contexts */ |