From 8ab315ce200832a9610f8404b0081b73af4ffe34 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 27 Jun 2017 10:29:47 -0400 Subject: [PATCH 1/2] setInterval should be setTimeout --- src/clients/feedbackclient.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/clients/feedbackclient.ts b/src/clients/feedbackclient.ts index 5747f743c4..46c852edbc 100644 --- a/src/clients/feedbackclient.ts +++ b/src/clients/feedbackclient.ts @@ -26,7 +26,7 @@ export class FeedbackClient { const value: string = await window.showInputBox({ value: undefined, prompt: Strings.SendFeedbackPrompt, placeHolder: undefined, password: false }); if (value === undefined) { const disposable = window.setStatusBarMessage(Strings.NoFeedbackSent); - setInterval(() => disposable.dispose(), 1000 * 5); + setTimeout(() => disposable.dispose(), 1000 * 5); return; } @@ -35,7 +35,7 @@ export class FeedbackClient { const email: string = await window.showInputBox({ value: undefined, prompt: Strings.SendEmailPrompt, placeHolder: undefined, password: false }); if (email === undefined) { const disposable = window.setStatusBarMessage(Strings.NoFeedbackSent); - setInterval(() => disposable.dispose(), 1000 * 5); + setTimeout(() => disposable.dispose(), 1000 * 5); return; } if (email) { @@ -49,7 +49,7 @@ export class FeedbackClient { Telemetry.SendFeedback(choice.id, { "VSCode.Feedback.Comment" : trimmedValue, "VSCode.Feedback.Email" : providedEmail} ); const disposable: Disposable = window.setStatusBarMessage(Strings.ThanksForFeedback); - setInterval(() => disposable.dispose(), 1000 * 5); + setTimeout(() => disposable.dispose(), 1000 * 5); } } catch (err) { const message: string = Utils.GetMessageForStatusCode(0, err.message, "Failed getting SendFeedback selection"); From 0029912cf92d16740232b0fc7ebe0ea52f0d96a4 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 27 Jun 2017 10:30:19 -0400 Subject: [PATCH 2/2] Remove await from showQuickPick calls --- src/clients/witclient.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/clients/witclient.ts b/src/clients/witclient.ts index af2a568ab9..96e5f27f17 100644 --- a/src/clients/witclient.ts +++ b/src/clients/witclient.ts @@ -39,7 +39,7 @@ export class WitClient extends BaseClient { public async CreateNewWorkItem(taskTitle: string): Promise { try { Telemetry.SendEvent(TelemetryEvents.OpenNewWorkItem); - const selectedType: BaseQuickPickItem = await window.showQuickPick(await this.getWorkItemTypes(), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItemType }); + const selectedType: BaseQuickPickItem = await window.showQuickPick(this.getWorkItemTypes(), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItemType }); if (selectedType) { Telemetry.SendEvent(TelemetryEvents.OpenNewWorkItem); @@ -59,13 +59,13 @@ export class WitClient extends BaseClient { public async ShowMyWorkItemQueries(): Promise { try { Telemetry.SendEvent(TelemetryEvents.ShowMyWorkItemQueries); - const query: WorkItemQueryQuickPickItem = await window.showQuickPick(await this.getMyWorkItemQueries(), { matchOnDescription: false, placeHolder: Strings.ChooseWorkItemQuery }); + const query: WorkItemQueryQuickPickItem = await window.showQuickPick(this.getMyWorkItemQueries(), { matchOnDescription: false, placeHolder: Strings.ChooseWorkItemQuery }); if (query) { Telemetry.SendEvent(TelemetryEvents.ViewWorkItems); Logger.LogInfo("Selected query is " + query.label); Logger.LogInfo("Getting work items for query..."); - const workItem: BaseQuickPickItem = await window.showQuickPick(await this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, query.wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); + const workItem: BaseQuickPickItem = await window.showQuickPick(this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, query.wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); if (workItem) { let url: string = undefined; if (workItem.id === undefined) { @@ -110,7 +110,7 @@ export class WitClient extends BaseClient { try { const query: string = await this.getPinnedQueryText(); //gets either MyWorkItems, queryText or wiql of queryPath of PinnedQuery // TODO: There isn't a way to do a multi select pick list right now, but when there is we should change this to use it. - const workItem: BaseQuickPickItem = await window.showQuickPick(await this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, query), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); + const workItem: BaseQuickPickItem = await window.showQuickPick(this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, query), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); if (workItem) { return ["#" + workItem.id + " - " + workItem.description]; } else { @@ -124,7 +124,7 @@ export class WitClient extends BaseClient { private async showWorkItems(wiql: string): Promise { Logger.LogInfo("Getting work items..."); - const workItem: BaseQuickPickItem = await window.showQuickPick(await this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); + const workItem: BaseQuickPickItem = await window.showQuickPick(this.getMyWorkItems(this._serverContext.RepoInfo.TeamProject, wiql), { matchOnDescription: true, placeHolder: Strings.ChooseWorkItem }); if (workItem) { let url: string = undefined; if (workItem.id === undefined) {