fix: only highlight when panel is visible (#37)

Author: UziTech

lib/minimap-find-and-replace-binding.js

@@ -3,17 +3,22 @@
 const { CompositeDisposable } = require('atom')
 
 class MinimapFindAndReplaceBinding {
-	constructor (minimap, fnrAPI) {
+	constructor (minimap, fnrAPI, fnrVisible) {
 		this.minimap = minimap
 		this.fnrAPI = fnrAPI
+		this.fnrVisible = fnrVisible
 		this.editor = this.minimap.getTextEditor()
 		this.subscriptions = new CompositeDisposable()
 		this.decorationsByMarkerId = {}
 		this.subscriptionsByMarkerId = {}
 
 		this.layer = this.fnrAPI.resultsMarkerLayerForTextEditor(this.editor)
 
-		this.subscriptions.add(this.layer.onDidUpdate(() => this.discoverMarkers()))
+		this.subscriptions.add(this.layer.onDidUpdate(() => {
+			if (this.fnrVisible) {
+				this.discoverMarkers()
+			}
+		}))
 
 		this.discoverMarkers()
 	}
@@ -34,6 +39,15 @@ class MinimapFindAndReplaceBinding {
 		this.subscriptionsByMarkerId = {}
 	}
 
+	changeVisible (visible) {
+		this.fnrVisible = visible
+		if (visible) {
+			this.discoverMarkers()
+		} else {
+			this.clear()
+		}
+	}
+
 	clear () {
 		let id
 		for (id in this.subscriptionsByMarkerId) {

lib/minimap-find-and-replace.js

@@ -10,6 +10,7 @@ module.exports = {
 
 	activate (state) {
 		this.active = false
+		this.fnrVisible = false
 		this.bindingsById = {}
 		this.subscriptionsById = {}
 		this.subscriptions = new CompositeDisposable()
@@ -48,7 +49,7 @@ module.exports = {
 				const {
 					id,
 				} = minimap
-				const binding = new MinimapFindAndReplaceBinding(minimap, fnr)
+				const binding = new MinimapFindAndReplaceBinding(minimap, fnr, this.fnrVisible)
 				this.bindingsById[id] = binding
 
 				this.subscriptionsById[id] = minimap.onDidDestroy(() => {
@@ -66,27 +67,31 @@ module.exports = {
 		})
 	},
 
-	setOnChangeVisibility (num = 1) {
+	setOnChangeVisibility (retry = 0) {
 		const [fnrPanel] = atom.workspace.getBottomPanels().filter(panel => panel.element.firstChild.classList.contains('find-and-replace'))
 
 		if (fnrPanel) {
-			fnrPanel.onDidChangeVisible(visible => {
-				if (visible) {
-					this.discoverMarkers()
-				} else {
-					this.clearBindings()
-				}
+			this.changeVisible(true)
+			fnrPanel.onDidChangeVisible((visible) => {
+				this.changeVisible(visible)
 			})
 		} else {
-			if (num < 10) {
-				setTimeout(() => this.setOnChangeVisibility(num + 1), 100)
+			if (retry < 10) {
+				setTimeout(() => this.setOnChangeVisibility(retry + 1), 100)
 			} else {
 				// eslint-disable-next-line no-console
 				console.error("Couldn't find find-and-replace")
 			}
 		}
 	},
 
+	changeVisible (visible) {
+		this.fnrVisible = visible
+		for (const id in this.bindingsById) {
+			this.bindingsById[id].changeVisible(visible)
+		}
+	},
+
 	deactivatePlugin () {
 		let id
 		if (!this.active) {
@@ -106,16 +111,4 @@ module.exports = {
 		this.bindingsById = {}
 		this.subscriptionsById = {}
 	},
-
-	discoverMarkers () {
-		for (const id in this.bindingsById) {
-			this.bindingsById[id].discoverMarkers()
-		}
-	},
-
-	clearBindings () {
-		for (const id in this.bindingsById) {
-			this.bindingsById[id].clear()
-		}
-	},
 }

spec/minimap-find-and-replace-spec.js

@@ -32,45 +32,50 @@ describe('MinimapFindAndReplace', () => {
 		describe('when find-and-replace is closed', () => {
 			beforeEach(() => {
 				atom.commands.dispatch(workspace, 'find-and-replace:show')
-				spyOn(MinimapFindAndReplace, 'clearBindings')
+				spyOn(MinimapFindAndReplace, 'changeVisible')
 			})
 
 			it('should clear on core:cancel', () => {
 				atom.commands.dispatch(workspace, 'core:cancel')
-				expect(MinimapFindAndReplace.clearBindings).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(false)
 			})
 
 			it('should clear on find-and-replace:toggle', () => {
 				atom.commands.dispatch(workspace, 'find-and-replace:toggle')
-				atom.commands.dispatch(workspace, 'find-and-replace:toggle')
-				expect(MinimapFindAndReplace.clearBindings).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(false)
 			})
 
 			it('should clear on close button pressed', () => {
 				document.querySelector('.find-and-replace .close-button').click()
-				expect(MinimapFindAndReplace.clearBindings).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(false)
 			})
 		})
 
 		describe('when find-and-replace is opened', () => {
 			beforeEach(() => {
 				atom.commands.dispatch(workspace, 'core:cancel')
-				spyOn(MinimapFindAndReplace, 'discoverMarkers')
+				spyOn(MinimapFindAndReplace, 'changeVisible')
 			})
 
 			it('should display markers on find-and-replace:show', () => {
 				atom.commands.dispatch(workspace, 'find-and-replace:show')
-				expect(MinimapFindAndReplace.discoverMarkers).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(true)
 			})
 
 			it('should display markers on find-and-replace:show-replace', () => {
 				atom.commands.dispatch(workspace, 'find-and-replace:show-replace')
-				expect(MinimapFindAndReplace.discoverMarkers).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(true)
 			})
 
 			it('should display markers on find-and-replace:toggle', () => {
 				atom.commands.dispatch(workspace, 'find-and-replace:toggle')
-				expect(MinimapFindAndReplace.discoverMarkers).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledTimes(1)
+				expect(MinimapFindAndReplace.changeVisible).toHaveBeenCalledWith(true)
 			})
 		})
 	})