Fix plugin verifier issues

Closes #45

build.gradle.kts

@@ -1,12 +1,14 @@
 @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.5.1"
+version = "1.6.1"
 
 repositories {
 	mavenCentral()
@@ -18,40 +20,44 @@ repositories {
 
 dependencies {
 	intellijPlatform {
-		intellijIdeaUltimate("2023.3.3")
+		intellijIdeaUltimate("2025.3")
 		bundledPlugin("tanvd.grazi")
 		
-		// https://plugins.jetbrains.com/plugin/12175-grazie-lite/versions
+		testFramework(TestFrameworkType.JUnit5)
-		// plugin("tanvd.grazi", "233.13135.14")
 	}
 	
 	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("233.11361.10")
+			sinceBuild.set("253")
 			untilBuild.set(provider { null })
 		}
 	}
+	
+	pluginVerification {
+		freeArgs.add("-mute")
+		freeArgs.add("TemplateWordInPluginId")
+		
+		ides {
+			recommended()
+		}
+	}
 }
 
 kotlin {
-	jvmToolchain(17)
-	
 	compilerOptions {
 		freeCompilerArgs = listOf(
-			"-X" + "jvm-default=all"
+			"-X" + "jvm-default=all",
+			"-X" + "lambdas=indy"
 		)
 	}
 }
 
-tasks.withType<Test>().configureEach {
+tasks.test {
 	useJUnitPlatform()
 }
-
-val testSnapshot by intellijPlatformTesting.testIde.registering {
-	version = "LATEST-EAP-SNAPSHOT"
-	useInstaller = false
-}

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-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-2021 the original authors.
+# Copyright © 2015 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 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew 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 Gradle
+#           ksh gradlew
 #
 #       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/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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,7 +114,6 @@ 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.
@@ -172,7 +171,6 @@ 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" )
 
@@ -205,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_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" \
-        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
+@rem Set local scope for the variables, and ensure extensions are enabled
-if "%OS%"=="Windows_NT" setlocal
+setlocal EnableExtensions
 
 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
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ 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
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-@rem Execute Gradle
+@rem Execute gradlew
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@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
 
-:end
+:exitWithErrorLevel
-@rem End local scope for the variables with windows NT shell
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-if %ERRORLEVEL% equ 0 goto mainEnd
+"%COMSPEC%" /c exit %ERRORLEVEL%
-
-: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 "1.9.21"
+		kotlin("jvm") version "2.4.0" // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
-		id("org.jetbrains.intellij.platform") version "2.2.1"
+		id("org.jetbrains.intellij.platform") version "2.18.1" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
 	}
 }

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

@@ -2,10 +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.
@@ -13,27 +14,33 @@ import com.intellij.openapi.project.ProjectManager
 internal object InspectionLens {
 	const val PLUGIN_ID = "com.chylex.intellij.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.editor, service<InspectionLensPluginDisposableService>().intersect(editor))
+		EditorLensFeatures.install(editor)
 	}
 	
 	/**
 	 * Installs lenses into all open editors.
 	 */
 	fun install() {
-		forEachOpenEditor(::install)
+		forEachOpenEditor(EditorLensFeatures::install)
 	}
 	
 	/**
 	 * Refreshes lenses in all open editors.
 	 */
 	private fun refresh() {
-		forEachOpenEditor {
+		forEachOpenEditor(EditorLensFeatures::refresh)
-			EditorLensFeatures.refresh(it.editor)
-		}
 	}
 	
 	/**
@@ -49,32 +56,32 @@ internal object InspectionLens {
 	private inline fun forEachOpenEditor(action: (TextEditor) -> Unit) {
 		val projectManager = ProjectManager.getInstanceIfCreated() ?: return
 		
-		for (project in projectManager.openProjects.filterNot { it.isDisposed }) {
+		for (project in projectManager.openProjects) {
-			for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
+			if (project.isDisposed) {
+				continue
+			}
+			
+			for (editor in FileEditorManager.getInstance(project).allEditors) {
+				if (editor is TextEditor) {
 					action(editor)
 				}
 			}
 		}
+	}
 	
-	private object Refresh {
+	private object Refresh : Runnable {
-		private var needsRefresh = false
+		private val needsRefresh = AtomicBoolean(false)
 		
 		fun schedule() {
-			synchronized(this) {
+			if (needsRefresh.compareAndSet(false, true)) {
-				if (!needsRefresh) {
+				ApplicationManager.getApplication().invokeLater(this)
-					needsRefresh = true
-					ApplicationManager.getApplication().invokeLater(this::run)
-				}
 			}
 		}
 		
-		private fun run() {
+		override fun run() {
-			synchronized(this) {
+			if (needsRefresh.compareAndSet(true, false)) {
-				if (needsRefresh) {
-					needsRefresh = false
 				refresh()
 			}
 		}
 	}
-	}
 }

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

@@ -0,0 +1,22 @@
+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

@@ -1,21 +0,0 @@
-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>) {
-		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

@@ -0,0 +1,25 @@
+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,8 +8,6 @@ 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/editor/EditorLensFeatures.kt

@@ -1,10 +1,13 @@
 package com.chylex.intellij.inspectionlens.editor
 
+import com.chylex.intellij.inspectionlens.InspectionLensPluginDisposableService
 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
 
@@ -36,21 +39,24 @@ internal class EditorLensFeatures private constructor(
 	companion object {
 		private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
 		
-		fun install(editor: Editor, disposable: Disposable) {
+		fun install(owner: TextEditor) {
+			val editor = owner.editor
 			if (editor.getUserData(EDITOR_KEY) != null) {
 				return
 			}
 			
 			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) }
 		}
 		
-		fun refresh(editor: Editor) {
+		fun refresh(owner: TextEditor) {
-			editor.getUserData(EDITOR_KEY)?.refresh()
+			owner.editor.getUserData(EDITOR_KEY)?.refresh()
 		}
 	}
 }

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

@@ -15,8 +15,11 @@ internal class EditorLensManager(private val editor: Editor) {
 	private val settings = service<LensSettingsState>()
 	
 	private fun show(highlighterWithInfo: HighlighterWithInfo) {
-		val (highlighter, info) = highlighterWithInfo
+		if (editor.isDisposed) {
+			return
+		}
 		
+		val (highlighter, info) = highlighterWithInfo
 		if (!highlighter.isValid) {
 			return
 		}
@@ -85,7 +88,6 @@ 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/LensMarkupModelListener.kt

@@ -1,7 +1,9 @@
 package com.chylex.intellij.inspectionlens.editor
 
+import com.chylex.intellij.inspectionlens.InspectionLens
 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.ex.RangeHighlighterEx
 import com.intellij.openapi.editor.impl.event.MarkupModelListener
@@ -21,43 +23,30 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
 		showIfValid(highlighter)
 	}
 	
-	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
+	fun showAllValid(highlighters: Array<RangeHighlighter>) {
-		if (getFilteredHighlightInfo(highlighter) != null) {
+		if (InspectionLens.SHOW_LENSES) {
-			lensManagerDispatcher.hide(highlighter)
+			highlighters.forEach(::showIfValid)
 		}
 	}
 	
 	private fun showIfValid(highlighter: RangeHighlighter) {
-		runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
+		if (!InspectionLens.SHOW_LENSES) {
+			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)
-			}
-		}
 		}
 		
-	fun showAllValid(highlighters: Array<RangeHighlighter>) {
+		val highlighterWithInfo = HighlighterWithInfo.from(highlighter, info)
-		highlighters.forEach(::showIfValid)
+		processHighlighterWithInfo(highlighterWithInfo, lensManagerDispatcher::show, ::showAsynchronously)
-	}
-	
-	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)
@@ -66,4 +55,22 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
 			actionForImmediate(highlighterWithInfo)
 		}
 	}
+	
+	private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
+		highlighterWithInfo.requestDescription {
+			if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
+				lensManagerDispatcher.show(highlighterWithInfo)
+			}
+		}
+	}
+	
+	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
+		if (getFilteredHighlightInfo(highlighter) != null) {
+			lensManagerDispatcher.hide(highlighter)
+		}
+	}
+	
+	fun hideAll() {
+		lensManagerDispatcher.hideAll()
+	}
 }

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

@@ -14,6 +14,10 @@ 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,54 +1,136 @@
 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.actions.ShowIntentionActionsAction
+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.ide.DataManager
+import com.intellij.lang.annotation.HighlightSeverity
 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.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 {
-	fun show(editor: Editor) {
+	private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
-		if (!tryShow(editor)) {
+	
-			HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
+	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)
 		}
 	}
 	
-	private fun tryShow(editor: Editor): Boolean {
+	fun show(highlightInfo: HighlightInfo, inlay: Inlay<*>) {
-		// If the IDE uses the default Show Intentions action and handler,
+		if (!tryShow(highlightInfo, inlay)) {
-		// use the handler directly to bypass additional logic from the action.
+			showNoActionsAvailable(inlay.editor)
-		val action = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
-		if (action.javaClass === ShowIntentionActionsAction::class.java) {
-			return tryShowWithDefaultHandler(editor)
-		}
-		else {
-			ActionUtil.invokeAction(action, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
-			return true
 		}
 	}
 	
-	private fun tryShowWithDefaultHandler(editor: Editor): Boolean {
+	private fun tryShow(highlightInfo: HighlightInfo, inlay: Inlay<*>): 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()
 		
-		HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
+		ReadAction
+			.nonBlocking<IntentionsInfo> { collectIntentions(editor, project, file, highlightInfo, inlay.offset) }
+			.finishOnUiThread(ModalityState.current()) { tryShowPopup(project, file, editor, it) }
+			.submit(AppExecutorUtil.getAppExecutorService())
+		
 		return true
 	}
 	
-	private val HANDLER = object : ShowIntentionActionsHandler() {
+	private fun collectIntentions(editor: Editor, project: Project, file: PsiFile, info: HighlightInfo, offset: Int): IntentionsInfo {
-		public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
+		val intentions = mutableListOf<IntentionActionDescriptor>()
-			super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
+		
+		info.findRegisteredQuickFix { descriptor, _ ->
+			if (DumbService.getInstance(project).isUsableInCurrentContext(descriptor.action) && ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
+				intentions.add(descriptor)
 			}
+			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)
+			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)
+		}
+	}
+	
+	private fun showNoActionsAvailable(editor: Editor) {
+		HintManager.getInstance().showInformationHint(editor, "No context actions available at this location")
 	}
 }

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

@@ -44,7 +44,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 	
 	fun setPropertiesFrom(info: HighlightInfo) {
 		this.info = info
-		val description = getValidDescriptionText(info.description)
+		val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
 		
 		text = description
 		attributes = LensSeverity.from(info.severity).textAttributes
@@ -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(editor)
+				IntentionsPopup.show(info, inlay)
 			}
 		}
 	}
@@ -155,15 +155,13 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 		private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
 		private const val UNDERLINE_WIDTH_REDUCTION = (TEXT_HORIZONTAL_PADDING * 2) - 1
 		
-		private const val MAX_DESCRIPTION_LENGTH = 120
-		
 		/**
 		 * Kotlin compiler inspections have an `[UPPERCASE_TAG]` at the beginning.
 		 */
 		private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
 		
-		private fun getValidDescriptionText(text: String?): String {
+		private fun getValidDescriptionText(text: String?, maxLength: Int): String {
-			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)))
+			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
 		}
 		
 		private fun stripUppercaseTag(text: String): String {
@@ -181,9 +179,9 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 			return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
 		}
 		
-		private fun addEllipsisOrMissingPeriod(text: String): String {
+		private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
 			return when {
-				text.length > MAX_DESCRIPTION_LENGTH -> text.take(MAX_DESCRIPTION_LENGTH).trimEnd { it.isWhitespace() || it == '.' } + "…"
+				text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
 				!text.endsWith('.')     -> "$text."
 				else                    -> text
 			}

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

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

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

@@ -10,18 +10,20 @@ import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.options.BoundConfigurable
 import com.intellij.openapi.options.ConfigurableWithId
 import com.intellij.openapi.ui.DialogPanel
+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
 import com.intellij.ui.dsl.builder.Row
 import com.intellij.ui.dsl.builder.RowLayout
+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 {
@@ -75,17 +77,22 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 	override fun createPanel(): DialogPanel {
 		val settings = settingsService.state
 		
-		return panel {
+		lateinit var panel: DialogPanel
+		
+		panel = panel {
 			group("Appearance") {
 				row {
 					checkBox("Use editor font").bindSelected(settings::useEditorFont)
 				}
+				row("Max description length:") {
+					intTextField(LensSettingsState.MAX_DESCRIPTION_LENGTH_RANGE, keyboardStep = 10).bindIntText(settings::maxDescriptionLength)
+				}
 			}
 			
 			group("Behavior") {
 				row("Hover mode:") {
-					val items = LensHoverMode.values().toList()
+					val items = LensHoverMode.entries
-					val renderer = SimpleListCellRenderer.create("", LensHoverMode::description)
+					val renderer = textListCellRenderer<LensHoverMode?> { it?.description ?: "" }
 					comboBox(items, renderer).bindItem(settings::lensHoverMode) { settings.lensHoverMode = it ?: LensHoverMode.DEFAULT }
 				}
 			}
@@ -105,8 +112,21 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 					checkBox("Other").bindSelected(settings::showUnknownSeverities)
 				}
 			}
+			
+			group("Actions") {
+				row {
+					button("Reset to Default") {
+						if (MessageDialogBuilder.yesNo("Reset to Default", "Are you sure you want to reset settings to default?").ask(panel)) {
+							settingsService.resetState()
+							reset()
 						}
 					}
+				}
+			}
+		}
+		
+		return panel
+	}
 	
 	private fun <K, V> Cell<JBCheckBox>.bindSelectedToNotIn(collection: MutableMap<K, V>, key: K, value: V): Cell<JBCheckBox> {
 		return bindSelected({ key !in collection }, { if (it) collection.remove(key) else collection[key] = value })

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

@@ -21,9 +21,14 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 		
 		var showUnknownSeverities by property(true)
 		var useEditorFont by property(true)
+		var maxDescriptionLength by property(120)
 		var lensHoverMode by enum(LensHoverMode.DEFAULT)
 	}
 	
+	companion object {
+		val MAX_DESCRIPTION_LENGTH_RANGE = 20..1000
+	}
+	
 	@get:Synchronized
 	@set:Synchronized
 	var severityFilter = createSeverityFilter()
@@ -32,11 +37,27 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 	val useEditorFont
 		get() = state.useEditorFont
 	
+	val maxDescriptionLength
+		get() = state.maxDescriptionLength
+	
 	val lensHoverMode
 		get() = state.lensHoverMode
 	
 	override fun loadState(state: State) {
 		super.loadState(state)
+		state.maxDescriptionLength = state.maxDescriptionLength.coerceIn(MAX_DESCRIPTION_LENGTH_RANGE)
+		update()
+	}
+	
+	fun resetState() {
+		val default = State()
+		
+		state.hiddenSeverities.apply { clear(); putAll(default.hiddenSeverities) }
+		state.showUnknownSeverities = default.showUnknownSeverities
+		state.useEditorFont = default.useEditorFont
+		state.maxDescriptionLength = default.maxDescriptionLength
+		state.lensHoverMode = default.lensHoverMode
+		
 		update()
 	}
 	

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

@@ -14,12 +14,34 @@
   ]]></description>
   
   <change-notes><![CDATA[
+    <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>
@@ -29,51 +51,62 @@
       <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>
@@ -91,11 +124,17 @@
                              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.InspectionLensFileOpenedListener" topic="com.intellij.openapi.fileEditor.FileOpenedSyncListener" />
+    <listener class="com.chylex.intellij.inspectionlens.InspectionLensFileEditorManagerListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener" />
   </projectListeners>
 </idea-plugin>