fix: support multiple marks with same instrument/subscription id

Author: BFergerson

marker/src/main/kotlin/spp/jetbrains/marker/SourceMarker.kt

@@ -189,14 +189,14 @@ class SourceMarker(private val project: Project) {
         return getSourceMarks().filterIsInstance<GuideMark>()
     }
 
-    fun findByInstrumentId(instrumentId: String): SourceMark? {
-        return getSourceMarks().firstOrNull {
+    fun findByInstrumentId(instrumentId: String): List<SourceMark> {
+        return getSourceMarks().filter {
             it.getUserData(SourceMarkerKeys.INSTRUMENT_ID) == instrumentId
         }
     }
 
-    fun findBySubscriptionId(subscriptionId: String): SourceMark? {
-        return getSourceMarks().firstOrNull {
+    fun findBySubscriptionId(subscriptionId: String): List<SourceMark> {
+        return getSourceMarks().filter {
             it.getUserData(SourceMarkerKeys.VIEW_SUBSCRIPTION_ID) == subscriptionId
         }
     }

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/instrument/LiveInstrumentEventListener.kt

@@ -186,44 +186,40 @@ class LiveInstrumentEventListener(
             activeInstruments.remove(event.instrument)
             InstrumentEventWindowService.getInstance(project).addInstrumentEvent(event)
 
-            val inlayMark = SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!)
-            if (inlayMark != null) {
-                if (inlayMark is GutterMark) {
+            SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!).forEach {
+                if (it is GutterMark) {
                     if (event.instrument.meta["created_by"] != UserData.selfInfo(project)?.developer?.id) {
                         //just remove foreign instrument icons
-                        inlayMark.dispose()
+                        it.dispose()
                     } else if (event.instrument !is LiveBreakpoint) {
                         //just remove non-breakpoint icons
-                        inlayMark.dispose()
+                        it.dispose()
                     } else {
                         if (event.cause == null) {
-                            inlayMark.configuration.icon = PluginIcons.Breakpoint.complete
+                            it.configuration.icon = PluginIcons.Breakpoint.complete
                         } else {
-                            inlayMark.configuration.icon = PluginIcons.Breakpoint.error
+                            it.configuration.icon = PluginIcons.Breakpoint.error
                         }
-                        inlayMark.sourceFileMarker.refresh()
+                        it.sourceFileMarker.refresh()
                     }
                 }
 
-                val eventListeners = inlayMark.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)
-                if (eventListeners?.isNotEmpty() == true) {
-                    eventListeners.forEach { it.onInstrumentRemovedEvent(event) }
-                }
+                it.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)
+                    ?.forEach { it.onInstrumentRemovedEvent(event) }
             }
         }
     }
 
-    override fun onInstrumentHitEvent(event: LiveInstrumentHit) {
-        ApplicationManager.getApplication().invokeLater {
-            InstrumentEventWindowService.getInstance(project).addInstrumentEvent(event)
+    override fun onInstrumentHitEvent(event: LiveInstrumentHit) = ApplicationManager.getApplication().invokeLater {
+        InstrumentEventWindowService.getInstance(project).addInstrumentEvent(event)
 
-            if (event is LiveBreakpointHit) {
-                SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!)
-                    ?.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)
-                    ?.forEach { it.onBreakpointHitEvent(event) }
-            } else if (event is LiveLogHit) {
-                SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!)
-                    ?.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)?.forEach { it.onLogHitEvent(event) }
+        if (event is LiveBreakpointHit) {
+            SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!).forEach {
+                it.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)?.forEach { it.onBreakpointHitEvent(event) }
+            }
+        } else if (event is LiveLogHit) {
+            SourceMarker.getInstance(project).findByInstrumentId(event.instrument.id!!).forEach {
+                it.getUserData(SourceMarkerKeys.INSTRUMENT_EVENT_LISTENERS)?.forEach { it.onLogHitEvent(event) }
             }
         }
     }

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/LiveViewEventListener.kt

@@ -51,8 +51,9 @@ class LiveViewEventListener(
             if (log.isTraceEnabled) log.trace("Received live event: $event")
 
             //todo: remove in favor of sending events to individual subscribers
-            SourceMarker.getInstance(project).findBySubscriptionId(event.subscriptionId)
-                ?.getUserData(SourceMarkerKeys.VIEW_EVENT_LISTENERS)?.forEach { it.accept(event) }
+            SourceMarker.getInstance(project).findBySubscriptionId(event.subscriptionId).forEach {
+                it.getUserData(SourceMarkerKeys.VIEW_EVENT_LISTENERS)?.forEach { it.accept(event) }
+            }
 
             vertx.eventBus().publish(toLiveViewSubscription(event.subscriptionId), it.body())
         }