Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions

View File

@@ -33,7 +33,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
import { IProgressService, IProgressOptions, ProgressLocation } from 'vs/platform/progress/common/progress';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IHostService } from 'vs/workbench/services/host/browser/host';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IDialogService, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
@@ -129,9 +129,6 @@ interface TaskCustomizationTelemetryEvent {
class TaskMap {
private _store: Map<string, Task[]> = new Map();
constructor() {
}
public forEach(callback: (value: Task[], folder: string) => void): void {
this._store.forEach(callback);
}
@@ -218,7 +215,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
@IStorageService private readonly storageService: IStorageService,
@IProgressService private readonly progressService: IProgressService,
@IOpenerService private readonly openerService: IOpenerService,
@IWindowService private readonly _windowService: IWindowService,
@IHostService private readonly _hostService: IHostService,
@IDialogService private readonly dialogService: IDialogService,
@INotificationService private readonly notificationService: INotificationService,
@IContextKeyService contextKeyService: IContextKeyService,
@@ -252,7 +249,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
),
[{
label: nls.localize('reloadWindow', "Reload Window"),
run: () => this._windowService.reloadWindow()
run: () => this._hostService.reload()
}],
{ sticky: true }
);