fix: decoration management fixes (#52)

Author: aminya

lib/minimap-cursorline-binding.js

@@ -6,11 +6,10 @@ export default class MinimapCursorLineBinding {
 	constructor (minimap) {
 		this.minimap = minimap
 		this.subscriptions = new CompositeDisposable()
-		this.editor = this.minimap.getTextEditor()
-		this.decorationsByMarkerId = {}
-		this.decorationSubscriptionsByMarkerId = {}
+		this.decorationsByMarkerId = new Map()
+		this.decorationSubscriptionsByMarkerId = new Map()
 
-		this.subscriptions.add(this.editor.observeCursors((cursor) => {
+		this.subscriptions.add(this.minimap.getTextEditor().observeCursors((cursor) => {
 			this.handleMarker(cursor.getMarker())
 		}))
 	}
@@ -20,24 +19,31 @@ export default class MinimapCursorLineBinding {
 		const decoration = this.minimap.decorateMarker(
 			marker, { type: 'line', class: 'cursor-line' },
 		)
-		this.decorationsByMarkerId[id] = decoration
-		this.decorationSubscriptionsByMarkerId[id] = decoration.onDidDestroy(() => {
-			this.decorationSubscriptionsByMarkerId[id].dispose()
-
-			delete this.decorationsByMarkerId[id]
-			delete this.decorationSubscriptionsByMarkerId[id]
-		})
+		this.decorationsByMarkerId.set(id, decoration)
+
+		this.decorationSubscriptionsByMarkerId.set(id,
+			decoration.onDidDestroy(() => {
+				const cachedDecoration = this.decorationSubscriptionsByMarkerId.get(id)
+				if (cachedDecoration) {
+					cachedDecoration.dispose()
+				}
+
+				this.decorationsByMarkerId.delete(id)
+				this.decorationSubscriptionsByMarkerId.delete(id)
+			}),
+		)
 	}
 
 	destroy () {
-		for (const id in this.decorationsByMarkerId) {
-			const decoration = this.decorationsByMarkerId[id]
-			this.decorationSubscriptionsByMarkerId[id].dispose()
+		for (const [id, decoration] of this.decorationsByMarkerId) {
+			const decorationSub = this.decorationSubscriptionsByMarkerId.get(id)
+			if (decorationSub) {
+				decorationSub.dispose()
+			}
 			decoration.destroy()
-
-			delete this.decorationsByMarkerId[id]
-			delete this.decorationSubscriptionsByMarkerId[id]
 		}
+		this.decorationsByMarkerId.clear()
+		this.decorationSubscriptionsByMarkerId.clear()
 
 		this.subscriptions.dispose()
 	}

lib/minimap-cursorline.js

@@ -10,7 +10,7 @@ export default {
 
 	isActive () { return this.active },
 
-	bindings: {},
+	bindings: new Map(),
 
 	activate () {
 		require('atom-package-deps').install('minimap-cursorline')
@@ -40,13 +40,13 @@ export default {
 
 			const id = minimap.id
 			const binding = new MinimapCursorLineBinding(minimap)
-			this.bindings[id] = binding
+			this.bindings.set(id, binding)
 
 			const subscription = minimap.onDidDestroy(() => {
 				binding.destroy()
 				this.subscriptions.remove(subscription)
 				subscription.dispose()
-				delete this.bindings[id]
+				this.bindings.delete(id)
 			})
 
 			this.subscriptions.add(subscription)
@@ -56,8 +56,8 @@ export default {
 	deactivatePlugin () {
 		if (!this.active) { return }
 
-		for (const id in this.bindings) { this.bindings[id].destroy() }
-		this.bindings = {}
+		for (const binding of this.bindings.values()) { binding.destroy() }
+		this.bindings.clear()
 		this.active = false
 		this.minimapsSubscription.dispose()
 		this.subscriptions.dispose()