Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions editors/code/src/installation/download_artifact.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as vscode from "vscode";
import * as path from "path";
import { promises as fs } from "fs";
import { strict as assert } from "assert";

import { ArtifactReleaseInfo } from "./interfaces";
import { downloadFile } from "./download_file";
import { assert } from "../util";

/**
* Downloads artifact from given `downloadUrl`.
Expand All @@ -19,11 +19,10 @@ export async function downloadArtifact(
installationDir: string,
displayName: string,
) {
await fs.mkdir(installationDir).catch(err => assert.strictEqual(
err?.code,
"EEXIST",
await fs.mkdir(installationDir).catch(err => assert(
err?.code === "EEXIST",
`Couldn't create directory "${installationDir}" to download ` +
`${artifactFileName} artifact: ${err.message}`
`${artifactFileName} artifact: ${err?.message}`
));

const installationPath = path.join(installationDir, artifactFileName);
Expand Down
3 changes: 1 addition & 2 deletions editors/code/src/installation/download_file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import fetch from "node-fetch";
import * as fs from "fs";
import * as stream from "stream";
import * as util from "util";
import { strict as assert } from "assert";
import { log } from "../util";
import { log, assert } from "../util";

const pipeline = util.promisify(stream.pipeline);

Expand Down
3 changes: 1 addition & 2 deletions editors/code/src/installation/server.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import * as vscode from "vscode";
import * as path from "path";
import { strict as assert } from "assert";
import { promises as dns } from "dns";
import { spawnSync } from "child_process";

import { BinarySource } from "./interfaces";
import { fetchArtifactReleaseInfo } from "./fetch_artifact_release_info";
import { downloadArtifact } from "./download_artifact";
import { log } from "../util";
import { log, assert } from "../util";

export async function ensureServerBinary(source: null | BinarySource): Promise<null | string> {
if (!source) {
Expand Down
17 changes: 13 additions & 4 deletions editors/code/src/util.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
import * as lc from "vscode-languageclient";
import * as vscode from "vscode";
import { strict as nativeAssert } from "assert";

let enabled: boolean = false;
export function assert(condition: boolean, explanation: string): asserts condition {
try {
nativeAssert(condition, explanation);
} catch (err) {
log.error(`Assertion failed:`, explanation);
throw err;
}
}

export const log = {
enabled: true,
debug(message?: any, ...optionalParams: any[]): void {
if (!enabled) return;
if (!log.enabled) return;
// eslint-disable-next-line no-console
console.log(message, ...optionalParams);
},
error(message?: any, ...optionalParams: any[]): void {
if (!enabled) return;
if (!log.enabled) return;
debugger;
// eslint-disable-next-line no-console
console.error(message, ...optionalParams);
},
setEnabled(yes: boolean): void {
enabled = yes;
log.enabled = yes;
}
};

Expand Down