RustRover

build.gradle.kts

@@ -1,21 +1,12 @@
 @file:Suppress("ConvertLambdaToReference")
 
-import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-
 plugins {
 	kotlin("jvm")
 	id("org.jetbrains.intellij.platform")
 }
 
 group = "com.chylex.intellij.inspectionlens"
-version = "1.7.0"
+version = "1.5.2.902"
-
-idea {
-	module {
-		excludeDirs.add(file(".kotlin"))
-		excludeDirs.add(file("build"))
-	}
-}
 
 repositories {
 	mavenCentral()
@@ -27,36 +18,25 @@ repositories {
 
 dependencies {
 	intellijPlatform {
-		intellijIdeaUltimate("2025.3")
+		rustRover("2025.1.2", useInstaller = false)
 		bundledPlugin("tanvd.grazi")
-		
-		testFramework(TestFrameworkType.JUnit5)
 	}
 	
 	testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-	testRuntimeOnly("junit:junit:4.13.2") // https://youtrack.jetbrains.com/projects/IJPL/issues/IJPL-159134
 }
 
 intellijPlatform {
 	pluginConfiguration {
 		ideaVersion {
-			sinceBuild.set("253")
+			sinceBuild.set("233.11361.10")
 			untilBuild.set(provider { null })
 		}
 	}
-	
-	pluginVerification {
-		freeArgs.add("-mute")
-		freeArgs.add("TemplateWordInPluginId")
-		
-		ides {
-			recommended()
-		}
-	}
 }
 
 kotlin {
+	jvmToolchain(17)
+	
 	compilerOptions {
 		freeCompilerArgs = listOf(
 			"-X" + "jvm-default=all",

gradle.properties

@@ -1,2 +1 @@
 kotlin.stdlib.default.dependency=false
-org.gradle.caching = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   gradlew start up script for POSIX generated by Gradle.
+#   Gradle start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh gradlew
+#           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,14 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
+@rem Set local scope for the variables with windows NT shell
-setlocal EnableExtensions
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,18 +65,30 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-@rem Execute gradlew
+@rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:exitWithErrorLevel
+:end
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+@rem End local scope for the variables with windows NT shell
-"%COMSPEC%" /c exit %ERRORLEVEL%
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "InspectionLens"
 
 pluginManagement {
 	plugins {
-		kotlin("jvm") version "2.4.0" // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
+		kotlin("jvm") version "2.1.0"
-		id("org.jetbrains.intellij.platform") version "2.18.1" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+		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,31 +52,31 @@ internal object InspectionLens {
 	private inline fun forEachOpenEditor(action: (TextEditor) -> Unit) {
 		val projectManager = ProjectManager.getInstanceIfCreated() ?: return
 		
-		for (project in projectManager.openProjects) {
+		for (project in projectManager.openProjects.filterNot { it.isDisposed }) {
-			if (project.isDisposed) {
+			for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
-				continue
+				action(editor)
-			}
-			
-			for (editor in FileEditorManager.getInstance(project).allEditors) {
-				if (editor is TextEditor) {
-					action(editor)
-				}
 			}
 		}
 	}
 	
-	private object Refresh : Runnable {
+	private object Refresh {
-		private val needsRefresh = AtomicBoolean(false)
+		private var needsRefresh = false
 		
 		fun schedule() {
-			if (needsRefresh.compareAndSet(false, true)) {
+			synchronized(this) {
-				ApplicationManager.getApplication().invokeLater(this)
+				if (!needsRefresh) {
+					needsRefresh = true
+					ApplicationManager.getApplication().invokeLater(this::run)
+				}
 			}
 		}
 		
-		override fun run() {
+		private fun run() {
-			if (needsRefresh.compareAndSet(true, false)) {
+			synchronized(this) {
-				refresh()
+				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/compatibility/GrazieSupport.kt

@@ -8,6 +8,8 @@ import com.intellij.openapi.startup.ProjectActivity
 class GrazieSupport : ProjectActivity {
 	override suspend fun execute(project: Project) {
 		LensSeverity.registerMapping(TextProblemSeverities.GRAMMAR_ERROR, LensSeverity.ERROR)
+		LensSeverity.registerMapping(TextProblemSeverities.STYLE_ERROR, LensSeverity.GRAZIE)
+		LensSeverity.registerMapping(TextProblemSeverities.STYLE_WARNING, LensSeverity.GRAZIE)
 		LensSeverity.registerMapping(TextProblemSeverities.STYLE_SUGGESTION, LensSeverity.GRAZIE)
 	}
 }

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) {
+		fun install(editor: Editor, disposable: Disposable) {
-			val editor = owner.editor
 			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) {
+		fun refresh(editor: Editor) {
-			owner.editor.getUserData(EDITOR_KEY)?.refresh()
+			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,26 +16,26 @@ internal class EditorLensManager(private val editor: Editor) {
 	private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
 	private val settings = service<LensSettingsState>()
 	
-	private fun show(inspection: Inspection) {
+	private val highlighters
-		if (editor.isDisposed) {
+		get() = lenses.keys.map { Highlighter(it, HighlightInfo.fromRangeHighlighter(it)!!) }
-			return
+	
-		}
+	private fun show(highlighterWithInfo: HighlighterWithInfo) {
+		val (highlighter, info) = highlighterWithInfo
 		
-		val highlighter = inspection.highlighter
 		if (!highlighter.isValid) {
 			return
 		}
 		
 		val existingLens = lenses[highlighter]
 		if (existingLens != null) {
-			if (existingLens.update(inspection, settings)) {
+			if (existingLens.update(info, settings)) {
 				return
 			}
 			
 			existingLens.hide()
 		}
 		
-		val newLens = EditorLens.show(editor, inspection, settings)
+		val newLens = EditorLens.show(editor, info, settings)
 		if (newLens != null) {
 			lenses[highlighter] = newLens
 		}
@@ -66,9 +68,9 @@ internal class EditorLensManager(private val editor: Editor) {
 	sealed interface Command {
 		fun apply(lensManager: EditorLensManager)
 		
-		class Show(private val inspection: Inspection) : Command {
+		class Show(private val highlighter: HighlighterWithInfo) : Command {
 			override fun apply(lensManager: EditorLensManager) {
-				lensManager.show(inspection)
+				lensManager.show(highlighter)
 			}
 		}
 		
@@ -88,6 +90,7 @@ internal class EditorLensManager(private val editor: Editor) {
 	/**
 	 * Batch mode affects both inlays and highlighters used for line colors.
 	 */
+	@Suppress("ConvertLambdaToReference")
 	private inline fun executeInBatchMode(operations: Int, crossinline action: () -> Unit) {
 		if (operations > 1000) {
 			editor.inlayModel.execute(true) { action() }

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

@@ -7,8 +7,8 @@ internal class EditorLensManagerDispatcher(private val lensManager: EditorLensMa
 	private var queuedItems = mutableListOf<EditorLensManager.Command>()
 	private var isEnqueued = false
 	
-	fun show(inspection: Inspection) {
+	fun show(highlighterWithInfo: HighlighterWithInfo) {
-		enqueue(EditorLensManager.Command.Show(inspection))
+		enqueue(EditorLensManager.Command.Show(highlighterWithInfo))
 	}
 	
 	fun hide(highlighter: RangeHighlighter) {

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

@@ -0,0 +1,28 @@
+package com.chylex.intellij.inspectionlens.editor
+
+import com.intellij.codeInsight.daemon.impl.AsyncDescriptionSupplier
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
+import com.intellij.openapi.editor.markup.RangeHighlighter
+import java.util.function.Consumer
+
+open class HighlighterWithInfo private constructor(val highlighter: RangeHighlighter, private val info: HighlightInfo) {
+	val hasDescription
+		get() = info.description != null
+	
+	operator fun component1() = highlighter
+	operator fun component2() = info
+	
+	class Async(highlighter: RangeHighlighter, info: HighlightInfo, private val provider: AsyncDescriptionSupplier) : HighlighterWithInfo(highlighter, info) {
+		fun requestDescription(callback: Consumer<String?>) {
+			provider.requestDescription().onSuccess(callback)
+		}
+	}
+	
+	companion object {
+		fun from(highlighter: RangeHighlighter, info: HighlightInfo) =
+			if (info is AsyncDescriptionSupplier)
+				Async(highlighter, info, info)
+			else
+				HighlighterWithInfo(highlighter, info)
+	}
+}

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

@@ -1,6 +0,0 @@
-package com.chylex.intellij.inspectionlens.editor
-
-import com.intellij.codeInsight.daemon.impl.HighlightInfo
-import com.intellij.openapi.editor.markup.RangeHighlighter
-
-data class Inspection(val highlighter: RangeHighlighter, val info: HighlightInfo)

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

@@ -1,11 +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.AsyncDescriptionSupplier
 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
@@ -13,62 +15,76 @@ 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) {
-		showIfValid(highlighter)
+		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) {
-		showIfValid(highlighter)
+		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>) {
+	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
-		if (InspectionLens.SHOW_LENSES) {
+		try {
-			highlighters.forEach(::showIfValid)
+			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) {
+		runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
-			return
+	}
-		}
+	
-		
+	private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
-		val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
+		highlighterWithInfo.requestDescription {
-		if (info == null || isFileLevelOrGutterAnnotation(info)) {
+			if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
-			return
+				lensManagerDispatcher.show(highlighterWithInfo)
-		}
-		
-		if (info is AsyncDescriptionSupplier) {
-			info.requestDescription().onSuccess {
-				if (highlighter.isValid) {
-					showInspection(highlighter, info)
-				}
 			}
 		}
-		else {
+	}
-			showInspection(highlighter, info)
+	
-		}
+	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 fun showInspection(highlighter: RangeHighlighter, info: HighlightInfo) {
+	private inline fun runWithHighlighterIfValid(highlighter: RangeHighlighter, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
-		if (info.description != null) {
+		val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
-			lensManagerDispatcher.show(Inspection(highlighter, info))
+		if (info != null) {
+			processHighlighterWithInfo(HighlighterWithInfo.from(highlighter, info), actionForImmediate, actionForAsync)
 		}
 	}
 	
-	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
+	private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
-		if (getFilteredHighlightInfo(highlighter) != null) {
+		if (highlighterWithInfo is HighlighterWithInfo.Async) {
-			lensManagerDispatcher.hide(highlighter)
+			actionForAsync(highlighterWithInfo)
+		}
+		else if (highlighterWithInfo.hasDescription) {
+			actionForImmediate(highlighterWithInfo)
 		}
-	}
-	
-	fun hideAll() {
-		lensManagerDispatcher.hideAll()
 	}
 }

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

@@ -1,23 +1,23 @@
 package com.chylex.intellij.inspectionlens.editor.lens
 
-import com.chylex.intellij.inspectionlens.editor.Inspection
 import com.chylex.intellij.inspectionlens.settings.LensSettingsState
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.openapi.editor.Editor
 
 internal class EditorLens private constructor(private var inlay: EditorLensInlay, private var lineBackground: EditorLensLineBackground, private var severity: LensSeverity) {
-	fun update(inspection: Inspection, settings: LensSettingsState): Boolean {
+	fun update(info: HighlightInfo, settings: LensSettingsState): Boolean {
 		val editor = inlay.editor
 		val oldSeverity = severity
 		
-		severity = LensSeverity.from(inspection.info.severity)
+		severity = LensSeverity.from(info.severity)
 		
-		if (!inlay.tryUpdate(inspection)) {
+		if (!inlay.tryUpdate(info)) {
-			inlay = EditorLensInlay.show(editor, inspection, settings) ?: return false
+			inlay = EditorLensInlay.show(editor, info, settings) ?: return false
 		}
 		
 		if (lineBackground.isInvalid || oldSeverity != severity) {
 			lineBackground.hide(editor)
-			lineBackground = EditorLensLineBackground.show(editor, inspection.info)
+			lineBackground = EditorLensLineBackground.show(editor, info)
 		}
 		
 		return true
@@ -32,10 +32,13 @@ 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, inspection: Inspection, settings: LensSettingsState): EditorLens? {
+		fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
-			val info = inspection.info
+			val inlay = EditorLensInlay.show(editor, info, settings) ?: return null
-			val inlay = EditorLensInlay.show(editor, inspection, settings) ?: return null
 			val lineBackground = EditorLensLineBackground.show(editor, info)
 			val severity = LensSeverity.from(info.severity)
 			return EditorLens(inlay, lineBackground, severity)

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

@@ -1,6 +1,5 @@
 package com.chylex.intellij.inspectionlens.editor.lens
 
-import com.chylex.intellij.inspectionlens.editor.Inspection
 import com.chylex.intellij.inspectionlens.settings.LensSettingsState
 import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.openapi.editor.Editor
@@ -12,12 +11,12 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
 	val editor
 		get() = inlay.editor
 	
-	fun tryUpdate(inspection: Inspection): Boolean {
+	fun tryUpdate(info: HighlightInfo): Boolean {
 		if (!inlay.isValid) {
 			return false
 		}
 		
-		inlay.renderer.setPropertiesFrom(inspection)
+		inlay.renderer.setPropertiesFrom(info)
 		inlay.update()
 		return true
 	}
@@ -27,10 +26,10 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
 	}
 	
 	companion object {
-		fun show(editor: Editor, inspection: Inspection, settings: LensSettingsState): EditorLensInlay? {
+		fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLensInlay? {
-			val offset = getInlayHintOffset(inspection.info)
+			val offset = getInlayHintOffset(info)
-			val priority = getInlayHintPriority(editor, inspection.info)
+			val priority = getInlayHintPriority(editor, info)
-			val renderer = LensRenderer(inspection, settings)
+			val renderer = LensRenderer(info, settings)
 			
 			val properties = InlayProperties()
 				.relatesToPrecedingText(true)
@@ -72,6 +71,6 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
 		private fun getLineStartOffset(editor: Editor, offset: Int): Int {
 			val position = editor.offsetToLogicalPosition(offset)
 			return editor.document.getLineStartOffset(position.line)
-		}
+		}	
 	}
 }

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

@@ -14,10 +14,6 @@ internal value class EditorLensLineBackground(private val highlighter: RangeHigh
 		get() = !highlighter.isValid
 	
 	fun onFoldRegionsChanged(editor: Editor, severity: LensSeverity) {
-		if (isInvalid) {
-			return
-		}
-		
 		if (highlighter is RangeHighlighterEx) {
 			highlighter.textAttributes = getAttributes(editor, highlighter.startOffset, highlighter.endOffset, severity)
 		}

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

@@ -1,128 +1,58 @@
 package com.chylex.intellij.inspectionlens.editor.lens
 
-import com.chylex.intellij.inspectionlens.InspectionLens
-import com.chylex.intellij.inspectionlens.editor.Inspection
-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
-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.ide.DataManager
+import com.intellij.lang.LangBundle
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
-import com.intellij.openapi.actionSystem.ActionUiKind
-import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.Inlay
-import com.intellij.openapi.editor.markup.RangeHighlighter
 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 java.lang.reflect.Method
 
 internal object IntentionsPopup {
-	private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
+	fun show(editor: Editor) {
-	
+		if (!tryShow(editor)) {
-	private val showPopupMethod: ShowPopupMethod? = try {
+			HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
-		val method = IntentionHintComponent::class.java.declaredMethods.first { method ->
-			val parameterTypes = method.parameterTypes
-			
-			method.name == "showPopup" &&
-			parameterTypes.size == 2 &&
-			parameterTypes[0] === RelativePoint::class.java &&
-			parameterTypes[1].name == INTENTION_SOURCE_CLASS_NAME
-		}
-		
-		method.isAccessible = true
-		
-		@Suppress("UNCHECKED_CAST")
-		val intentionSourceEnum = Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>
-		val intentionSource = intentionSourceEnum.enumConstants.first { it.name == "OTHER" }
-		
-		ShowPopupMethod(method, arrayOf(null, intentionSource))
-	} catch (t: Throwable) {
-		InspectionLens.LOG.warn("Could not initialize intention popup", t)
-		null
-	}
-	
-	val hasShowPopupMethod
-		get() = showPopupMethod != null
-	
-	private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
-		operator fun invoke(component: IntentionHintComponent) {
-			method.invoke(component, *args)
 		}
 	}
 	
-	fun show(inspection: Inspection, inlay: Inlay<*>) {
+	private fun tryShow(editor: Editor): Boolean {
-		if (!tryShow(inspection, inlay)) {
+		// If the IDE uses the default Show Intentions action and handler,
-			HintManager.getInstance().showInformationHint(inlay.editor, "No context actions available at this location")
+		// 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(inspection: Inspection, inlay: Inlay<*>): Boolean {
+	private fun tryShowWithDefaultHandler(editor: Editor): Boolean {
-		val editor = inlay.editor
 		val project = editor.project ?: return false
 		val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
 		
 		PsiDocumentManager.getInstance(project).commitAllDocuments()
 		IntentionsUI.getInstance(project).hide()
 		
-		val intentions = collectIntentions(editor, file, inspection.highlighter, inlay.offset)
+		HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
-		if (intentions == null) {
+		return true
-			return false
-		}
-		
-		try {
-			showIntentionsPopup(project, file, editor, intentions)
-			return true
-		} catch (t: Throwable) {
-			InspectionLens.LOG.error("Could not show intention popup", t)
-			return false
-		}
 	}
 	
-	private fun collectIntentions(editor: Editor, file: PsiFile, highlighter: RangeHighlighter, offset: Int): IntentionsInfo? {
+	/**
-		val resolvedInfo = HighlightInfo.fromRangeHighlighter(highlighter)
+	 * New IDEA versions mark this class as internal, so the plugin verifier flags references to it as errors.
-		if (resolvedInfo == null) {
+	 */
-			return null
+	const val DEFAULT_ACTION_CLASS = "com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction"
-		}
+	
-		
+	private val HANDLER = object : ShowIntentionActionsHandler() {
-		val intentionActions = mutableListOf<IntentionActionDescriptor>()
+		public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
-		
+			super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
-		resolvedInfo.findRegisteredQuickFix { descriptor, _ ->
-			if (ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
-				intentionActions.add(descriptor)
-			}
-			null
-		}
-		
-		return IntentionsInfo().also {
-			it.offset = offset
-			ShowIntentionsPass.fillIntentionsInfoForHighlightInfo(resolvedInfo, it, intentionActions)
 		}
 	}
-	
-	private fun showIntentionsPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
-		if (intentions.isEmpty || showPopupMethod == null) {
-			val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
-			val dataContext = DataManager.getInstance().getDataContext(editor.component)
-			val event = AnActionEvent.createEvent(showIntentionsAction, dataContext, null, ActionPlaces.EDITOR_INLAY, ActionUiKind.NONE, null)
-			ActionUtil.performAction(showIntentionsAction, event)
-		}
-		else {
-			val cachedIntentions = CachedIntentions.create(project, file, editor, intentions)
-			val hintComponent = IntentionHintComponent.showIntentionHint(project, file, editor, false, cachedIntentions)
-			showPopupMethod.invoke(hintComponent)
-		}
-	}
-	
 }

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

@@ -1,8 +1,8 @@
 package com.chylex.intellij.inspectionlens.editor.lens
 
-import com.chylex.intellij.inspectionlens.editor.Inspection
 import com.chylex.intellij.inspectionlens.settings.LensHoverMode
 import com.chylex.intellij.inspectionlens.settings.LensSettingsState
+import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.codeInsight.daemon.impl.HintRenderer
 import com.intellij.codeInsight.hints.presentation.InputHandler
 import com.intellij.openapi.editor.Editor
@@ -27,14 +27,14 @@ import javax.swing.SwingUtilities
 /**
  * Renders the text of an inspection lens.
  */
-class LensRenderer(private var inspection: Inspection, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
+class LensRenderer(private var info: HighlightInfo, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
 	private lateinit var inlay: Inlay<*>
 	private lateinit var attributes: LensSeverityTextAttributes
 	private var extraRightPadding = 0
 	private var hovered = false
 	
 	init {
-		setPropertiesFrom(inspection)
+		setPropertiesFrom(info)
 	}
 	
 	fun setInlay(inlay: Inlay<*>) {
@@ -42,12 +42,12 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
 		this.inlay = inlay
 	}
 	
-	fun setPropertiesFrom(inspection: Inspection) {
+	fun setPropertiesFrom(info: HighlightInfo) {
-		this.inspection = inspection
+		this.info = info
-		val description = getValidDescriptionText(inspection.info.description, settings.maxDescriptionLength)
+		val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
 		
 		text = description
-		attributes = LensSeverity.from(inspection.info.severity).textAttributes
+		attributes = LensSeverity.from(info.severity).textAttributes
 		extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
 	}
 	
@@ -55,7 +55,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
 		fixBaselineForTextRendering(r)
 		super.paint(inlay, g, r, textAttributes)
 		
-		if (hovered) {
+		if (hovered && isHoveringText()) {
 			paintHoverEffect(inlay, g, r)
 		}
 	}
@@ -85,7 +85,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
 	}
 	
 	override fun mouseMoved(event: MouseEvent, translated: Point) {
-		setHovered(isHoveringText())
+		setHovered(isHoveringText(translated))
 	}
 	
 	override fun mouseExited() {
@@ -114,7 +114,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
 	
 	override fun mousePressed(event: MouseEvent, translated: Point) {
 		val hoverMode = settings.lensHoverMode
-		if (hoverMode == LensHoverMode.DISABLED || !isHoveringText()) {
+		if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
 			return
 		}
 		
@@ -122,21 +122,25 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
 			event.consume()
 			
 			val editor = inlay.editor
-			moveToOffset(editor, inspection.info.actualStartOffset)
+			moveToOffset(editor, info.actualStartOffset)
 			
 			if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
-				IntentionsPopup.show(inspection, inlay)
+				IntentionsPopup.show(editor)
 			}
 		}
 	}
 	
 	private fun isHoveringText(): Boolean {
 		val bounds = inlay.bounds ?: return false
-		val point = MouseInfo.getPointerInfo().location.apply {
+		val translatedPoint = MouseInfo.getPointerInfo().location.apply {
 			SwingUtilities.convertPointFromScreen(this, inlay.editor.contentComponent)
 			translate(-bounds.x, -bounds.y)
 		}
 		
+		return isHoveringText(translatedPoint)
+	}
+	
+	private fun isHoveringText(point: Point): Boolean {
 		return point.x >= HOVER_HORIZONTAL_PADDING
 			&& point.y >= 4
 			&& point.x < inlay.widthInPixels - HOVER_HORIZONTAL_PADDING - extraRightPadding

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

@@ -19,8 +19,9 @@ class LensSeverityFilter(private val hiddenSeverityIds: Set<String>, private val
 	}
 	
 	companion object {
+		@Suppress("DEPRECATION")
 		private fun isSupported(severity: HighlightSeverity): Boolean {
-			return severity > HighlightSeverity.TEXT_ATTRIBUTES
+			return severity > HighlightSeverity.TEXT_ATTRIBUTES && severity !== HighlightSeverity.INFO
 		}
 		
 		fun getSupportedSeverities(registrar: SeverityRegistrar = SeverityRegistrar.getSeverityRegistrar(null)): List<HighlightSeverity> {

src/main/kotlin/com/chylex/intellij/inspectionlens/settings/LensApplicationConfigurable.kt

@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.MessageDialogBuilder
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.DisabledTraversalPolicy
 import com.intellij.ui.EditorTextFieldCellRenderer.SimpleRendererComponent
+import com.intellij.ui.SimpleListCellRenderer
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.Cell
 import com.intellij.ui.dsl.builder.RightGap
@@ -23,7 +24,6 @@ import com.intellij.ui.dsl.builder.bindIntText
 import com.intellij.ui.dsl.builder.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.listCellRenderer.textListCellRenderer
 import java.awt.Cursor
 
 class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
@@ -92,7 +92,7 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 			group("Behavior") {
 				row("Hover mode:") {
 					val items = LensHoverMode.entries
-					val renderer = textListCellRenderer<LensHoverMode?> { it?.description ?: "" }
+					val renderer = SimpleListCellRenderer.create("", LensHoverMode::description)
 					comboBox(items, renderer).bindItem(settings::lensHoverMode) { settings.lensHoverMode = it ?: LensHoverMode.DEFAULT }
 				}
 			}

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

@@ -14,40 +14,17 @@
   ]]></description>
   
   <change-notes><![CDATA[
-    <b>Version 1.7.0</b>
-    <ul>
-      <li>Updated minimum version to IntelliJ 2025.3 to address API deprecations.</li>
-      <li>Improved reliability of only showing relevant quick fixes when clicking an inspection.</li>
-      <li>Fixed lenses not always rendering an underline when hovered.</li>
-    </ul>
-    <b>Version 1.6.1</b>
-    <ul>
-      <li>Fixed exception caused by accessing disposed editors.</li>
-      <li>Fixed exception caused by accessing disposed line background highlighters.</li>
-    </ul>
-    <br>
-    <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>
-    <br>
     <b>Version 1.5.2</b>
     <ul>
       <li>Added option to change maximum description length.</li>
       <li>Added button to <b>Settings | Tools | Inspection Lens</b> that resets all settings to default.</li>
     </ul>
-    <br>
     <b>Version 1.5.1</b>
     <ul>
       <li>Added option to change the behavior of clicking on inspections.</li>
       <li>Fixed broken quick fixes in Rider and CLion Nova.</li>
       <li>Fixed hover underline not rendering correctly with some combinations of high DPI and line height settings.</li>
     </ul>
-    <br>
     <b>Version 1.5</b>
     <ul>
       <li>Added possibility to left-click an inspection to show quick fixes.</li>
@@ -57,62 +34,51 @@
       <li>Improved descriptions of Kotlin compiler inspections.</li>
       <li>Fixed visual artifacts in Rendered Doc comments.</li>
     </ul>
-    <br>
     <b>Version 1.4.1</b>
     <ul>
       <li>Fixed warnings in usage of IntelliJ SDK.</li>
     </ul>
-    <br>
     <b>Version 1.4</b>
     <ul>
       <li>Added configuration of visible severities to <b>Settings | Tools | Inspection Lens</b>.</li>
     </ul>
-    <br>
     <b>Version 1.3.3</b>
     <ul>
       <li>Partially reverted fix for inspections that include HTML in their description due to breaking inspections with angled brackets.</li>
       <li>Fixed plugin not working when installed on JetBrains Gateway Client.</li>
     </ul>
-    <br>
     <b>Version 1.3.2</b>
     <ul>
       <li>Fixed inspections randomly not disappearing.</li>
     </ul>
-    <br>
     <b>Version 1.3.1</b>
     <ul>
       <li>Updated minimum version to IntelliJ 2023.3 due to breaking API changes.</li>
     </ul>
-    <br>
     <b>Version 1.3.0</b>
     <ul>
       <li>Added background colors to lines containing inspections. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/15">PR #15</a> by <a href="https://github.com/synopss">synopss</a>)</li>
     </ul>
-    <br>
     <b>Version 1.2.0</b>
     <ul>
       <li>Support for IntelliJ 2023.2 EAP.</li>
       <li>Added distinct colors for typos and Grazie inspections.</li>
     </ul>
-    <br>
     <b>Version 1.1.2</b>
     <ul>
       <li>Added plugin icon.</li>
       <li>Updated minimum version to IntelliJ 2023.1 due to deprecated APIs.</li>
     </ul>
-    <br>
     <b>Version 1.1.1</b>
     <ul>
       <li>Multiple inspections at the same place in the document are now ordered by severity.</li>
       <li>Improved performance of processing inspections which do not contain HTML.</li>
     </ul>
-    <br>
     <b>Version 1.1.0</b>
     <ul>
       <li>Fixed showing inspections that include HTML in their description. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/3">PR #3</a> by <a href="https://github.com/KostkaBrukowa">KostkaBrukowa</a>)</li>
       <li>Fixed exception when asynchronous inspections run on a non-EDT thread.</li>
     </ul>
-    <br>
     <b>Version 1.0.0</b>
     <ul>
       <li>Initial version with support for IntelliJ 2022.2 and newer.</li>
@@ -130,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

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