RustRover

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.chylex.intellij.inspectionlens"
-version = "1.6.0"
+version = "1.5.2.902"
 
 repositories {
 	mavenCentral()
@@ -18,7 +18,7 @@ repositories {
 
 dependencies {
 	intellijPlatform {
-		intellijIdeaUltimate("2024.2")
+		rustRover("2025.1.2", useInstaller = false)
 		bundledPlugin("tanvd.grazi")
 	}
 	
@@ -28,19 +28,10 @@ dependencies {
 intellijPlatform {
 	pluginConfiguration {
 		ideaVersion {
-			sinceBuild.set("242")
+			sinceBuild.set("233.11361.10")
 			untilBuild.set(provider { null })
 		}
 	}
-	
-	pluginVerification {
-		freeArgs.add("-mute")
-		freeArgs.add("TemplateWordInPluginId")
-		
-		ides {
-			recommended()
-		}
-	}
 }
 
 kotlin {

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "InspectionLens"
 
 pluginManagement {
 	plugins {
-		kotlin("jvm") version "1.9.24" // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
-		id("org.jetbrains.intellij.platform") version "2.6.0" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases	
+		kotlin("jvm") version "2.1.0"
+		id("org.jetbrains.intellij.platform") version "2.6.0"
 	}
 }

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

@@ -2,11 +2,11 @@ package com.chylex.intellij.inspectionlens
 
 import com.chylex.intellij.inspectionlens.editor.EditorLensFeatures
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.project.ProjectManager
-import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * Handles installation and uninstallation of plugin features in editors.
@@ -16,31 +16,27 @@ internal object InspectionLens {
 	
 	val LOG = logger<InspectionLens>()
 	
-	var SHOW_LENSES = true
-		set(value) {
-			field = value
-			scheduleRefresh()
-		}
-	
 	/**
 	 * Installs lenses into [editor].
 	 */
 	fun install(editor: TextEditor) {
-		EditorLensFeatures.install(editor)
+		EditorLensFeatures.install(editor.editor, service<InspectionLensPluginDisposableService>().intersect(editor))
 	}
 	
 	/**
 	 * Installs lenses into all open editors.
 	 */
 	fun install() {
-		forEachOpenEditor(EditorLensFeatures::install)
+		forEachOpenEditor(::install)
 	}
 	
 	/**
 	 * Refreshes lenses in all open editors.
 	 */
 	private fun refresh() {
-		forEachOpenEditor(EditorLensFeatures::refresh)
+		forEachOpenEditor {
+			EditorLensFeatures.refresh(it.editor)
+		}
 	}
 	
 	/**
@@ -56,32 +52,32 @@ internal object InspectionLens {
 	private inline fun forEachOpenEditor(action: (TextEditor) -> Unit) {
 		val projectManager = ProjectManager.getInstanceIfCreated() ?: return
 		
-		for (project in projectManager.openProjects) {
-			if (project.isDisposed) {
-				continue
-			}
-			
-			for (editor in FileEditorManager.getInstance(project).allEditors) {
-				if (editor is TextEditor) {
+		for (project in projectManager.openProjects.filterNot { it.isDisposed }) {
+			for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
 				action(editor)
 			}
 		}
 	}
-	}
 	
-	private object Refresh : Runnable {
-		private val needsRefresh = AtomicBoolean(false)
+	private object Refresh {
+		private var needsRefresh = false
 		
 		fun schedule() {
-			if (needsRefresh.compareAndSet(false, true)) {
-				ApplicationManager.getApplication().invokeLater(this)
+			synchronized(this) {
+				if (!needsRefresh) {
+					needsRefresh = true
+					ApplicationManager.getApplication().invokeLater(this::run)
+				}
 			}
 		}
 		
-		override fun run() {
-			if (needsRefresh.compareAndSet(true, false)) {
+		private fun run() {
+			synchronized(this) {
+				if (needsRefresh) {
+					needsRefresh = false
 					refresh()
 				}
 			}
 		}
+	}
 }

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

@@ -1,22 +0,0 @@
-package com.chylex.intellij.inspectionlens
-
-import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.fileEditor.FileEditorManagerListener
-import com.intellij.openapi.fileEditor.FileOpenedSyncListener
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.vfs.VirtualFile
-
-/**
- * Installs [InspectionLens] in opened editors.
- *
- * Used instead of [FileOpenedSyncListener], because [FileOpenedSyncListener] randomly fails to register during IDE startup.
- */
-class InspectionLensFileEditorManagerListener : FileEditorManagerListener {
-	override fun fileOpened(source: FileEditorManager, file: VirtualFile) {
-		for (editor in source.getEditors(file)) {
-			if (editor is TextEditor) {
-				InspectionLens.install(editor)
-			}
-		}
-	}
-}

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

@@ -0,0 +1,23 @@
+package com.chylex.intellij.inspectionlens
+
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileEditor.FileOpenedSyncListener
+import com.intellij.openapi.fileEditor.TextEditor
+import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider
+import com.intellij.openapi.vfs.VirtualFile
+
+/**
+ * Installs [InspectionLens] in newly opened editors.
+ */
+class InspectionLensFileOpenedListener : FileOpenedSyncListener {
+	override fun fileOpenedSync(source: FileEditorManager, file: VirtualFile, editorsWithProviders: List<FileEditorWithProvider>) {
+		InspectionLens.LOG.info("File opened: $file (editor count: ${editorsWithProviders.size})")
+		
+		for (editorWrapper in editorsWithProviders) {
+			val fileEditor = editorWrapper.fileEditor
+			if (fileEditor is TextEditor) {
+				InspectionLens.install(fileEditor)
+			}
+		}
+	}
+}

src/main/kotlin/com/chylex/intellij/inspectionlens/actions/ToggleLensVisibilityAction.kt

@@ -1,25 +0,0 @@
-package com.chylex.intellij.inspectionlens.actions
-
-import com.chylex.intellij.inspectionlens.InspectionLens
-import com.intellij.openapi.actionSystem.ActionUpdateThread
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.KeepPopupOnPerform
-import com.intellij.openapi.project.DumbAwareToggleAction
-
-class ToggleLensVisibilityAction : DumbAwareToggleAction() {
-	init {
-		templatePresentation.keepPopupOnPerform = KeepPopupOnPerform.IfRequested
-	}
-	
-	override fun getActionUpdateThread(): ActionUpdateThread {
-		return ActionUpdateThread.BGT
-	}
-	
-	override fun isSelected(e: AnActionEvent): Boolean {
-		return InspectionLens.SHOW_LENSES
-	}
-	
-	override fun setSelected(e: AnActionEvent, state: Boolean) {
-		InspectionLens.SHOW_LENSES = state
-	}
-}

src/main/kotlin/com/chylex/intellij/inspectionlens/debug/Highlighter.kt

@@ -0,0 +1,9 @@
+package com.chylex.intellij.inspectionlens.debug
+
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.openapi.editor.markup.RangeHighlighter
+
+data class Highlighter(val hashCode: Int, val layer: Int, val severity: HighlightSeverity, val description: String) {
+	constructor(highlighter: RangeHighlighter, info: HighlightInfo) : this(System.identityHashCode(highlighter), highlighter.layer, info.severity, info.description)
+}

src/main/kotlin/com/chylex/intellij/inspectionlens/debug/LensEvent.kt

@@ -0,0 +1,5 @@
+package com.chylex.intellij.inspectionlens.debug
+
+import java.time.Instant
+
+data class LensEvent(val time: Instant, val data: LensEventData)

src/main/kotlin/com/chylex/intellij/inspectionlens/debug/LensEventData.kt

@@ -0,0 +1,7 @@
+package com.chylex.intellij.inspectionlens.debug
+
+sealed interface LensEventData {
+	data class MarkupModelAfterAdded(val lens: Highlighter) : LensEventData
+	data class MarkupModelAttributesChanged(val lens: Highlighter) : LensEventData
+	data class MarkupModelBeforeRemoved(val lens: Highlighter) : LensEventData
+}

src/main/kotlin/com/chylex/intellij/inspectionlens/debug/LensEventManager.kt

@@ -0,0 +1,14 @@
+package com.chylex.intellij.inspectionlens.debug
+
+import com.intellij.openapi.editor.Editor
+import java.time.Instant
+
+object LensEventManager {
+	val fileNameToEventsMap = mutableMapOf<String, MutableList<LensEvent>>()
+	
+	@Synchronized
+	fun addEvent(editor: Editor, event: LensEventData) {
+		val path = editor.virtualFile?.path ?: return
+		fileNameToEventsMap.getOrPut(path, ::mutableListOf).add(LensEvent(Instant.now(), event))
+	}
+}

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

@@ -1,13 +1,11 @@
 package com.chylex.intellij.inspectionlens.editor
 
-import com.chylex.intellij.inspectionlens.InspectionLensPluginDisposableService
+import com.chylex.intellij.inspectionlens.InspectionLens
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ex.FoldingModelEx
 import com.intellij.openapi.editor.ex.MarkupModelEx
 import com.intellij.openapi.editor.impl.DocumentMarkupModel
-import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Key
 
@@ -22,7 +20,7 @@ internal class EditorLensFeatures private constructor(
 ) {
 	private val lensManager = EditorLensManager(editor)
 	private val lensManagerDispatcher = EditorLensManagerDispatcher(lensManager)
-	private val markupModelListener = LensMarkupModelListener(lensManagerDispatcher)
+	private val markupModelListener = LensMarkupModelListener(editor, lensManagerDispatcher)
 	
 	init {
 		markupModel.addMarkupModelListener(disposable, markupModelListener)
@@ -39,24 +37,30 @@ internal class EditorLensFeatures private constructor(
 	companion object {
 		private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
 		
-		fun install(owner: TextEditor) {
-			val editor = owner.editor
+		fun install(editor: Editor, disposable: Disposable) {
 			if (editor.getUserData(EDITOR_KEY) != null) {
+				InspectionLens.LOG.info("Skipped installation to: $editor")
 				return
 			}
 			
+			InspectionLens.LOG.info("Installing to: $editor")
+			
 			val markupModel = DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx ?: return
 			val foldingModel = editor.foldingModel as? FoldingModelEx
-			
-			val disposable = service<InspectionLensPluginDisposableService>().intersect(owner)
 			val features = EditorLensFeatures(editor, markupModel, foldingModel, disposable)
 			
 			editor.putUserData(EDITOR_KEY, features)
-			Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
+			
+			Disposer.register(disposable) {
+				InspectionLens.LOG.info("Installation disposed: $editor", Exception("DISPOSE STACK TRACE"))
+				editor.putUserData(EDITOR_KEY, null)
+			}
 		}
 		
-		fun refresh(owner: TextEditor) {
-			owner.editor.getUserData(EDITOR_KEY)?.refresh()
+		fun refresh(editor: Editor) {
+			val userData = editor.getUserData(EDITOR_KEY)
+			InspectionLens.LOG.info("Refreshing: $editor ($userData)")
+			userData?.refresh()
 		}
 	}
 }

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

@@ -1,7 +1,9 @@
 package com.chylex.intellij.inspectionlens.editor
 
+import com.chylex.intellij.inspectionlens.debug.Highlighter
 import com.chylex.intellij.inspectionlens.editor.lens.EditorLens
 import com.chylex.intellij.inspectionlens.settings.LensSettingsState
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.markup.RangeHighlighter
@@ -14,6 +16,9 @@ internal class EditorLensManager(private val editor: Editor) {
 	private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
 	private val settings = service<LensSettingsState>()
 	
+	private val highlighters
+		get() = lenses.keys.map { Highlighter(it, HighlightInfo.fromRangeHighlighter(it)!!) }
+	
 	private fun show(highlighterWithInfo: HighlighterWithInfo) {
 		val (highlighter, info) = highlighterWithInfo
 		

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

@@ -1,10 +1,13 @@
 package com.chylex.intellij.inspectionlens.editor
 
 import com.chylex.intellij.inspectionlens.InspectionLens
+import com.chylex.intellij.inspectionlens.debug.Highlighter
+import com.chylex.intellij.inspectionlens.debug.LensEventData
+import com.chylex.intellij.inspectionlens.debug.LensEventManager
 import com.chylex.intellij.inspectionlens.settings.LensSettingsState
 import com.intellij.codeInsight.daemon.impl.HighlightInfo
-import com.intellij.codeInsight.daemon.impl.UpdateHighlightersUtil.isFileLevelOrGutterAnnotation
 import com.intellij.openapi.components.service
+import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ex.RangeHighlighterEx
 import com.intellij.openapi.editor.impl.event.MarkupModelListener
 import com.intellij.openapi.editor.markup.RangeHighlighter
@@ -12,48 +15,41 @@ import com.intellij.openapi.editor.markup.RangeHighlighter
 /**
  * Listens for inspection highlights and reports them to [EditorLensManager].
  */
-internal class LensMarkupModelListener(private val lensManagerDispatcher: EditorLensManagerDispatcher) : MarkupModelListener {
+internal class LensMarkupModelListener(private val editor: Editor, private val lensManagerDispatcher: EditorLensManagerDispatcher) : MarkupModelListener {
 	private val settings = service<LensSettingsState>()
 	
 	override fun afterAdded(highlighter: RangeHighlighterEx) {
+		try {
+			getFilteredHighlightInfo(highlighter)?.let { LensEventManager.addEvent(editor, LensEventData.MarkupModelAfterAdded(Highlighter(highlighter, it))) }
 			showIfValid(highlighter)
+		} catch (e: Exception) {
+			InspectionLens.LOG.error("Error showing inspection", e)
+		}
 	}
 	
 	override fun attributesChanged(highlighter: RangeHighlighterEx, renderersChanged: Boolean, fontStyleOrColorChanged: Boolean) {
+		try {
+			getFilteredHighlightInfo(highlighter)?.let { LensEventManager.addEvent(editor, LensEventData.MarkupModelAttributesChanged(Highlighter(highlighter, it))) }
 			showIfValid(highlighter)
+		} catch (e: Exception) {
+			InspectionLens.LOG.error("Error updating inspection", e)
+		}
 	}
 	
-	fun showAllValid(highlighters: Array<RangeHighlighter>) {
-		if (InspectionLens.SHOW_LENSES) {
-			highlighters.forEach(::showIfValid)
+	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
+		try {
+			val filteredHighlightInfo = getFilteredHighlightInfo(highlighter)
+			if (filteredHighlightInfo != null) {
+				LensEventManager.addEvent(editor, LensEventData.MarkupModelBeforeRemoved(Highlighter(highlighter, filteredHighlightInfo)))
+				lensManagerDispatcher.hide(highlighter)
+			}
+		} catch (e: Exception) {
+			InspectionLens.LOG.error("Error hiding inspection", e)
 		}
 	}
 	
 	private fun showIfValid(highlighter: RangeHighlighter) {
-		if (!InspectionLens.SHOW_LENSES) {
-			return
-		}
-		
-		val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
-		if (info == null || isFileLevelOrGutterAnnotation(info)) {
-			return
-		}
-		
-		val highlighterWithInfo = HighlighterWithInfo.from(highlighter, info)
-		processHighlighterWithInfo(highlighterWithInfo, lensManagerDispatcher::show, ::showAsynchronously)
-	}
-	
-	private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
-		return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
-	}
-	
-	private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
-		if (highlighterWithInfo is HighlighterWithInfo.Async) {
-			actionForAsync(highlighterWithInfo)
-		}
-		else if (highlighterWithInfo.hasDescription) {
-			actionForImmediate(highlighterWithInfo)
-		}
+		runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
 	}
 	
 	private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
@@ -64,13 +60,31 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
 		}
 	}
 	
-	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
-		if (getFilteredHighlightInfo(highlighter) != null) {
-			lensManagerDispatcher.hide(highlighter)
-		}
+	fun showAllValid(highlighters: Array<RangeHighlighter>) {
+		highlighters.forEach(::showIfValid)
 	}
 	
 	fun hideAll() {
 		lensManagerDispatcher.hideAll()
 	}
+	
+	private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
+		return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
+	}
+	
+	private inline fun runWithHighlighterIfValid(highlighter: RangeHighlighter, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
+		val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
+		if (info != null) {
+			processHighlighterWithInfo(HighlighterWithInfo.from(highlighter, info), actionForImmediate, actionForAsync)
+		}
+	}
+	
+	private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
+		if (highlighterWithInfo is HighlighterWithInfo.Async) {
+			actionForAsync(highlighterWithInfo)
+		}
+		else if (highlighterWithInfo.hasDescription) {
+			actionForImmediate(highlighterWithInfo)
+		}
+	}
 }

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/lens/EditorLens.kt

@@ -32,6 +32,10 @@ internal class EditorLens private constructor(private var inlay: EditorLensInlay
 		lineBackground.hide(inlay.editor)
 	}
 	
+	override fun toString(): String {
+		return "$inlay"
+	}
+	
 	companion object {
 		fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
 			val inlay = EditorLensInlay.show(editor, info, settings) ?: return null

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/lens/IntentionsPopup.kt

@@ -1,132 +1,58 @@
 package com.chylex.intellij.inspectionlens.editor.lens
 
-import com.chylex.intellij.inspectionlens.InspectionLens
-import com.intellij.codeInsight.daemon.impl.HighlightInfo
-import com.intellij.codeInsight.daemon.impl.HighlightInfo.IntentionActionDescriptor
 import com.intellij.codeInsight.daemon.impl.IntentionsUI
-import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass.IntentionsInfo
 import com.intellij.codeInsight.hint.HintManager
-import com.intellij.codeInsight.intention.impl.CachedIntentions
-import com.intellij.codeInsight.intention.impl.IntentionHintComponent
 import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
 import com.intellij.lang.LangBundle
-import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.ex.ActionUtil
-import com.intellij.openapi.application.ModalityState
-import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.Inlay
-import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiUtilBase
-import com.intellij.ui.awt.RelativePoint
-import com.intellij.util.concurrency.AppExecutorUtil
-import java.lang.reflect.Method
 
 internal object IntentionsPopup {
-	private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
-	
-	private val showPopupMethod: ShowPopupMethod? = try {
-		val method = IntentionHintComponent::class.java.declaredMethods.first { method ->
-			val parameterTypes = method.parameterTypes
-			
-			method.name == "showPopup" &&
-			parameterTypes.size in 1..2 &&
-			parameterTypes[0] === RelativePoint::class.java &&
-			parameterTypes.getOrNull(1).let { p -> p == null || p.name == INTENTION_SOURCE_CLASS_NAME }
-		}
-		
-		method.isAccessible = true
-		
-		@Suppress("UNCHECKED_CAST")
-		val args: Array<Any?> = if (method.parameterCount == 1)
-			arrayOf(null)
-		else
-			arrayOf(null, (Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>).enumConstants.first { it.name == "OTHER" })
-		
-		ShowPopupMethod(method, args)
-	} catch (t: Throwable) {
-		InspectionLens.LOG.warn("Could not initialize intention popup", t)
-		null
-	}
-	
-	private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
-		operator fun invoke(component: IntentionHintComponent) {
-			method.invoke(component, *args)
+	fun show(editor: Editor) {
+		if (!tryShow(editor)) {
+			HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
 		}
 	}
 	
-	fun show(highlightInfo: HighlightInfo, inlay: Inlay<*>) {
-		if (!tryShow(highlightInfo, inlay)) {
-			showNoActionsAvailable(inlay.editor)
+	private fun tryShow(editor: Editor): Boolean {
+		// If the IDE uses the default Show Intentions action and handler,
+		// use the handler directly to bypass additional logic from the action.
+		val action = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
+		if (action.javaClass.name === DEFAULT_ACTION_CLASS) {
+			return tryShowWithDefaultHandler(editor)
+		}
+		else {
+			ActionUtil.invokeAction(action, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
+			return true
 		}
 	}
 	
-	private fun tryShow(highlightInfo: HighlightInfo, inlay: Inlay<*>): Boolean {
-		val editor = inlay.editor
+	private fun tryShowWithDefaultHandler(editor: Editor): Boolean {
 		val project = editor.project ?: return false
 		val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
 		
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		IntentionsUI.getInstance(project).hide()
 		
-		ReadAction
-			.nonBlocking<IntentionsInfo> { collectIntentions(editor, project, file, highlightInfo, inlay.offset) }
-			.finishOnUiThread(ModalityState.current()) { tryShowPopup(project, file, editor, it) }
-			.submit(AppExecutorUtil.getAppExecutorService())
-		
+		HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
 		return true
 	}
 	
-	private fun collectIntentions(editor: Editor, project: Project, file: PsiFile, info: HighlightInfo, offset: Int): IntentionsInfo {
-		val intentions = mutableListOf<IntentionActionDescriptor>()
+	/**
+	 * New IDEA versions mark this class as internal, so the plugin verifier flags references to it as errors.
+	 */
+	const val DEFAULT_ACTION_CLASS = "com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction"
 	
-		info.findRegisteredQuickFix { descriptor, _ ->
-			if (DumbService.getInstance(project).isUsableInCurrentContext(descriptor.action) && ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
-				intentions.add(descriptor)
+	private val HANDLER = object : ShowIntentionActionsHandler() {
+		public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
+			super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
 		}
-			null
-		}
-		
-		return IntentionsInfo().also {
-			it.offset = offset
-			
-			if (info.severity === HighlightSeverity.ERROR) {
-				it.errorFixesToShow.addAll(intentions)
-			}
-			else {
-				it.inspectionFixesToShow.addAll(intentions)
-			}
-		}
-	}
-	
-	private fun tryShowPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
-		try {
-			showPopup(project, file, editor, intentions)
-		} catch (t: Throwable) {
-			InspectionLens.LOG.error("Could not show intention popup", t)
-			showNoActionsAvailable(editor)
-		}
-	}
-	
-	private fun showPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
-		if (intentions.isEmpty || showPopupMethod == null) {
-			val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
-			ActionUtil.invokeAction(showIntentionsAction, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
-		}
-		else {
-			val cachedIntentions = CachedIntentions.create(project, file, editor, intentions)
-			val hintComponent = IntentionHintComponent.showIntentionHint(project, file, editor, false, cachedIntentions)
-			showPopupMethod.invoke(hintComponent)
-		}
-	}
-	
-	private fun showNoActionsAvailable(editor: Editor) {
-		HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
 	}
 }

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/lens/LensRenderer.kt

@@ -125,7 +125,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 			moveToOffset(editor, info.actualStartOffset)
 			
 			if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
-				IntentionsPopup.show(info, inlay)
+				IntentionsPopup.show(editor)
 			}
 		}
 	}

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

@@ -14,14 +14,6 @@
   ]]></description>
   
   <change-notes><![CDATA[
-    <b>Version 1.6.0</b>
-    <ul>
-      <li>Added action to <b>View | Show Inspection Lenses</b> that temporarily toggles visibility of all inspections.</li>
-      <li>File-wide inspections no longer appear.</li>
-      <li>Fixed quick fix popup disappearing when the floating toolbar is enabled.</li>
-      <li>Clicking an inspection now only shows relevant quick fixes (not supported for ReSharper-based languages, which use a non-standard popup).</li>
-      <li>Tried to work around an issue where the IDE randomly fails to load the plugin.</li>
-    </ul>
     <b>Version 1.5.2</b>
     <ul>
       <li>Added option to change maximum description length.</li>
@@ -104,17 +96,11 @@
                              parentId="tools" />
   </extensions>
   
-  <actions>
-    <action id="chylex.InspectionLens.ToggleLensVisibility" class="com.chylex.intellij.inspectionlens.actions.ToggleLensVisibilityAction" text="Show Inspection Lenses">
-      <add-to-group group-id="ViewMenu" anchor="after" relative-to-action="EditorResetFontSizeGlobal" />
-    </action>
-  </actions>
-  
   <applicationListeners>
     <listener class="com.chylex.intellij.inspectionlens.InspectionLensPluginListener" topic="com.intellij.ide.plugins.DynamicPluginListener" />
   </applicationListeners>
   
   <projectListeners>
-    <listener class="com.chylex.intellij.inspectionlens.InspectionLensFileEditorManagerListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener" />
+    <listener class="com.chylex.intellij.inspectionlens.InspectionLensFileOpenedListener" topic="com.intellij.openapi.fileEditor.FileOpenedSyncListener" />
   </projectListeners>
 </idea-plugin>

src/test/kotlin/com/chylex/intellij/inspectionlens/editor/lens/IntentionsPopupTest.kt

@@ -0,0 +1,12 @@
+package com.chylex.intellij.inspectionlens.editor.lens
+
+import com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class IntentionsPopupTest {
+	@Test
+	fun showIntentionActionsActionClassHasNotChanged() {
+		assertEquals(IntentionsPopup.DEFAULT_ACTION_CLASS, ShowIntentionActionsAction::class.java.name)
+	}
+}