v0.4.4

gradle.properties

@@ -4,14 +4,14 @@ kotlin.code.style=official
 
 pluginGroup = spp.jetbrains
 pluginName = Source++
-projectVersion=0.4.3
+projectVersion=0.4.4
 pluginSinceBuild = 202.4357
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
-pluginVerifierIdeVersions = 2020.3.2, 2021.3.2
+pluginVerifierIdeVersions = 2020.3.2, 2021.3.3
 
 platformType = IC
-ideVersion = 2021.3.2
+ideVersion = 2021.3.3
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

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

@@ -51,7 +51,7 @@ object SourceMarker {
     private val availableSourceFileMarkers = Maps.newConcurrentMap<Int, SourceFileMarker>()
     private val globalSourceMarkEventListeners = Lists.newArrayList<SourceMarkEventListener>()
 
-    fun clearAvailableSourceFileMarkers() {
+    suspend fun clearAvailableSourceFileMarkers() {
         check(enabled) { "SourceMarker disabled" }
 
         availableSourceFileMarkers.forEach {
@@ -60,23 +60,7 @@ object SourceMarker {
         availableSourceFileMarkers.clear()
     }
 
-    fun refreshAvailableSourceFileMarkers(recreateFileMarkers: Boolean) {
-        check(enabled) { "SourceMarker disabled" }
-
-        if (recreateFileMarkers) {
-            val previousFileMarkers = getAvailableSourceFileMarkers()
-            clearAvailableSourceFileMarkers()
-            previousFileMarkers.forEach {
-                getSourceFileMarker(it.psiFile)!!.refresh()
-            }
-        } else {
-            availableSourceFileMarkers.forEach {
-                it.value.refresh()
-            }
-        }
-    }
-
-    fun deactivateSourceFileMarker(sourceFileMarker: SourceFileMarker): Boolean {
+    suspend fun deactivateSourceFileMarker(sourceFileMarker: SourceFileMarker): Boolean {
         check(enabled) { "SourceMarker disabled" }
 
         if (availableSourceFileMarkers.remove(sourceFileMarker.hashCode()) != null) {

marker/src/main/kotlin/spp/jetbrains/marker/plugin/FileActivityListener.kt

@@ -31,6 +31,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
+import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.source.SourceFileMarker
@@ -61,7 +62,9 @@ class FileActivityListener : FileEditorManagerListener {
             val psiFile = PsiManager.getInstance(source.project).findFile(file)
             val fileMarker = psiFile?.getUserData(SourceFileMarker.KEY)
             if (fileMarker != null) {
-                SourceMarker.deactivateSourceFileMarker(fileMarker)
+                runBlocking {
+                    SourceMarker.deactivateSourceFileMarker(fileMarker)
+                }
             }
         }
     }

marker/src/main/kotlin/spp/jetbrains/marker/plugin/SourceInlayHintProvider.kt

@@ -29,6 +29,7 @@ import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.editor.markup.EffectType
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.util.Disposer
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.ui.paint.EffectPainter
@@ -37,6 +38,7 @@ import org.slf4j.LoggerFactory
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.SourceMarker.getSourceFileMarker
 import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventCode.MARK_REMOVED
+import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventListener
 import spp.jetbrains.marker.source.mark.api.key.SourceKey
 import spp.jetbrains.marker.source.mark.inlay.InlayMark
 import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
@@ -60,37 +62,32 @@ abstract class SourceInlayHintProvider : InlayHintsProvider<NoSettings> {
     companion object {
         private val log = LoggerFactory.getLogger(SourceInlayHintProvider::class.java)
 
-        @Volatile
-        @JvmField
-        var latestInlayMarkAddedAt: Long = -1L
-
-        init {
-            SourceMarker.addGlobalSourceMarkEventListener { event ->
-                when (event.eventCode) {
-                    VIRTUAL_TEXT_UPDATED, INLAY_MARK_VISIBLE, INLAY_MARK_HIDDEN -> {
-                        ApplicationManager.getApplication().invokeLater {
-                            FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
-                                //todo: smaller range
-                                ?.getInlineElementsInRange(0, Integer.MAX_VALUE)?.forEach {
-                                    it.repaint()
-                                }
-                            FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
-                                //todo: smaller range
-                                ?.getAfterLineEndElementsInRange(0, Integer.MAX_VALUE)?.forEach {
-                                    it.repaint()
-                                }
-                            FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
-                                //todo: smaller range
-                                ?.getBlockElementsInRange(0, Integer.MAX_VALUE)?.forEach {
-                                    it.repaint()
-                                }
-                        }
+        val EVENT_LISTENER = SourceMarkEventListener { event ->
+            when (event.eventCode) {
+                VIRTUAL_TEXT_UPDATED, INLAY_MARK_VISIBLE, INLAY_MARK_HIDDEN -> {
+                    ApplicationManager.getApplication().invokeLater {
+                        FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
+                            //todo: smaller range
+                            ?.getInlineElementsInRange(0, Integer.MAX_VALUE)?.forEach {
+                                it.repaint()
+                            }
+                        FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
+                            //todo: smaller range
+                            ?.getAfterLineEndElementsInRange(0, Integer.MAX_VALUE)?.forEach {
+                                it.repaint()
+                            }
+                        FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
+                            //todo: smaller range
+                            ?.getBlockElementsInRange(0, Integer.MAX_VALUE)?.forEach {
+                                it.repaint()
+                            }
                     }
-                    MARK_REMOVED -> {
-                        ApplicationManager.getApplication().invokeLater {
-                            FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
-                                //todo: smaller range
-                                ?.getBlockElementsInRange(0, Integer.MAX_VALUE)?.forEach {
+                }
+                MARK_REMOVED -> {
+                    ApplicationManager.getApplication().invokeLater {
+                        FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
+                            //todo: smaller range
+                            ?.getBlockElementsInRange(0, Integer.MAX_VALUE)?.forEach {
                                 if (it.renderer is BlockInlayRenderer) {
                                     val cachedPresentation = Reflect.on(it.renderer).field("cachedPresentation").get<Any>()
                                     if (cachedPresentation is RecursivelyUpdatingRootPresentation) {
@@ -99,18 +96,21 @@ abstract class SourceInlayHintProvider : InlayHintsProvider<NoSettings> {
                                             if (delegatePresentation.presentation is DynamicTextInlayPresentation) {
                                                 val dynamicPresentation = delegatePresentation.presentation as DynamicTextInlayPresentation
                                                 if (dynamicPresentation.inlayMark == event.sourceMark) {
-                                                    it.dispose()
+                                                    Disposer.dispose(it)
                                                 }
                                             }
                                         }
                                     }
                                 }
                             }
-                        }
                     }
                 }
             }
         }
+
+        @Volatile
+        @JvmField
+        var latestInlayMarkAddedAt: Long = -1L
     }
 
     override val key: SettingsKey<NoSettings> = SettingsKey("SourceMarker/InlayHints")
@@ -201,13 +201,13 @@ abstract class SourceInlayHintProvider : InlayHintsProvider<NoSettings> {
                 if (virtualText.icon != null) {
                     virtualText.icon!!.paintIcon(null, g, virtualText.iconLocation.x, virtualText.iconLocation.y)
                 }
-                g.font = font
+                g.font = virtualText.font ?: font
                 g.setRenderingHint(
                     RenderingHints.KEY_TEXT_ANTIALIASING,
                     AntialiasingType.getKeyForCurrentScope(false)
                 )
                 g.color = foreground
-                g.drawString(virtualText.getRenderedVirtualText(), 0, ascent)
+                g.drawString(virtualText.getRenderedVirtualText(), virtualText.xOffset, ascent)
                 val effectColor = virtualText.textAttributes.effectColor
                 if (effectColor != null) {
                     g.color = effectColor

marker/src/main/kotlin/spp/jetbrains/marker/source/SourceFileMarker.kt

@@ -26,6 +26,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiNameIdentifierOwner
+import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 import spp.jetbrains.marker.source.mark.api.*
 import spp.jetbrains.marker.source.mark.api.event.SourceMarkEvent
@@ -83,9 +84,11 @@ open class SourceFileMarker(val psiFile: PsiFile) : SourceMarkProvider {
         }
     }
 
-    open fun clearSourceMarks() {
+    open suspend fun clearSourceMarks() {
         val removed = sourceMarks.removeIf {
-            it.dispose(false)
+            runBlocking {
+                it.disposeSuspend(false)
+            }
             true
         }
         if (removed) refresh()

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ClassSourceMark.kt

@@ -84,13 +84,13 @@ abstract class ClassSourceMark(
             false
         }
 
-    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean) {
+    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean, editor: Editor?) {
         this.sourceMarkComponent = sourceMarkComponent
-        super.apply(addToMarker)
+        super.apply(addToMarker, editor)
     }
 
-    override fun apply(addToMarker: Boolean) {
-        apply(configuration.componentProvider.getComponent(this), addToMarker)
+    override fun apply(addToMarker: Boolean, editor: Editor?) {
+        apply(configuration.componentProvider.getComponent(this), addToMarker, editor)
     }
 
     override fun dispose(removeFromMarker: Boolean, assertRemoval: Boolean) {
@@ -99,6 +99,12 @@ abstract class ClassSourceMark(
         super.dispose(removeFromMarker, assertRemoval)
     }
 
+    override suspend fun disposeSuspend(removeFromMarker: Boolean, assertRemoval: Boolean) {
+        psiClass.nameIdentifier?.putUserData(SourceKey.GutterMark, null)
+        psiClass.nameIdentifier?.putUserData(SourceKey.InlayMark, null)
+        super.disposeSuspend(removeFromMarker, assertRemoval)
+    }
+
     private val userData = HashMap<Any, Any>()
     override fun <T> getUserData(key: SourceKey<T>): T? = userData[key] as T?
     override fun <T> putUserData(key: SourceKey<T>, value: T?) {

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/ExpressionSourceMark.kt

@@ -80,13 +80,13 @@ abstract class ExpressionSourceMark(
         }
 
     @Synchronized
-    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean) {
+    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean, editor: Editor?) {
         this.sourceMarkComponent = sourceMarkComponent
-        super.apply(addToMarker)
+        super.apply(addToMarker, editor)
     }
 
-    override fun apply(addToMarker: Boolean) {
-        apply(configuration.componentProvider.getComponent(this), addToMarker)
+    override fun apply(addToMarker: Boolean, editor: Editor?) {
+        apply(configuration.componentProvider.getComponent(this), addToMarker, editor)
     }
 
     override fun dispose(removeFromMarker: Boolean, assertRemoval: Boolean) {
@@ -98,6 +98,15 @@ abstract class ExpressionSourceMark(
         super.dispose(removeFromMarker, assertRemoval)
     }
 
+    override suspend fun disposeSuspend(removeFromMarker: Boolean, assertRemoval: Boolean) {
+        when (this) {
+            is GutterMark -> getPsiElement().putUserData(SourceKey.GutterMark, null)
+            is InlayMark -> getPsiElement().putUserData(SourceKey.InlayMark, null)
+            else -> throw IllegalStateException("ExpressionSourceMark is not a GutterMark or InlayMark")
+        }
+        super.disposeSuspend(removeFromMarker, assertRemoval)
+    }
+
     fun getParentSourceMark(): SourceMark? {
         return SourceMarker.getSourceMark(
             artifactQualifiedName.copy(

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/MethodSourceMark.kt

@@ -85,13 +85,13 @@ abstract class MethodSourceMark(
         }
 
     @Synchronized
-    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean) {
+    override fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean, editor: Editor?) {
         this.sourceMarkComponent = sourceMarkComponent
-        super.apply(addToMarker)
+        super.apply(addToMarker, editor)
     }
 
-    override fun apply(addToMarker: Boolean) {
-        apply(configuration.componentProvider.getComponent(this), addToMarker)
+    override fun apply(addToMarker: Boolean, editor: Editor?) {
+        apply(configuration.componentProvider.getComponent(this), addToMarker, editor)
     }
 
     override fun dispose(removeFromMarker: Boolean, assertRemoval: Boolean) {
@@ -100,6 +100,12 @@ abstract class MethodSourceMark(
         super.dispose(removeFromMarker, assertRemoval)
     }
 
+    override suspend fun disposeSuspend(removeFromMarker: Boolean, assertRemoval: Boolean) {
+        psiMethod.nameIdentifier?.putUserData(SourceKey.GutterMark, null)
+        psiMethod.nameIdentifier?.putUserData(SourceKey.InlayMark, null)
+        super.disposeSuspend(removeFromMarker, assertRemoval)
+    }
+
     private val userData = HashMap<Any, Any>()
     override fun <T> getUserData(key: SourceKey<T>): T? = userData[key] as T?
     override fun <T> putUserData(key: SourceKey<T>, value: T?) {

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/SourceMark.kt

@@ -40,6 +40,7 @@ import com.intellij.ui.awt.RelativePoint
 import com.intellij.util.ui.JBUI
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.plugin.SourceInlayComponentProvider
@@ -119,8 +120,8 @@ interface SourceMark : JBPopupListener, MouseMotionListener, VisibleAreaListener
     fun setVisible(visible: Boolean)
 
     fun canApply(): Boolean = configuration.applySourceMarkFilter.test(this)
-    fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean = true)
-    fun apply(addToMarker: Boolean = true) {
+    fun apply(sourceMarkComponent: SourceMarkComponent, addToMarker: Boolean = true, editor: Editor? = null)
+    fun apply(addToMarker: Boolean = true, editor: Editor? = null) {
         SourceMarker.getGlobalSourceMarkEventListeners().forEach(::addEventListener)
 
         if (addToMarker) {
@@ -143,12 +144,12 @@ interface SourceMark : JBPopupListener, MouseMotionListener, VisibleAreaListener
                 }
             } else if (this is InlayMark) {
                 if (configuration.showComponentInlay) {
-                    val editor = FileEditorManager.getInstance(project).selectedTextEditor
-                    if (editor == null) {
+                    val selectedEditor = editor ?: FileEditorManager.getInstance(project).selectedTextEditor
+                    if (selectedEditor == null) {
                         TODO()
                     } else {
-                        val provider = SourceInlayComponentProvider.from(editor)
-                        val viewport = (editor as? EditorImpl)?.scrollPane?.viewport!!
+                        val provider = SourceInlayComponentProvider.from(selectedEditor)
+                        val viewport = (selectedEditor as? EditorImpl)?.scrollPane?.viewport!!
                         var displayLineIndex = lineNumber - 1
                         if (this is ExpressionInlayMark) {
                             if (showAboveExpression) {
@@ -232,6 +233,24 @@ interface SourceMark : JBPopupListener, MouseMotionListener, VisibleAreaListener
         }
     }
 
+    suspend fun disposeSuspend(removeFromMarker: Boolean = true, assertRemoval: Boolean = true) {
+        if (this is InlayMark) {
+            configuration.inlayRef?.get()?.dispose()
+            configuration.inlayRef = null
+        }
+        closePopup()
+
+        if (removeFromMarker) {
+            if (assertRemoval) {
+                check(sourceFileMarker.removeSourceMark(this, autoRefresh = true, autoDispose = false))
+            } else {
+                sourceFileMarker.removeSourceMark(this, autoRefresh = true, autoDispose = false)
+            }
+        }
+        triggerEventSuspend(SourceMarkEvent(this, SourceMarkEventCode.MARK_REMOVED))
+        clearEventListeners()
+    }
+
     fun <T> getUserData(key: SourceKey<T>): T?
     fun <T> putUserData(key: SourceKey<T>, value: T?)
     fun hasUserData(): Boolean
@@ -261,6 +280,22 @@ interface SourceMark : JBPopupListener, MouseMotionListener, VisibleAreaListener
         }
     }
 
+    suspend fun triggerEventSuspend(event: SourceMarkEvent) {
+        //sync listeners
+        getEventListeners()
+            .filterIsInstance<SynchronousSourceMarkEventListener>()
+            .forEach { it.handleEvent(event) }
+
+        //async listeners
+        runBlocking {
+            getEventListeners().forEach {
+                if (it !is SynchronousSourceMarkEventListener) {
+                    it.handleEvent(event)
+                }
+            }
+        }
+    }
+
     fun closePopup() {
         if (openedMarks.remove(this)) {
             log.trace("Closing popup")