build.gradle.kts

@@ -4,18 +4,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	kotlin("jvm") version "1.8.0"
-	id("org.jetbrains.intellij") version "1.17.0"
+	id("org.jetbrains.intellij") version "1.16.0"
 }
 
 group = "com.chylex.intellij.inspectionlens"
-version = "1.3.2"
+version = "1.3.1"
 
 repositories {
 	mavenCentral()
 }
 
 intellij {
-	version.set("2023.3.3")
+	version.set("233.11555.11-EAP-SNAPSHOT")
 	updateSinceUntilBuild.set(false)
 	
 	plugins.add("tanvd.grazi")

src/main/kotlin/com/chylex/intellij/inspectionlens/InspectionLensRefresher.kt

@@ -1,25 +0,0 @@
-package com.chylex.intellij.inspectionlens
-
-import com.intellij.openapi.application.ApplicationManager
-
-object InspectionLensRefresher {
-	private var needsRefresh = false
-	
-	fun scheduleRefresh() {
-		synchronized(this) {
-			if (!needsRefresh) {
-				needsRefresh = true
-				ApplicationManager.getApplication().invokeLater(::refresh)
-			}
-		}
-	}
-	
-	private fun refresh() {
-		synchronized(this) {
-			if (needsRefresh) {
-				needsRefresh = false
-				InspectionLens.refresh()
-			}
-		}
-	}
-}

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/EditorLensManager.kt

@@ -30,10 +30,6 @@ class EditorLensManager private constructor(private val editor: Editor) {
 	private fun show(highlighterWithInfo: HighlighterWithInfo) {
 		val (highlighter, info) = highlighterWithInfo
 		
-		if (!highlighter.isValid) {
-			return
-		}
-		
 		val existingLens = lenses[highlighter]
 		if (existingLens != null) {
 			if (existingLens.update(info)) {
@@ -52,10 +48,22 @@ class EditorLensManager private constructor(private val editor: Editor) {
 		}
 	}
 	
+	fun show(highlightersWithInfo: Collection<HighlighterWithInfo>) {
+		executeInBatchMode(highlightersWithInfo.size) {
+			highlightersWithInfo.forEach(::show)
+		}
+	}
+	
 	private fun hide(highlighter: RangeHighlighter) {
 		lenses.remove(highlighter)?.hide()
 	}
 	
+	fun hide(highlighters: Collection<RangeHighlighter>) {
+		executeInBatchMode(highlighters.size) {
+			highlighters.forEach(::hide)
+		}
+	}
+	
 	fun hideAll() {
 		executeInBatchMode(lenses.size) {
 			lenses.values.forEach(EditorLens::hide)
@@ -63,28 +71,6 @@ class EditorLensManager private constructor(private val editor: Editor) {
 		}
 	}
 	
-	fun execute(commands: Collection<Command>) {
-		executeInBatchMode(commands.size) {
-			commands.forEach { it.apply(this) }
-		}
-	}
-	
-	sealed interface Command {
-		fun apply(lensManager: EditorLensManager)
-		
-		class Show(private val highlighter: HighlighterWithInfo) : Command {
-			override fun apply(lensManager: EditorLensManager) {
-				lensManager.show(highlighter)
-			}
-		}
-		
-		class Hide(private val highlighter: RangeHighlighter) : Command {
-			override fun apply(lensManager: EditorLensManager) {
-				lensManager.hide(highlighter)
-			}
-		}
-	}
-	
 	/**
 	 * Batch mode affects both inlays and highlighters used for line colors.
 	 */

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/EditorLensManagerDispatcher.kt

@@ -1,41 +0,0 @@
-package com.chylex.intellij.inspectionlens.editor
-
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.editor.markup.RangeHighlighter
-
-class EditorLensManagerDispatcher(private val lensManager: EditorLensManager) {
-	private var queuedItems = mutableListOf<EditorLensManager.Command>()
-	private var isEnqueued = false
-	
-	fun show(highlighterWithInfo: HighlighterWithInfo) {
-		enqueue(EditorLensManager.Command.Show(highlighterWithInfo))
-	}
-	
-	fun hide(highlighter: RangeHighlighter) {
-		enqueue(EditorLensManager.Command.Hide(highlighter))
-	}
-	
-	private fun enqueue(item: EditorLensManager.Command) {
-		synchronized(this) {
-			queuedItems.add(item)
-			
-			// Enqueue even if already on dispatch thread to debounce consecutive calls.
-			if (!isEnqueued) {
-				isEnqueued = true
-				ApplicationManager.getApplication().invokeLater(::process)
-			}
-		}
-	}
-	
-	private fun process() {
-		var itemsToProcess: List<EditorLensManager.Command>
-		
-		synchronized(this) {
-			itemsToProcess = queuedItems
-			queuedItems = mutableListOf()
-			isEnqueued = false
-		}
-		
-		lensManager.execute(itemsToProcess)
-	}
-}

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/LensMarkupModelListener.kt

@@ -1,5 +1,6 @@
 package com.chylex.intellij.inspectionlens.editor
 
+import com.chylex.intellij.inspectionlens.utils.DebouncingInvokeOnDispatchThread
 import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.Disposable
@@ -16,7 +17,10 @@ import com.intellij.openapi.util.Key
  * Listens for inspection highlights and reports them to [EditorLensManager].
  */
 internal class LensMarkupModelListener private constructor(editor: Editor) : MarkupModelListener {
-	private val lensManagerDispatcher = EditorLensManagerDispatcher(EditorLensManager.getOrCreate(editor))
+	private val lensManager = EditorLensManager.getOrCreate(editor)
+	
+	private val showOnDispatchThread = DebouncingInvokeOnDispatchThread(lensManager::show)
+	private val hideOnDispatchThread = DebouncingInvokeOnDispatchThread(lensManager::hide)
 	
 	override fun afterAdded(highlighter: RangeHighlighterEx) {
 		showIfValid(highlighter)
@@ -28,18 +32,18 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
 	
 	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
 		if (getFilteredHighlightInfo(highlighter) != null) {
-			lensManagerDispatcher.hide(highlighter)
+			hideOnDispatchThread.enqueue(highlighter)
 		}
 	}
 	
 	private fun showIfValid(highlighter: RangeHighlighter) {
-		runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
+		runWithHighlighterIfValid(highlighter, showOnDispatchThread::enqueue, ::showAsynchronously)
 	}
 	
 	private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
 		highlighterWithInfo.requestDescription {
 			if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
-				lensManagerDispatcher.show(highlighterWithInfo)
+				showOnDispatchThread.enqueue(highlighterWithInfo)
 			}
 		}
 	}

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/LensSeverity.kt

@@ -1,6 +1,7 @@
 package com.chylex.intellij.inspectionlens.editor
 
-import com.chylex.intellij.inspectionlens.InspectionLensRefresher
+import com.chylex.intellij.inspectionlens.InspectionLens
+import com.chylex.intellij.inspectionlens.utils.DebouncingInvokeOnDispatchThread
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
 import com.intellij.ui.ColorUtil
@@ -46,12 +47,14 @@ enum class LensSeverity(baseColor: Color, lightThemeDarkening: Int, darkThemeBri
 			SpellCheckerSeveritiesProvider.TYPO               to TYPO,
 		))
 		
+		private val refreshLater = DebouncingInvokeOnDispatchThread<Unit> { InspectionLens.refresh() }
+		
 		/**
 		 * Registers a mapping from a [HighlightSeverity] to a [LensSeverity], and refreshes all open editors.
 		 */
 		internal fun registerMapping(severity: HighlightSeverity, lensSeverity: LensSeverity) {
 			if (mapping.put(severity, lensSeverity) != lensSeverity) {
-				InspectionLensRefresher.scheduleRefresh()
+				refreshLater.enqueue(Unit)
 			}
 		}
 		

src/main/kotlin/com/chylex/intellij/inspectionlens/utils/DebouncingInvokeOnDispatchThread.kt

@@ -0,0 +1,32 @@
+package com.chylex.intellij.inspectionlens.utils
+
+import com.intellij.openapi.application.ApplicationManager
+
+class DebouncingInvokeOnDispatchThread<T>(private val action: (List<T>) -> Unit) {
+	private var queuedItems = mutableListOf<T>()
+	private var isEnqueued = false
+	
+	fun enqueue(item: T) {
+		synchronized(this) {
+			queuedItems.add(item)
+			
+			// Enqueue even if already on dispatch thread to debounce consecutive calls.
+			if (!isEnqueued) {
+				isEnqueued = true
+				ApplicationManager.getApplication().invokeLater(::process)
+			}
+		}
+	}
+	
+	private fun process() {
+		var itemsToProcess: List<T>
+		
+		synchronized(this) {
+			itemsToProcess = queuedItems
+			queuedItems = mutableListOf()
+			isEnqueued = false
+		}
+		
+		action(itemsToProcess)
+	}
+}

src/main/resources/META-INF/plugin.xml

@@ -17,10 +17,6 @@
   ]]></description>
   
   <change-notes><![CDATA[
-    <b>Version 1.3.2</b>
-    <ul>
-      <li>Fixed inspections randomly not disappearing.</li>
-    </ul>
     <b>Version 1.3.1</b>
     <ul>
       <li>Updated minimum version to IntelliJ 2023.3 due to breaking API changes.</li>