diff options
author | Veetaha <[email protected]> | 2020-02-28 21:56:17 +0000 |
---|---|---|
committer | Veetaha <[email protected]> | 2020-02-28 21:56:17 +0000 |
commit | 1b9ab04d4b4694eb32402daf83f8df5f13df23ec (patch) | |
tree | 90b35930cacf758ac4b6e513a1811a14a41c88ad /editors | |
parent | d2bf2adc272197eafa56f77363edaa6c410b39cf (diff) |
vscode: migrate to more type-safe assert impl
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/src/installation/download_file.ts | 3 | ||||
-rw-r--r-- | editors/code/src/installation/server.ts | 3 | ||||
-rw-r--r-- | editors/code/src/util.ts | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/editors/code/src/installation/download_file.ts b/editors/code/src/installation/download_file.ts index 319cb995c..ee8949d61 100644 --- a/editors/code/src/installation/download_file.ts +++ b/editors/code/src/installation/download_file.ts | |||
@@ -2,8 +2,7 @@ import fetch from "node-fetch"; | |||
2 | import * as fs from "fs"; | 2 | import * as fs from "fs"; |
3 | import * as stream from "stream"; | 3 | import * as stream from "stream"; |
4 | import * as util from "util"; | 4 | import * as util from "util"; |
5 | import { strict as assert } from "assert"; | 5 | import { log, assert } from "../util"; |
6 | import { log } from "../util"; | ||
7 | 6 | ||
8 | const pipeline = util.promisify(stream.pipeline); | 7 | const pipeline = util.promisify(stream.pipeline); |
9 | 8 | ||
diff --git a/editors/code/src/installation/server.ts b/editors/code/src/installation/server.ts index cb5e56844..6a6cf4f8c 100644 --- a/editors/code/src/installation/server.ts +++ b/editors/code/src/installation/server.ts | |||
@@ -1,13 +1,12 @@ | |||
1 | import * as vscode from "vscode"; | 1 | import * as vscode from "vscode"; |
2 | import * as path from "path"; | 2 | import * as path from "path"; |
3 | import { strict as assert } from "assert"; | ||
4 | import { promises as dns } from "dns"; | 3 | import { promises as dns } from "dns"; |
5 | import { spawnSync } from "child_process"; | 4 | import { spawnSync } from "child_process"; |
6 | 5 | ||
7 | import { BinarySource } from "./interfaces"; | 6 | import { BinarySource } from "./interfaces"; |
8 | import { fetchArtifactReleaseInfo } from "./fetch_artifact_release_info"; | 7 | import { fetchArtifactReleaseInfo } from "./fetch_artifact_release_info"; |
9 | import { downloadArtifact } from "./download_artifact"; | 8 | import { downloadArtifact } from "./download_artifact"; |
10 | import { log } from "../util"; | 9 | import { log, assert } from "../util"; |
11 | 10 | ||
12 | export async function ensureServerBinary(source: null | BinarySource): Promise<null | string> { | 11 | export async function ensureServerBinary(source: null | BinarySource): Promise<null | string> { |
13 | if (!source) { | 12 | if (!source) { |
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts index 68c2a94d0..acf78898b 100644 --- a/editors/code/src/util.ts +++ b/editors/code/src/util.ts | |||
@@ -1,22 +1,26 @@ | |||
1 | import * as lc from "vscode-languageclient"; | 1 | import * as lc from "vscode-languageclient"; |
2 | import * as vscode from "vscode"; | 2 | import * as vscode from "vscode"; |
3 | import { strict as nodeAssert } from "assert"; | ||
3 | 4 | ||
4 | let enabled: boolean = false; | 5 | export function assert(condition: unknown, explanation: string): asserts condition { |
6 | nodeAssert(condition, explanation); | ||
7 | } | ||
5 | 8 | ||
6 | export const log = { | 9 | export const log = { |
10 | enabled: true, | ||
7 | debug(message?: any, ...optionalParams: any[]): void { | 11 | debug(message?: any, ...optionalParams: any[]): void { |
8 | if (!enabled) return; | 12 | if (!log.enabled) return; |
9 | // eslint-disable-next-line no-console | 13 | // eslint-disable-next-line no-console |
10 | console.log(message, ...optionalParams); | 14 | console.log(message, ...optionalParams); |
11 | }, | 15 | }, |
12 | error(message?: any, ...optionalParams: any[]): void { | 16 | error(message?: any, ...optionalParams: any[]): void { |
13 | if (!enabled) return; | 17 | if (!log.enabled) return; |
14 | debugger; | 18 | debugger; |
15 | // eslint-disable-next-line no-console | 19 | // eslint-disable-next-line no-console |
16 | console.error(message, ...optionalParams); | 20 | console.error(message, ...optionalParams); |
17 | }, | 21 | }, |
18 | setEnabled(yes: boolean): void { | 22 | setEnabled(yes: boolean): void { |
19 | enabled = yes; | 23 | log.enabled = yes; |
20 | } | 24 | } |
21 | }; | 25 | }; |
22 | 26 | ||