mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-13 03:28:33 -05:00
Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 * fix config changes * fix strictnull checks
This commit is contained in:
@@ -23,12 +23,11 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
|
||||
import { EventHelper } from 'vs/base/browser/dom';
|
||||
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
|
||||
|
||||
export class ProgressService extends Disposable implements IProgressService {
|
||||
|
||||
_serviceBrand!: ServiceIdentifier<IProgressService>;
|
||||
_serviceBrand: undefined;
|
||||
|
||||
private readonly stack: [IProgressOptions, Progress<IProgressStep>][] = [];
|
||||
private readonly globalStatusEntry = this._register(new MutableDisposable());
|
||||
@@ -205,10 +204,6 @@ export class ProgressService extends Disposable implements IProgressService {
|
||||
updateProgress(handle, increment);
|
||||
|
||||
Event.once(handle.onDidClose)(() => {
|
||||
if (typeof onDidCancel === 'function') {
|
||||
onDidCancel();
|
||||
}
|
||||
|
||||
toDispose.dispose();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user