Simplify switch event for remote explorer

alexr00 · alexr00 · commit 7a242cfc3eb7 · 2019-11-12T15:28:14.000+01:00
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -23,7 +23,7 @@ import { DefaultPanelDndController } from 'vs/base/browser/ui/splitview/panelvie
 import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
 import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
-import { Event, Emitter } from 'vs/base/common/event';
+import { Event } from 'vs/base/common/event';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { localize } from 'vs/nls';
@@ -330,10 +330,9 @@ export abstract class FilterViewContainerViewlet extends ViewContainerViewlet {
 	private allViews: Map<string, Map<string, IViewDescriptor>> = new Map();
 	private filterValue: string | undefined;
 
-	protected onDidChangeFilterValue: Emitter<string> = new Emitter();
-
 	constructor(
 		viewletId: string,
+		onDidChangeFilterValue: Event<string>,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -345,7 +344,7 @@ export abstract class FilterViewContainerViewlet extends ViewContainerViewlet {
 		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
 		super(viewletId, `${viewletId}.state`, false, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
-		this._register(this.onDidChangeFilterValue.event(newFilterValue => {
+		this._register(onDidChangeFilterValue(newFilterValue => {
 			this.filterValue = newFilterValue;
 			this.onFilterChanged(newFilterValue);
 		}));
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -381,9 +381,9 @@ export class RemoteViewlet extends FilterViewContainerViewlet implements IViewMo
 		@IThemeService themeService: IThemeService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IExtensionService extensionService: IExtensionService,
-		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService
+		@IRemoteExplorerService remoteExplorerService: IRemoteExplorerService
 	) {
-		super(VIEWLET_ID, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
+		super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService);
 		this.addConstantViewDescriptors([this.helpPanelDescriptor]);
 		remoteHelpExtPoint.setHandler((extensions) => {
 			let helpInformation: HelpInformation[] = [];
@@ -400,10 +400,6 @@ export class RemoteViewlet extends FilterViewContainerViewlet implements IViewMo
 				viewsRegistry.deregisterViews([this.helpPanelDescriptor], VIEW_CONTAINER);
 			}
 		});
-
-		this._register(this.remoteExplorerService.onDidChangeTargetType(() => {
-			this.onDidChangeFilterValue.fire(this.remoteExplorerService.targetType);
-		}));
 	}
 
 	protected getFilterOn(viewDescriptor: IViewDescriptor): string | undefined {
diff --git a/src/vs/workbench/services/remote/common/remoteExplorerService.ts b/src/vs/workbench/services/remote/common/remoteExplorerService.ts
@@ -23,9 +23,8 @@ class RemoteExplorerService implements IRemoteExplorerService {
 
 	set targetType(name: string) {
 		if (this._targetType !== name) {
-			const oldTarget = this._targetType;
 			this._targetType = name;
-			this._onDidChangeTargetType.fire(oldTarget);
+			this._onDidChangeTargetType.fire(this._targetType);
 		}
 	}
 	get targetType(): string {

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,8 @@ class RemoteExplorerService implements IRemoteExplorerService {`
`23`	`23`
`24`	`24`	`set targetType(name: string) {`
`25`	`25`	`if (this._targetType !== name) {`
`26`		`- const oldTarget = this._targetType;`
`27`	`26`	`this._targetType = name;`
`28`		`- this._onDidChangeTargetType.fire(oldTarget);`
	`27`	`+ this._onDidChangeTargetType.fire(this._targetType);`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`	`get targetType(): string {`