diff options
| author | Sandeep Somavarapu <sasomava@microsoft.com> | 2022-11-11 11:21:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 11:21:42 +0300 |
| commit | 07530c3190d62221d53abe35df97a70b0b3c26e8 (patch) | |
| tree | d7d63eec00547fe4404c3c02fb6e4923bee30379 | |
| parent | ca15dea96bfef29f7ebbd2511c2d57550bd86e1b (diff) | |
| parent | 4084786487bcbdac4bd7280691072c037e35fd0e (diff) | |
Merge pull request #166029 from microsoft/alexr00/fixOtherViews
Fix edit sessions and settings sync views
| -rw-r--r-- | src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts | 7 | ||||
| -rw-r--r-- | src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts | 26 |
2 files changed, 8 insertions, 25 deletions
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts index 92e368b719a..fbe5bed691c 100644 --- a/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts +++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsViews.ts @@ -38,12 +38,7 @@ export class EditSessionsDataViews extends Disposable { const treeView = this.instantiationService.createInstance(TreeView, viewId, name); treeView.showCollapseAllAction = true; treeView.showRefreshAction = true; - const disposable = treeView.onDidChangeVisibility(visible => { - if (visible && !treeView.dataProvider) { - disposable.dispose(); - treeView.dataProvider = this.instantiationService.createInstance(EditSessionDataViewDataProvider); - } - }); + treeView.dataProvider = this.instantiationService.createInstance(EditSessionDataViewDataProvider); const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry); viewsRegistry.registerViews([<ITreeViewDescriptor>{ diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts index 5f85b242afc..a84c6a82e63 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts @@ -80,12 +80,8 @@ export class UserDataSyncDataViews extends Disposable { const dataProvider = this.instantiationService.createInstance(UserDataSyncMachinesViewDataProvider, treeView); treeView.showRefreshAction = true; treeView.canSelectMany = true; - const disposable = treeView.onDidChangeVisibility(visible => { - if (visible && !treeView.dataProvider) { - disposable.dispose(); - treeView.dataProvider = dataProvider; - } - }); + treeView.dataProvider = dataProvider; + this._register(Event.any(this.userDataSyncMachinesService.onDidChange, this.userDataSyncService.onDidResetRemote)(() => treeView.refresh())); const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry); viewsRegistry.registerViews([<ITreeViewDescriptor>{ @@ -147,13 +143,9 @@ export class UserDataSyncDataViews extends Disposable { const treeView = this.instantiationService.createInstance(TreeView, id, name); treeView.showCollapseAllAction = true; treeView.showRefreshAction = true; - const disposable = treeView.onDidChangeVisibility(visible => { - if (visible && !treeView.dataProvider) { - disposable.dispose(); - treeView.dataProvider = remote ? this.instantiationService.createInstance(RemoteUserDataSyncActivityViewDataProvider) - : this.instantiationService.createInstance(LocalUserDataSyncActivityViewDataProvider); - } - }); + treeView.dataProvider = remote ? this.instantiationService.createInstance(RemoteUserDataSyncActivityViewDataProvider) + : this.instantiationService.createInstance(LocalUserDataSyncActivityViewDataProvider); + this._register(Event.any(this.userDataSyncEnablementService.onDidChangeResourceEnablement, this.userDataSyncEnablementService.onDidChangeEnablement, this.userDataSyncService.onDidResetLocal, @@ -255,12 +247,8 @@ export class UserDataSyncDataViews extends Disposable { const treeView = this.instantiationService.createInstance(TreeView, id, name); const dataProvider = this.instantiationService.createInstance(UserDataSyncTroubleshootViewDataProvider); treeView.showRefreshAction = true; - const disposable = treeView.onDidChangeVisibility(visible => { - if (visible && !treeView.dataProvider) { - disposable.dispose(); - treeView.dataProvider = dataProvider; - } - }); + treeView.dataProvider = dataProvider; + const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry); viewsRegistry.registerViews([<ITreeViewDescriptor>{ id, |