themes - avoid extra listener from search viewlet

Benjamin Pasero · Benjamin Pasero · commit 1f832b6820db · 2017-03-15T12:39:48.000+01:00
diff --git a/src/vs/workbench/common/component.ts b/src/vs/workbench/common/component.ts
@@ -59,10 +59,10 @@ export class WorkbenchComponent extends Disposable implements IWorkbenchComponen
 	protected onThemeChange(theme: ITheme, collector: ICssStyleCollector): void {
 		this.theme = theme;
 
-		this.updateStyles(collector);
+		this.updateStyles(theme, collector);
 	}
 
-	protected updateStyles(collector: ICssStyleCollector): void {
+	protected updateStyles(theme: ITheme, collector: ICssStyleCollector): void {
 		// Subclasses to override
 	}
 
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -59,7 +59,7 @@ import { OpenFolderAction, OpenFileFolderAction } from 'vs/workbench/browser/act
 import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { IThemeService, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
+import { editorFindMatchHighlight } from 'vs/platform/theme/common/colorRegistry';
 
 export class SearchViewlet extends Viewlet {
 
@@ -131,8 +131,6 @@ export class SearchViewlet extends Viewlet {
 		this.toUnbind.push(this.untitledEditorService.onDidChangeDirty(e => this.onUntitledDidChangeDirty(e)));
 		this.toUnbind.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationUpdated(e.config)));
 
-		this.toUnbind.push(this.themeService.onThemeChange(this.applyTheme.bind(this)));
-
 		this.selectCurrentMatchEmitter = new Emitter<string>();
 		debounceEvent(this.selectCurrentMatchEmitter.event, (l, e) => e, 100, /*leading=*/true)
 			(() => this.selectCurrentMatch());
@@ -144,8 +142,8 @@ export class SearchViewlet extends Viewlet {
 		this.updateGlobalPatternExclusions(configuration);
 	}
 
-	private applyTheme(theme: ITheme, collector: ICssStyleCollector) {
-		let matchHighlightColor = theme.getColor(colorRegistry.editorFindMatchHighlight);
+	protected updateStyles(theme: ITheme, collector: ICssStyleCollector) {
+		let matchHighlightColor = theme.getColor(editorFindMatchHighlight);
 		if (matchHighlightColor) {
 			collector.addRule(`.search-viewlet .findInFileMatch { background-color: ${matchHighlightColor}; }`);
 			collector.addRule(`.search-viewlet .highlight { background-color: ${matchHighlightColor}; }`);

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,10 @@ export class WorkbenchComponent extends Disposable implements IWorkbenchComponen`
`59`	`59`	`protected onThemeChange(theme: ITheme, collector: ICssStyleCollector): void {`
`60`	`60`	`this.theme = theme;`
`61`	`61`
`62`		`- this.updateStyles(collector);`
	`62`	`+ this.updateStyles(theme, collector);`
`63`	`63`	`}`
`64`	`64`
`65`		`- protected updateStyles(collector: ICssStyleCollector): void {`
	`65`	`+ protected updateStyles(theme: ITheme, collector: ICssStyleCollector): void {`
`66`	`66`	`// Subclasses to override`
`67`	`67`	`}`
`68`	`68`