Fixes microsoft#24426: editor.occurrencesHighlight should be honoured by SelectionHighlighter

alexdima · alexdima · commit 95336995567e · 2017-04-12T18:27:24.000+02:00
diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/common/findController.ts
@@ -876,13 +876,16 @@ export class SelectionHighlighter extends Disposable implements editorCommon.IEd
 	}
 
 	private _update(): void {
-		let model = this.editor.getModel();
+		const model = this.editor.getModel();
 		if (!model) {
 			return;
 		}
 
+		const config = this.editor.getConfiguration();
+
 		this.lastWordUnderCursor = null;
-		if (!this.editor.getConfiguration().contribInfo.selectionHighlight) {
+		if (!config.contribInfo.selectionHighlight) {
+			this.removeDecorations();
 			return;
 		}
 
@@ -905,6 +908,11 @@ export class SelectionHighlighter extends Disposable implements editorCommon.IEd
 				return;
 			}
 
+			if (!config.contribInfo.occurrencesHighlight) {
+				this.removeDecorations();
+				return;
+			}
+
 			this.lastWordUnderCursor = r.currentMatch;
 		}
 		if (/^[ \t]+$/.test(r.searchText)) {

Original file line number	Diff line number	Diff line change
`@@ -876,13 +876,16 @@ export class SelectionHighlighter extends Disposable implements editorCommon.IEd`
`876`	`876`	`}`
`877`	`877`
`878`	`878`	`private _update(): void {`
`879`		`- let model = this.editor.getModel();`
	`879`	`+ const model = this.editor.getModel();`
`880`	`880`	`if (!model) {`
`881`	`881`	`return;`
`882`	`882`	`}`
`883`	`883`
	`884`	`+ const config = this.editor.getConfiguration();`
	`885`	`+`
`884`	`886`	`this.lastWordUnderCursor = null;`
`885`		`- if (!this.editor.getConfiguration().contribInfo.selectionHighlight) {`
	`887`	`+ if (!config.contribInfo.selectionHighlight) {`
	`888`	`+ this.removeDecorations();`
`886`	`889`	`return;`
`887`	`890`	`}`
`888`	`891`
`@@ -905,6 +908,11 @@ export class SelectionHighlighter extends Disposable implements editorCommon.IEd`
`905`	`908`	`return;`
`906`	`909`	`}`
`907`	`910`
	`911`	`+ if (!config.contribInfo.occurrencesHighlight) {`
	`912`	`+ this.removeDecorations();`
	`913`	`+ return;`
	`914`	`+ }`
	`915`	`+`
`908`	`916`	`this.lastWordUnderCursor = r.currentMatch;`
`909`	`917`	`}`
`910`	`918`	`if (/^[ \t]+$/.test(r.searchText)) {`