development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

debt - make sure to still use scoped progress

Browse source
This commit is contained in:
Benjamin Pasero 2019-05-24 15:11:20 +02:00
parent 84fd2c37c6
commit b272d184d7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/browser/parts/compositePart.ts
View file

@ -18,7 +18,7 @@ import { IAction } from 'vs/base/common/actions';
import { Part, IPartOptions } from 'vs/workbench/browser/part';
import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';
import { IComposite } from 'vs/workbench/common/composite';
import { LocalProgressService } from 'vs/workbench/services/progress/browser/localProgressService';
import { ScopedProgressService } from 'vs/workbench/services/progress/browser/localProgressService';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@ -171,7 +171,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
// Instantiate composite from registry otherwise
const compositeDescriptor = this.registry.getComposite(id);
if (compositeDescriptor) {
const localProgressService = this.instantiationService.createInstance(LocalProgressService, this.progressBar, compositeDescriptor.id, isActive);
const localProgressService = this.instantiationService.createInstance(ScopedProgressService, this.progressBar, compositeDescriptor.id, isActive);
const compositeInstantiationService = this.instantiationService.createChild(new ServiceCollection([ILocalProgressService, localProgressService]));
const composite = compositeDescriptor.instantiate(compositeInstantiationService);