fix: use Map instead of object for marker subscriptions

Author: aminya

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

@@ -9,8 +9,8 @@ class MinimapFindAndReplaceBinding {
 		this.fnrVisible = fnrVisible
 		this.editor = this.minimap.getTextEditor()
 		this.subscriptions = new CompositeDisposable()
-		this.decorationsByMarkerId = {}
-		this.subscriptionsByMarkerId = {}
+		this.decorationsByMarkerId = new Map()
+		this.subscriptionsByMarkerId = new Map()
 
 		this.layer = this.fnrAPI.resultsMarkerLayerForTextEditor(this.editor)
 
@@ -23,22 +23,22 @@ class MinimapFindAndReplaceBinding {
 		this.discoverMarkers()
 	}
 
-	destroy () {
-		const subscriptionsByMarkerIdKeys = Object.keys(this.subscriptionsByMarkerId)
-		for (let i = 0, len = subscriptionsByMarkerIdKeys.length; i < len; i++) {
-			this.subscriptionsByMarkerId[subscriptionsByMarkerIdKeys[i]].dispose()
+	disposeMarkerSubsctiotions () {
+		const markerSubscriptions = this.subscriptionsByMarkerId.values()
+		for (const markerSubscription of markerSubscriptions) {
+			markerSubscription.dispose()
 		}
-
-		const decorationsByMarkerIdKeys = Object.keys(this.decorationsByMarkerId)
-		for (let i = 0, len = decorationsByMarkerIdKeys.length; i < len; i++) {
-			this.decorationsByMarkerId[decorationsByMarkerIdKeys[i]].destroy()
+		const decorationSubscriotions = this.decorationsByMarkerId.values()
+		for (const decorationSubscriotion of decorationSubscriotions) {
+			decorationSubscriotion.destroy()
 		}
+	}
 
+	destroy () {
 		this.subscriptions.dispose()
+		this.clear()
 		this.minimap = null
 		this.editor = null
-		this.decorationsByMarkerId = {}
-		this.subscriptionsByMarkerId = {}
 	}
 
 	changeVisible (visible) {
@@ -51,19 +51,9 @@ class MinimapFindAndReplaceBinding {
 	}
 
 	clear () {
-		const subscriptionsByMarkerIdKeys = Object.keys(this.subscriptionsByMarkerId)
-		for (let i = 0, len = subscriptionsByMarkerIdKeys.length; i < len; i++) {
-			const id = subscriptionsByMarkerIdKeys[i]
-			this.subscriptionsByMarkerId[id].dispose()
-			delete this.subscriptionsByMarkerId[id]
-		}
-
-		const decorationsByMarkerIdKeys = Object.keys(this.decorationsByMarkerId)
-		for (let i = 0, len = decorationsByMarkerIdKeys.length; i < len; i++) {
-			const id = decorationsByMarkerIdKeys[i]
-			this.decorationsByMarkerId[id].destroy()
-			delete this.decorationsByMarkerId[id]
-		}
+		this.disposeMarkerSubsctiotions()
+		this.decorationsByMarkerId.clear()
+		this.subscriptionsByMarkerId.clear()
 	}
 
 	discoverMarkers () {
@@ -93,15 +83,14 @@ class MinimapFindAndReplaceBinding {
 			return
 		}
 
-		const {
-			id,
-		} = marker
-		this.decorationsByMarkerId[id] = decoration
-		this.subscriptionsByMarkerId[id] = decoration.onDidDestroy(() => {
-			this.subscriptionsByMarkerId[id].dispose()
-			delete this.decorationsByMarkerId[id]
-			delete this.subscriptionsByMarkerId[id]
-		})
+		const { id } = marker
+		this.decorationsByMarkerId.set(id, decoration)
+		this.subscriptionsByMarkerId.set(id,
+			decoration.onDidDestroy(() => {
+				this.subscriptionsByMarkerId.get(id).dispose()
+				this.subscriptionsByMarkerId.delete(id)
+			}),
+		)
 	}
 
 	findViewIsVisible () {