Fix hygiene/compile issues (release/1.26) (#14261)

* Fix hygiene issues

* Fix strict compile

* fixes

* compile fix

* more fixes

* more compile fixes

* last one?!

* fix tests
This commit is contained in:
Charles Gagnon
2021-02-11 22:02:55 -08:00
committed by GitHub
parent 4b87a0869f
commit abea315abb
34 changed files with 83 additions and 81 deletions

View File

@@ -8,7 +8,7 @@
*/
export class Deferred<T> {
promise: Promise<T>;
resolve!: (value?: T | PromiseLike<T>) => void;
resolve!: (value: T | PromiseLike<T>) => void;
reject!: (reason?: any) => void;
constructor() {
this.promise = new Promise<T>((resolve, reject) => {

View File

@@ -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<string> {
async function promptInputBox(title: string, options: vscode.InputBoxOptions): Promise<string | undefined> {
const inputBox = vscode.window.createInputBox();
inputBox.title = title;
inputBox.prompt = options.prompt;

View File

@@ -7,7 +7,7 @@ import { Deferred } from '../../common/promise';
describe('Deferred', () => {
it('Then should be called upon resolution', function (done): void {
const deferred = new Deferred();
const deferred = new Deferred<void>();
deferred.then(() => {
done();
});

View File

@@ -29,7 +29,7 @@ describe('filePicker', function (): void {
should(filePicker.filePathInputBox.value).should.not.be.undefined();
filePicker.value!.should.equal(initialPath);
filePicker.component().items.length.should.equal(2, 'Filepicker container should have two components');
const deferred = new Deferred();
const deferred = new Deferred<void>();
sinon.stub(vscode.window, 'showOpenDialog').callsFake(async (_options) => {
deferred.resolve();
return [newFileUri];

View File

@@ -8,7 +8,7 @@
*/
export class Deferred<T> {
promise: Promise<T>;
resolve!: (value?: T | PromiseLike<T>) => void;
resolve!: (value: T | PromiseLike<T>) => void;
reject!: (reason?: any) => void;
constructor() {
this.promise = new Promise<T>((resolve, reject) => {

View File

@@ -22,7 +22,7 @@ export class NoAzdataError extends Error implements azdataExt.ErrorWithLink {
*/
export function searchForCmd(exe: string): Promise<string> {
// Note : This is separated out to allow for easy test stubbing
return new Promise<string>((resolve, reject) => which(exe, (err, path) => err ? reject(err) : resolve(path)));
return new Promise<string>((resolve, reject) => which(exe, (err, path) => err ? reject(err) : resolve(path || '')));
}
/**

View File

@@ -52,7 +52,7 @@ describe('HttpClient', function (): void {
it('errors on write stream error', async function (): Promise<void> {
const downloadFolder = os.tmpdir();
const mockWriteStream = new PassThrough();
const deferredPromise = new Deferred();
const deferredPromise = new Deferred<void>();
sinon.stub(fs, 'createWriteStream').callsFake(() => {
deferredPromise.resolve();
return <any>mockWriteStream;

View File

@@ -9,7 +9,7 @@ import { Deferred } from '../../common/promise';
describe('DeferredPromise', function (): void {
it('Resolves correctly', async function(): Promise<void> {
const deferred = new Deferred();
const deferred = new Deferred<void>();
deferred.resolve();
await should(deferred.promise).be.resolved();
});
@@ -21,7 +21,7 @@ describe('DeferredPromise', function (): void {
});
it('Chains then correctly', function(done): void {
const deferred = new Deferred();
const deferred = new Deferred<void>();
deferred.then( () => {
done();
});

View File

@@ -27,12 +27,12 @@ export abstract class BasePage {
/**
* This method constructs all the elements of the page.
*/
public async abstract start(): Promise<boolean>;
public abstract start(): Promise<boolean>;
/**
* This method is called when the user is entering the page.
*/
public async abstract onPageEnter(): Promise<boolean>;
public abstract onPageEnter(): Promise<boolean>;
/**
* This method is called when the user is leaving the page.

View File

@@ -445,7 +445,7 @@ export class Git {
const [, letter] = match;
try {
const networkPath = await new Promise<string>(resolve =>
const networkPath = await new Promise<string | undefined>(resolve =>
realpath.native(`${letter}:`, { encoding: 'utf8' }, (err, resolvedPath) =>
resolve(err !== null ? undefined : resolvedPath),
),

View File

@@ -336,7 +336,7 @@ export function* splitInChunks(array: string[], maxChunkLength: number): Iterabl
interface ILimitedTaskFactory<T> {
factory: () => Promise<T>;
c: (value?: T | Promise<T>) => void;
c: (value: T | Promise<T>) => void;
e: (error?: any) => void;
}

View File

@@ -25,7 +25,7 @@ export interface PromiseAdapter<T, U> {
(
value: T,
resolve:
(value?: U | PromiseLike<U>) => void,
(value: U | PromiseLike<U>) => void,
reject:
(reason: any) => void
): any;

View File

@@ -15,12 +15,12 @@ export abstract class BasePage {
/**
* This method constructs all the elements of the page.
*/
public async abstract start(): Promise<boolean>;
public abstract start(): Promise<boolean>;
/**
* This method is called when the user is entering the page.
*/
public async abstract onPageEnter(): Promise<boolean>;
public abstract onPageEnter(): Promise<boolean>;
/**
* This method is called when the user is leaving the page.

View File

@@ -104,7 +104,7 @@ describe('Add Edit External Languages Tab', () => {
let tab = new AddEditLanguageTab(testContext.apiWrapper.object, parent, languageUpdateModel);
should.notEqual(tab.saveButton, undefined);
let updateCalled = false;
let promise = new Promise(resolve => {
let promise = new Promise<void>(resolve => {
parent.onUpdate(() => {
updateCalled = true;
resolve();

View File

@@ -35,7 +35,7 @@ describe('Edit External Languages Dialog', () => {
dialog.showDialog();
let updateCalled = false;
let promise = new Promise(resolve => {
let promise = new Promise<void>(resolve => {
parent.onUpdate(() => {
updateCalled = true;
parent.onUpdatedLanguage(languageUpdateModel);

View File

@@ -12,7 +12,7 @@ export class Delayer<T> {
public defaultDelay: number;
private timeout: any; // Timer
private completionPromise: Promise<T> | null;
private onSuccess: ((value?: T | Thenable<T> | undefined) => void) | null;
private onSuccess: ((value: T | PromiseLike<T> | undefined) => void) | null;
private task: ITask<T> | null;
constructor(defaultDelay: number) {
@@ -30,7 +30,7 @@ export class Delayer<T> {
}
if (!this.completionPromise) {
this.completionPromise = new Promise<T>((resolve) => {
this.completionPromise = new Promise<T | undefined>((resolve) => {
this.onSuccess = resolve;
}).then(() => {
this.completionPromise = null;
@@ -76,4 +76,4 @@ export class Delayer<T> {
this.timeout = null;
}
}
}
}

View File

@@ -14,7 +14,7 @@ export abstract class RemoteBook {
this.remotePath = remotePath;
}
public async abstract createLocalCopy(): Promise<void>;
public abstract createLocalCopy(): Promise<void>;
public setLocalPath(): void {
// Save directory on User directory

View File

@@ -17,15 +17,15 @@ export abstract class BasePage {
/**
* This method constructs all the elements of the page.
*/
public async abstract initialize(): Promise<boolean>;
public abstract initialize(): Promise<boolean>;
/**
* This method is called when the user is entering the page.
*/
public async abstract onPageEnter(): Promise<void>;
public abstract onPageEnter(): Promise<void>;
/**
* This method is called when the user is leaving the page.
*/
public async abstract onPageLeave(): Promise<boolean>;
public abstract onPageLeave(): Promise<boolean>;
}

View File

@@ -170,7 +170,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
bookTreeViewProvider = appContext.bookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
});
@@ -276,7 +276,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
providedbookTreeViewProvider = appContext.providedBookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([providedbookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('ProvidedBooksTreeViewProvider did not initialize in time'); })]);
await providedbookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
});
@@ -359,7 +359,7 @@ describe('BooksTreeViewTests', function () {
this.beforeAll(async () => {
pinnedTreeViewProvider = appContext.pinnedBookTreeViewProvider;
bookTreeViewProvider = appContext.bookTreeViewProvider;
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await Promise.race([pinnedTreeViewProvider.initialized, errorCase.then(() => { throw new Error('PinnedTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(bookFolderPath, undefined, false, false);
@@ -478,7 +478,7 @@ describe('BooksTreeViewTests', function () {
index: 0
};
bookTreeViewProvider = new BookTreeViewProvider([folder], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
await bookTreeViewProvider.openBook(rootFolderPath, undefined, false, false);
});
@@ -556,7 +556,7 @@ describe('BooksTreeViewTests', function () {
index: 0
};
bookTreeViewProvider = new BookTreeViewProvider([folder], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -585,7 +585,7 @@ describe('BooksTreeViewTests', function () {
}
});
});
})
});
});
describe('BookTreeViewProvider.getSections', function () {
@@ -646,7 +646,7 @@ describe('BooksTreeViewTests', function () {
index: 0
}];
bookTreeViewProvider = new BookTreeViewProvider(folder, mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -659,10 +659,12 @@ describe('BooksTreeViewTests', function () {
});
after(async function (): Promise<void> {
if (await exists(rootFolderPath)) await promisify(rimraf)(rootFolderPath);
if (await exists(rootFolderPath)) {
await promisify(rimraf)(rootFolderPath);
}
});
});
})
});
});
describe('BookTreeViewProvider.Commands', function () {
@@ -716,7 +718,7 @@ describe('BooksTreeViewTests', function () {
const mockExtensionContext = new MockExtensionContext();
bookTreeViewProvider = new BookTreeViewProvider([], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});
@@ -913,7 +915,7 @@ describe('BooksTreeViewTests', function () {
const mockExtensionContext = new MockExtensionContext();
bookTreeViewProvider = new BookTreeViewProvider([], mockExtensionContext, false, 'bookTreeView', NavigationProviders.NotebooksNavigator);
let errorCase = new Promise((resolve, reject) => setTimeout(() => resolve(), 5000));
let errorCase = new Promise<void>((resolve, reject) => setTimeout(() => resolve(), 5000));
await Promise.race([bookTreeViewProvider.initialized, errorCase.then(() => { throw new Error('BookTreeViewProvider did not initialize in time'); })]);
});

View File

@@ -17,7 +17,7 @@ export class TestChildProcessPromise<T> implements cp.ChildProcessPromise {
this.reject = reject;
});
}
resolve!: (value?: T | PromiseLike<T>) => void;
resolve!: (value: T | PromiseLike<T>) => void;
reject!: (reason?: any) => void;
then<TResult1 = T, TResult2 = never>(onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2> {
return this._promise.then(onFulfilled, onRejected);

View File

@@ -93,13 +93,13 @@ describe('WizardPage', () => {
return enabled;
});
// Used to ensure that we wait until the enabled state is updated for our mocked components before continuing
let enabledDeferred = new Deferred();
let enabledDeferred = new Deferred<void>();
initializeWizardPage(testWizardPage);
await contentRegistered.promise;
await enabledDeferred.promise;
should(stubInputBox.enabled).be.false('Input box should be disabled by default');
enabledDeferred = new Deferred();
enabledDeferred = new Deferred<void>();
stubCheckbox.checked = true;
// Now wait for the enabled state to be updated again
await enabledDeferred.promise;

View File

@@ -8,6 +8,6 @@ export class Deferred<T> {
this.resolve = resolve;
this.reject = reject;
});;
resolve!: (value?: T | PromiseLike<T>) => void;
resolve!: (value: T | PromiseLike<T>) => void;
reject!: (reason?: any) => void;
}

View File

@@ -99,11 +99,11 @@ export async function verifyConnectionAndGetOwnerUri(endpoint: mssql.SchemaCompa
let userConnection;
userConnection = connectionList.find(connection =>
(endpoint.connectionDetails['authenticationType'] === 'SqlLogin'
&& endpoint.connectionDetails['serverName'] === connection.options.server
&& endpoint.connectionDetails['userName'] === connection.options.user
&& (endpoint.connectionDetails['databaseName'].toLowerCase() === connection.options.database.toLowerCase()
|| connection.options.database.toLowerCase() === 'master')));
(endpoint.connectionDetails['authenticationType'] === 'SqlLogin'
&& endpoint.connectionDetails['serverName'] === connection.options.server
&& endpoint.connectionDetails['userName'] === connection.options.user
&& (endpoint.connectionDetails['databaseName'].toLowerCase() === connection.options.database.toLowerCase()
|| connection.options.database.toLowerCase() === 'master')));
if (userConnection === undefined) {
const getConnectionString = loc.getConnectionString(caller);