Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Several miscellaneous fixes #268

Merged
merged 2 commits into from
Jun 27, 2017
Merged

Several miscellaneous fixes #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ab315c
setInterval should be setTimeout
Jun 27, 2017
0029912
Remove await from showQuickPick calls
Jun 27, 2017
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
6 changes: 3 additions & 3 deletions src/clients/feedbackclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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) {
Expand All @@ -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");
Expand Down
10 changes: 5 additions & 5 deletions src/clients/witclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class WitClient extends BaseClient {
public async CreateNewWorkItem(taskTitle: string): Promise<void> {
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);

Expand All @@ -59,13 +59,13 @@ export class WitClient extends BaseClient {
public async ShowMyWorkItemQueries(): Promise<void> {
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) {
Expand Down Expand Up @@ -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 {
Expand All @@ -124,7 +124,7 @@ export class WitClient extends BaseClient {

private async showWorkItems(wiql: string): Promise<void> {
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) {
Expand Down