From 1b9ab04d4b4694eb32402daf83f8df5f13df23ec Mon Sep 17 00:00:00 2001
From: Veetaha <gerzoh1@gmail.com>
Date: Fri, 28 Feb 2020 23:56:17 +0200
Subject: vscode: migrate to more type-safe assert impl

---
 editors/code/src/installation/download_file.ts | 3 +--
 editors/code/src/installation/server.ts        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'editors/code/src/installation')

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";
 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);
 
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 @@
 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) {
-- 
cgit v1.2.3


From 3ad0574d7e3f1af1e28f7f5cbc085faa30759e47 Mon Sep 17 00:00:00 2001
From: Veetaha <gerzoh1@gmail.com>
Date: Sat, 29 Feb 2020 00:26:22 +0200
Subject: vscode: add equality assertion

---
 editors/code/src/installation/download_artifact.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editors/code/src/installation')

diff --git a/editors/code/src/installation/download_artifact.ts b/editors/code/src/installation/download_artifact.ts
index 8ed99bf0a..c60014c8c 100644
--- a/editors/code/src/installation/download_artifact.ts
+++ b/editors/code/src/installation/download_artifact.ts
@@ -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`.
@@ -19,7 +19,7 @@ export async function downloadArtifact(
     installationDir: string,
     displayName: string,
 ) {
-    await fs.mkdir(installationDir).catch(err => assert.strictEqual(
+    await fs.mkdir(installationDir).catch(err => assert.eq(
         err?.code,
         "EEXIST",
         `Couldn't create directory "${installationDir}" to download ` +
-- 
cgit v1.2.3


From 6dc598fa6331de6124a255527e37804d82372fdc Mon Sep 17 00:00:00 2001
From: Veetaha <gerzoh1@gmail.com>
Date: Sat, 29 Feb 2020 00:46:48 +0200
Subject: vscode: simplify assert.eq() to assert() as per matklad

---
 editors/code/src/installation/download_artifact.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'editors/code/src/installation')

diff --git a/editors/code/src/installation/download_artifact.ts b/editors/code/src/installation/download_artifact.ts
index c60014c8c..97e4d67c2 100644
--- a/editors/code/src/installation/download_artifact.ts
+++ b/editors/code/src/installation/download_artifact.ts
@@ -19,11 +19,10 @@ export async function downloadArtifact(
     installationDir: string,
     displayName: string,
 ) {
-    await fs.mkdir(installationDir).catch(err => assert.eq(
-        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);
-- 
cgit v1.2.3