From e8d02dbc440c8b0daa439508a28da617c9227bf9 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 11 Feb 2021 22:18:03 -0800 Subject: [PATCH] Cleanup typings from vs code merge (#14267) --- extensions/arc/src/common/promise.ts | 6 +++--- extensions/arc/src/common/utils.ts | 4 ++-- extensions/azdata/src/common/promise.ts | 6 +++--- extensions/git/src/util.ts | 4 ++-- extensions/notebook/src/test/book/book.test.ts | 8 +++++--- extensions/resource-deployment/src/test/stubs.ts | 4 ++-- extensions/resource-deployment/src/test/utils.ts | 6 +++--- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/extensions/arc/src/common/promise.ts b/extensions/arc/src/common/promise.ts index 321c559c1f..c8d40d7a67 100644 --- a/extensions/arc/src/common/promise.ts +++ b/extensions/arc/src/common/promise.ts @@ -6,13 +6,13 @@ /** * Deferred promise */ -export class Deferred { +export class Deferred { promise: Promise; - resolve!: (value?: T | PromiseLike) => void; + resolve!: (value: T | PromiseLike) => void; reject!: (reason?: any) => void; constructor() { this.promise = new Promise((resolve, reject) => { - this.resolve = resolve; + this.resolve = resolve; this.reject = reject; }); } diff --git a/extensions/arc/src/common/utils.ts b/extensions/arc/src/common/utils.ts index fbde85dbbf..5c0abb7ac9 100644 --- a/extensions/arc/src/common/utils.ts +++ b/extensions/arc/src/common/utils.ts @@ -109,7 +109,7 @@ export function getDatabaseStateDisplayText(state: string): string { * @returns Promise resolving to the user's input if it passed validation, * or undefined if the input box was closed for any other reason */ -async function promptInputBox(title: string, options: vscode.InputBoxOptions): Promise { +async function promptInputBox(title: string, options: vscode.InputBoxOptions): Promise { const inputBox = vscode.window.createInputBox(); inputBox.title = title; inputBox.prompt = options.prompt; @@ -118,7 +118,7 @@ async function promptInputBox(title: string, options: vscode.InputBoxOptions): P inputBox.value = options.value ?? ''; inputBox.ignoreFocusOut = options.ignoreFocusOut ?? false; - return new Promise(resolve => { + return new Promise(resolve => { let valueAccepted = false; inputBox.onDidAccept(async () => { if (options.validateInput) { diff --git a/extensions/azdata/src/common/promise.ts b/extensions/azdata/src/common/promise.ts index 321c559c1f..c8d40d7a67 100644 --- a/extensions/azdata/src/common/promise.ts +++ b/extensions/azdata/src/common/promise.ts @@ -6,13 +6,13 @@ /** * Deferred promise */ -export class Deferred { +export class Deferred { promise: Promise; - resolve!: (value?: T | PromiseLike) => void; + resolve!: (value: T | PromiseLike) => void; reject!: (reason?: any) => void; constructor() { this.promise = new Promise((resolve, reject) => { - this.resolve = resolve; + this.resolve = resolve; this.reject = reject; }); } diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts index 2bcd5d651d..b656fdf461 100644 --- a/extensions/git/src/util.ts +++ b/extensions/git/src/util.ts @@ -336,7 +336,7 @@ export function* splitInChunks(array: string[], maxChunkLength: number): Iterabl interface ILimitedTaskFactory { factory: () => Promise; - c: (value?: T | Promise) => void; + c: (value: T | Promise) => void; e: (error?: any) => void; } @@ -353,7 +353,7 @@ export class Limiter { } queue(factory: () => Promise): Promise { - return new Promise((c, e) => { + return new Promise((c, e) => { this.outstandingPromises.push({ factory, c, e }); this.consume(); }); diff --git a/extensions/notebook/src/test/book/book.test.ts b/extensions/notebook/src/test/book/book.test.ts index 689c1cfc38..7bbecf8919 100644 --- a/extensions/notebook/src/test/book/book.test.ts +++ b/extensions/notebook/src/test/book/book.test.ts @@ -585,7 +585,7 @@ describe('BooksTreeViewTests', function () { } }); }); - }) + }); }); describe('BookTreeViewProvider.getSections', function () { @@ -659,10 +659,12 @@ describe('BooksTreeViewTests', function () { }); after(async function (): Promise { - if (await exists(rootFolderPath)) await promisify(rimraf)(rootFolderPath); + if (await exists(rootFolderPath)) { + await promisify(rimraf)(rootFolderPath); + } }); }); - }) + }); }); describe('BookTreeViewProvider.Commands', function () { diff --git a/extensions/resource-deployment/src/test/stubs.ts b/extensions/resource-deployment/src/test/stubs.ts index 1a744e1f07..b7e586af87 100644 --- a/extensions/resource-deployment/src/test/stubs.ts +++ b/extensions/resource-deployment/src/test/stubs.ts @@ -13,11 +13,11 @@ export class TestChildProcessPromise implements cp.ChildProcessPromise { constructor() { this._promise = new Promise((resolve, reject) => { - this.resolve = resolve; + this.resolve = resolve; this.reject = reject; }); } - resolve!: (value?: T | PromiseLike) => void; + resolve!: (value: T | PromiseLike) => void; reject!: (reason?: any) => void; then(onFulfilled?: ((value: T) => TResult1 | PromiseLike) | null, onRejected?: ((reason: any) => TResult2 | PromiseLike) | null): Promise { return this._promise.then(onFulfilled, onRejected); diff --git a/extensions/resource-deployment/src/test/utils.ts b/extensions/resource-deployment/src/test/utils.ts index c671327f82..d537006d33 100644 --- a/extensions/resource-deployment/src/test/utils.ts +++ b/extensions/resource-deployment/src/test/utils.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -export class Deferred { +export class Deferred { promise: Promise = new Promise((resolve, reject) => { - this.resolve = resolve; + this.resolve = resolve; this.reject = reject; });; - resolve!: (value?: T | PromiseLike) => void; + resolve!: (value: T | PromiseLike) => void; reject!: (reason?: any) => void; }