mirror of
				https://github.com/chylex/IntelliJ-Inspection-Lens.git
				synced 2025-11-03 09:40:10 +01:00 
			
		
		
		
	Compare commits
	
		
			27 Commits
		
	
	
		
			fd860fd390
			...
			toolbox-rr
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						e847b196e3
	
				 | 
					
					
						|||
| 
						
						
							
						
						2be1144cbf
	
				 | 
					
					
						|||
| 
						
						
							
						
						fbe67d6068
	
				 | 
					
					
						|||
| 
						
						
							
						
						98d3e5db01
	
				 | 
					
					
						|||
| 
						
						
							
						
						102352a2eb
	
				 | 
					
					
						|||
| 
						
						
							
						
						3aeeb32bef
	
				 | 
					
					
						|||
| 
						
						
							
						
						0bc85fd69b
	
				 | 
					
					
						|||
| 
						
						
							
						
						cde4d81afe
	
				 | 
					
					
						|||
| 
						
						
							
						
						b1d6ed4d30
	
				 | 
					
					
						|||
| 
						
						
							
						
						2a4764fa15
	
				 | 
					
					
						|||
| 
						
						
							
						
						4bd0931d71
	
				 | 
					
					
						|||
| 
						
						
							
						
						0f41b22872
	
				 | 
					
					
						|||
| 
						
						
							
						
						603b35abdb
	
				 | 
					
					
						|||
| 
						
						
							
						
						08ed1aadea
	
				 | 
					
					
						|||
| 
						
						
							
						
						8936f0e5be
	
				 | 
					
					
						|||
| 
						
						
							
						
						89e71d5301
	
				 | 
					
					
						|||
| 
						
						
							
						
						4c80573375
	
				 | 
					
					
						|||
| 
						
						
							
						
						816440a150
	
				 | 
					
					
						|||
| 
						
						
							
						
						4899498522
	
				 | 
					
					
						|||
| 
						
						
							
						
						8ee14ff55e
	
				 | 
					
					
						|||
| 
						
						
							
						
						632a052ff9
	
				 | 
					
					
						|||
| 
						
						
							
						
						f2ec3c3d9b
	
				 | 
					
					
						|||
| 
						
						
							
						
						624254fba3
	
				 | 
					
					
						|||
| 
						
						
							
						
						c1b52ec3a5
	
				 | 
					
					
						|||
| 
						
						
							
						
						a84bc72fd4
	
				 | 
					
					
						|||
| 
						
						
							
						
						e28804ad5d
	
				 | 
					
					
						|||
| 
						
						
							
						
						043c02e432
	
				 | 
					
					
						
							
								
								
									
										2
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
								
							@@ -1,3 +1 @@
 | 
			
		||||
github: chylex
 | 
			
		||||
patreon: chylex
 | 
			
		||||
ko_fi: chylex
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,7 @@
 | 
			
		||||
/.idea/*
 | 
			
		||||
!/.idea/dictionaries
 | 
			
		||||
!/.idea/runConfigurations
 | 
			
		||||
 | 
			
		||||
/.gradle/
 | 
			
		||||
/.intellijPlatform/
 | 
			
		||||
/build/
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								.idea/dictionaries/default_user.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.idea/dictionaries/default_user.xml
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
<component name="ProjectDictionaryState">
 | 
			
		||||
  <dictionary name="default.user">
 | 
			
		||||
    <words>
 | 
			
		||||
      <w>inspectionlens</w>
 | 
			
		||||
    </words>
 | 
			
		||||
  </dictionary>
 | 
			
		||||
</component>
 | 
			
		||||
@@ -1,10 +1,10 @@
 | 
			
		||||
# Inspection Lens <img align="right" src="logo.png" alt="Plugin Logo">
 | 
			
		||||
 | 
			
		||||
IntelliJ plugin that shows errors, warnings, and other inspection highlights inline.
 | 
			
		||||
Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
 | 
			
		||||
 | 
			
		||||
After installing the plugin, inspection descriptions will appear after the ends of lines, and the lines will be highlighted with a background color. Shown inspection severities are **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections from plugins or future IntelliJ versions that have a high enough severity level. Each severity has a different color, with support for both light and dark themes.
 | 
			
		||||
By default, the plugin shows **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections with a high enough severity level. Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
 | 
			
		||||
 | 
			
		||||
Note: The plugin is not customizable outside the ability to disable/enable the plugin without restarting the IDE. If the defaults don't work for you, I recommend trying the [Inline Error](https://plugins.jetbrains.com/plugin/17302-inlineerror) plugin which can be customized, building your own version of Inspection Lens, or proposing your change in the [issue tracker](https://github.com/chylex/IntelliJ-Inspection-Lens/issues).
 | 
			
		||||
Configure appearance, behavior of clicking on inspections, and visible severities in **Settings | Tools | Inspection Lens**.
 | 
			
		||||
 | 
			
		||||
Inspired by [Error Lens](https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens) for Visual Studio Code, and [Inline Error](https://plugins.jetbrains.com/plugin/17302-inlineerror) for IntelliJ Platform.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,48 +1,50 @@
 | 
			
		||||
@file:Suppress("ConvertLambdaToReference")
 | 
			
		||||
 | 
			
		||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 | 
			
		||||
 | 
			
		||||
plugins {
 | 
			
		||||
	kotlin("jvm") version "1.8.0"
 | 
			
		||||
	id("org.jetbrains.intellij") version "1.17.0"
 | 
			
		||||
	kotlin("jvm")
 | 
			
		||||
	id("org.jetbrains.intellij.platform")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
group = "com.chylex.intellij.inspectionlens"
 | 
			
		||||
version = "1.3.3"
 | 
			
		||||
version = "1.5.2.902"
 | 
			
		||||
 | 
			
		||||
repositories {
 | 
			
		||||
	mavenCentral()
 | 
			
		||||
	
 | 
			
		||||
	intellijPlatform {
 | 
			
		||||
		defaultRepositories()
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
intellij {
 | 
			
		||||
	version.set("2023.3.3")
 | 
			
		||||
	updateSinceUntilBuild.set(false)
 | 
			
		||||
dependencies {
 | 
			
		||||
	intellijPlatform {
 | 
			
		||||
		rustRover("2025.1.2", useInstaller = false)
 | 
			
		||||
		bundledPlugin("tanvd.grazi")
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	plugins.add("tanvd.grazi")
 | 
			
		||||
	testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
intellijPlatform {
 | 
			
		||||
	pluginConfiguration {
 | 
			
		||||
		ideaVersion {
 | 
			
		||||
			sinceBuild.set("233.11361.10")
 | 
			
		||||
			untilBuild.set(provider { null })
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
kotlin {
 | 
			
		||||
	jvmToolchain(17)
 | 
			
		||||
}
 | 
			
		||||
	
 | 
			
		||||
dependencies {
 | 
			
		||||
	testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
 | 
			
		||||
	compilerOptions {
 | 
			
		||||
		freeCompilerArgs = listOf(
 | 
			
		||||
			"-X" + "jvm-default=all",
 | 
			
		||||
			"-X" + "lambdas=indy"
 | 
			
		||||
		)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
tasks.patchPluginXml {
 | 
			
		||||
	sinceBuild.set("233.11361.10")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.buildSearchableOptions {
 | 
			
		||||
	enabled = false
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.test {
 | 
			
		||||
	useJUnitPlatform()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.withType<KotlinCompile> {
 | 
			
		||||
	kotlinOptions.freeCompilerArgs = listOf(
 | 
			
		||||
		"-Xjvm-default=all"
 | 
			
		||||
	)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
distributionBase=GRADLE_USER_HOME
 | 
			
		||||
distributionPath=wrapper/dists
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 | 
			
		||||
networkTimeout=10000
 | 
			
		||||
validateDistributionUrl=true
 | 
			
		||||
zipStoreBase=GRADLE_USER_HOME
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								gradlew
									
									
									
									
										vendored
									
									
								
							@@ -15,6 +15,8 @@
 | 
			
		||||
# See the License for the specific language governing permissions and
 | 
			
		||||
# limitations under the License.
 | 
			
		||||
#
 | 
			
		||||
# SPDX-License-Identifier: Apache-2.0
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
##############################################################################
 | 
			
		||||
#
 | 
			
		||||
@@ -55,7 +57,7 @@
 | 
			
		||||
#       Darwin, MinGW, and NonStop.
 | 
			
		||||
#
 | 
			
		||||
#   (3) This script is generated from the Groovy template
 | 
			
		||||
#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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/.
 | 
			
		||||
@@ -84,7 +86,7 @@ done
 | 
			
		||||
# shellcheck disable=SC2034
 | 
			
		||||
APP_BASE_NAME=${0##*/}
 | 
			
		||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
 | 
			
		||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 | 
			
		||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 | 
			
		||||
 | 
			
		||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
 | 
			
		||||
MAX_FD=maximum
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										22
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							@@ -13,6 +13,8 @@
 | 
			
		||||
@rem See the License for the specific language governing permissions and
 | 
			
		||||
@rem limitations under the License.
 | 
			
		||||
@rem
 | 
			
		||||
@rem SPDX-License-Identifier: Apache-2.0
 | 
			
		||||
@rem
 | 
			
		||||
 | 
			
		||||
@if "%DEBUG%"=="" @echo off
 | 
			
		||||
@rem ##########################################################################
 | 
			
		||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 | 
			
		||||
%JAVA_EXE% -version >NUL 2>&1
 | 
			
		||||
if %ERRORLEVEL% equ 0 goto execute
 | 
			
		||||
 | 
			
		||||
echo.
 | 
			
		||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 | 
			
		||||
echo.
 | 
			
		||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
			
		||||
echo location of your Java installation.
 | 
			
		||||
echo. 1>&2
 | 
			
		||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 | 
			
		||||
 | 
			
		||||
if exist "%JAVA_EXE%" goto execute
 | 
			
		||||
 | 
			
		||||
echo.
 | 
			
		||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 | 
			
		||||
echo.
 | 
			
		||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
			
		||||
echo location of your Java installation.
 | 
			
		||||
echo. 1>&2
 | 
			
		||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,8 @@
 | 
			
		||||
rootProject.name = "InspectionLens"
 | 
			
		||||
 | 
			
		||||
pluginManagement {
 | 
			
		||||
	plugins {
 | 
			
		||||
		kotlin("jvm") version "2.1.0"
 | 
			
		||||
		id("org.jetbrains.intellij.platform") version "2.6.0"
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,12 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.EditorLensManager
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.LensMarkupModelListener
 | 
			
		||||
import com.intellij.openapi.Disposable
 | 
			
		||||
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 com.intellij.openapi.rd.createLifetime
 | 
			
		||||
import com.intellij.openapi.rd.createNestedDisposable
 | 
			
		||||
import com.jetbrains.rd.util.lifetime.Lifetime
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Handles installation and uninstallation of plugin features in editors.
 | 
			
		||||
@@ -17,11 +14,13 @@ import com.jetbrains.rd.util.lifetime.Lifetime
 | 
			
		||||
internal object InspectionLens {
 | 
			
		||||
	const val PLUGIN_ID = "com.chylex.intellij.inspectionlens"
 | 
			
		||||
	
 | 
			
		||||
	val LOG = logger<InspectionLens>()
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * Installs lenses into [editor].
 | 
			
		||||
	 */
 | 
			
		||||
	fun install(editor: TextEditor) {
 | 
			
		||||
		LensMarkupModelListener.register(editor.editor, createEditorDisposable(editor))
 | 
			
		||||
		EditorLensFeatures.install(editor.editor, service<InspectionLensPluginDisposableService>().intersect(editor))
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
@@ -31,31 +30,20 @@ internal object InspectionLens {
 | 
			
		||||
		forEachOpenEditor(::install)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * Uninstalls lenses from all open editors.
 | 
			
		||||
	 */
 | 
			
		||||
	fun uninstall() {
 | 
			
		||||
		forEachOpenEditor {
 | 
			
		||||
			EditorLensManager.remove(it.editor)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * Refreshes lenses in all open editors.
 | 
			
		||||
	 */
 | 
			
		||||
	fun refresh() {
 | 
			
		||||
	private fun refresh() {
 | 
			
		||||
		forEachOpenEditor {
 | 
			
		||||
			LensMarkupModelListener.refresh(it.editor)
 | 
			
		||||
			EditorLensFeatures.refresh(it.editor)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * Creates a [Disposable] that will be disposed when either the [TextEditor] is disposed or the plugin is unloaded.
 | 
			
		||||
	 * Schedules a refresh of lenses in all open editors.
 | 
			
		||||
	 */
 | 
			
		||||
	private fun createEditorDisposable(textEditor: TextEditor): Disposable {
 | 
			
		||||
		val pluginLifetime = ApplicationManager.getApplication().getService(InspectionLensPluginDisposableService::class.java).createLifetime()
 | 
			
		||||
		val editorLifetime = textEditor.createLifetime()
 | 
			
		||||
		return Lifetime.intersect(pluginLifetime, editorLifetime).createNestedDisposable("InspectionLensIntersectedLifetime")
 | 
			
		||||
	fun scheduleRefresh() {
 | 
			
		||||
		Refresh.schedule()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
@@ -70,4 +58,26 @@ internal object InspectionLens {
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private object Refresh {
 | 
			
		||||
		private var needsRefresh = false
 | 
			
		||||
		
 | 
			
		||||
		fun schedule() {
 | 
			
		||||
			synchronized(this) {
 | 
			
		||||
				if (!needsRefresh) {
 | 
			
		||||
					needsRefresh = true
 | 
			
		||||
					ApplicationManager.getApplication().invokeLater(this::run)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun run() {
 | 
			
		||||
			synchronized(this) {
 | 
			
		||||
				if (needsRefresh) {
 | 
			
		||||
					needsRefresh = false
 | 
			
		||||
					refresh()
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,8 @@ import com.intellij.openapi.vfs.VirtualFile
 | 
			
		||||
 */
 | 
			
		||||
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) {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,21 @@ package com.chylex.intellij.inspectionlens
 | 
			
		||||
 | 
			
		||||
import com.intellij.openapi.Disposable
 | 
			
		||||
import com.intellij.openapi.components.Service
 | 
			
		||||
import com.intellij.openapi.rd.createLifetime
 | 
			
		||||
import com.intellij.openapi.rd.createNestedDisposable
 | 
			
		||||
import com.jetbrains.rd.util.lifetime.Lifetime
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Gets automatically disposed when the plugin is unloaded.
 | 
			
		||||
 */
 | 
			
		||||
@Service
 | 
			
		||||
class InspectionLensPluginDisposableService : Disposable {
 | 
			
		||||
	/**
 | 
			
		||||
	 * Creates a [Disposable] that will be disposed when either plugin is unloaded, or the [other] [Disposable] is disposed.
 | 
			
		||||
	 */
 | 
			
		||||
	fun intersect(other: Disposable): Disposable {
 | 
			
		||||
		return Lifetime.intersect(createLifetime(), other.createLifetime()).createNestedDisposable("InspectionLensIntersectedLifetime")
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun dispose() {}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ import com.intellij.ide.plugins.DynamicPluginListener
 | 
			
		||||
import com.intellij.ide.plugins.IdeaPluginDescriptor
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Installs [InspectionLens] in open editors when the plugin is loaded, and uninstalls it when the plugin is unloaded.
 | 
			
		||||
 * Installs [InspectionLens] in open editors when the plugin is loaded.
 | 
			
		||||
 */
 | 
			
		||||
class InspectionLensPluginListener : DynamicPluginListener {
 | 
			
		||||
	override fun pluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
 | 
			
		||||
@@ -12,10 +12,4 @@ class InspectionLensPluginListener : DynamicPluginListener {
 | 
			
		||||
			InspectionLens.install()
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun beforePluginUnload(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {
 | 
			
		||||
		if (pluginDescriptor.pluginId.idString == InspectionLens.PLUGIN_ID) {
 | 
			
		||||
			InspectionLens.uninstall()
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,25 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens
 | 
			
		||||
 | 
			
		||||
import com.intellij.openapi.application.ApplicationManager
 | 
			
		||||
 | 
			
		||||
object InspectionLensRefresher {
 | 
			
		||||
	private var needsRefresh = false
 | 
			
		||||
	
 | 
			
		||||
	fun scheduleRefresh() {
 | 
			
		||||
		synchronized(this) {
 | 
			
		||||
			if (!needsRefresh) {
 | 
			
		||||
				needsRefresh = true
 | 
			
		||||
				ApplicationManager.getApplication().invokeLater(::refresh)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun refresh() {
 | 
			
		||||
		synchronized(this) {
 | 
			
		||||
			if (needsRefresh) {
 | 
			
		||||
				needsRefresh = false
 | 
			
		||||
				InspectionLens.refresh()
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.compatibility
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.LensSeverity
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverity
 | 
			
		||||
import com.intellij.grazie.ide.TextProblemSeverities
 | 
			
		||||
import com.intellij.openapi.project.Project
 | 
			
		||||
import com.intellij.openapi.startup.ProjectActivity
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,12 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.compatibility
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.LensSeverity
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverity
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.openapi.diagnostic.logger
 | 
			
		||||
import com.intellij.profile.codeInspection.InspectionProfileManager
 | 
			
		||||
import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
 | 
			
		||||
 | 
			
		||||
object SpellCheckerSupport {
 | 
			
		||||
internal object SpellCheckerSupport {
 | 
			
		||||
	private val log = logger<SpellCheckerSupport>()
 | 
			
		||||
	
 | 
			
		||||
	fun load() {
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,5 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.debug
 | 
			
		||||
 | 
			
		||||
import java.time.Instant
 | 
			
		||||
 | 
			
		||||
data class LensEvent(val time: Instant, val data: LensEventData)
 | 
			
		||||
@@ -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
 | 
			
		||||
}
 | 
			
		||||
@@ -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))
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,36 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
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) {
 | 
			
		||||
	fun update(info: HighlightInfo): Boolean {
 | 
			
		||||
		val editor = inlay.editor
 | 
			
		||||
		
 | 
			
		||||
		if (!inlay.tryUpdate(info)) {
 | 
			
		||||
			inlay = EditorLensInlay.show(editor, info) ?: return false
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (lineBackground.shouldRecreate(info)) {
 | 
			
		||||
			lineBackground.hide(editor)
 | 
			
		||||
			lineBackground = EditorLensLineBackground.show(editor, info)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		return true
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun hide() {
 | 
			
		||||
		val editor = inlay.editor
 | 
			
		||||
		
 | 
			
		||||
		inlay.hide()
 | 
			
		||||
		lineBackground.hide(editor)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		fun show(editor: Editor, info: HighlightInfo): EditorLens? {
 | 
			
		||||
			val inlay = EditorLensInlay.show(editor, info) ?: return null
 | 
			
		||||
			val lineBackground = EditorLensLineBackground.show(editor, info)
 | 
			
		||||
			return EditorLens(inlay, lineBackground)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,66 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLens
 | 
			
		||||
import com.intellij.openapi.Disposable
 | 
			
		||||
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.util.Disposer
 | 
			
		||||
import com.intellij.openapi.util.Key
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Manages Inspection Lens features for a single [Editor].
 | 
			
		||||
 */
 | 
			
		||||
internal class EditorLensFeatures private constructor(
 | 
			
		||||
	editor: Editor,
 | 
			
		||||
	private val markupModel: MarkupModelEx,
 | 
			
		||||
	foldingModel: FoldingModelEx?,
 | 
			
		||||
	disposable: Disposable
 | 
			
		||||
) {
 | 
			
		||||
	private val lensManager = EditorLensManager(editor)
 | 
			
		||||
	private val lensManagerDispatcher = EditorLensManagerDispatcher(lensManager)
 | 
			
		||||
	private val markupModelListener = LensMarkupModelListener(editor, lensManagerDispatcher)
 | 
			
		||||
	
 | 
			
		||||
	init {
 | 
			
		||||
		markupModel.addMarkupModelListener(disposable, markupModelListener)
 | 
			
		||||
		markupModelListener.showAllValid(markupModel.allHighlighters)
 | 
			
		||||
		
 | 
			
		||||
		foldingModel?.addListener(LensFoldingModelListener(lensManager), disposable)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun refresh() {
 | 
			
		||||
		markupModelListener.hideAll()
 | 
			
		||||
		markupModelListener.showAllValid(markupModel.allHighlighters)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
 | 
			
		||||
		
 | 
			
		||||
		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 features = EditorLensFeatures(editor, markupModel, foldingModel, disposable)
 | 
			
		||||
			
 | 
			
		||||
			editor.putUserData(EDITOR_KEY, features)
 | 
			
		||||
			
 | 
			
		||||
			Disposer.register(disposable) {
 | 
			
		||||
				InspectionLens.LOG.info("Installation disposed: $editor", Exception("DISPOSE STACK TRACE"))
 | 
			
		||||
				editor.putUserData(EDITOR_KEY, null)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		fun refresh(editor: Editor) {
 | 
			
		||||
			val userData = editor.getUserData(EDITOR_KEY)
 | 
			
		||||
			InspectionLens.LOG.info("Refreshing: $editor ($userData)")
 | 
			
		||||
			userData?.refresh()
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,31 +1,23 @@
 | 
			
		||||
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
 | 
			
		||||
import com.intellij.openapi.util.Key
 | 
			
		||||
import java.util.IdentityHashMap
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Manages visible inspection lenses for an [Editor].
 | 
			
		||||
 */
 | 
			
		||||
class EditorLensManager private constructor(private val editor: Editor) {
 | 
			
		||||
	companion object {
 | 
			
		||||
		private val EDITOR_KEY = Key<EditorLensManager>(EditorLensManager::class.java.name)
 | 
			
		||||
		
 | 
			
		||||
		fun getOrCreate(editor: Editor): EditorLensManager {
 | 
			
		||||
			return editor.getUserData(EDITOR_KEY) ?: EditorLensManager(editor).also { editor.putUserData(EDITOR_KEY, it) }
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		fun remove(editor: Editor) {
 | 
			
		||||
			val manager = editor.getUserData(EDITOR_KEY)
 | 
			
		||||
			if (manager != null) {
 | 
			
		||||
				manager.hideAll()
 | 
			
		||||
				editor.putUserData(EDITOR_KEY, null)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
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
 | 
			
		||||
@@ -36,14 +28,14 @@ class EditorLensManager private constructor(private val editor: Editor) {
 | 
			
		||||
		
 | 
			
		||||
		val existingLens = lenses[highlighter]
 | 
			
		||||
		if (existingLens != null) {
 | 
			
		||||
			if (existingLens.update(info)) {
 | 
			
		||||
			if (existingLens.update(info, settings)) {
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			existingLens.hide()
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		val newLens = EditorLens.show(editor, info)
 | 
			
		||||
		val newLens = EditorLens.show(editor, info, settings)
 | 
			
		||||
		if (newLens != null) {
 | 
			
		||||
			lenses[highlighter] = newLens
 | 
			
		||||
		}
 | 
			
		||||
@@ -69,6 +61,10 @@ class EditorLensManager private constructor(private val editor: Editor) {
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun onFoldRegionsChanged() {
 | 
			
		||||
		lenses.values.forEach(EditorLens::onFoldRegionsChanged)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	sealed interface Command {
 | 
			
		||||
		fun apply(lensManager: EditorLensManager)
 | 
			
		||||
		
 | 
			
		||||
@@ -83,6 +79,12 @@ class EditorLensManager private constructor(private val editor: Editor) {
 | 
			
		||||
				lensManager.hide(highlighter)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		object HideAll : Command {
 | 
			
		||||
			override fun apply(lensManager: EditorLensManager) {
 | 
			
		||||
				lensManager.hideAll()
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
import com.intellij.openapi.application.ApplicationManager
 | 
			
		||||
import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
 | 
			
		||||
class EditorLensManagerDispatcher(private val lensManager: EditorLensManager) {
 | 
			
		||||
internal class EditorLensManagerDispatcher(private val lensManager: EditorLensManager) {
 | 
			
		||||
	private var queuedItems = mutableListOf<EditorLensManager.Command>()
 | 
			
		||||
	private var isEnqueued = false
 | 
			
		||||
	
 | 
			
		||||
@@ -15,6 +15,10 @@ class EditorLensManagerDispatcher(private val lensManager: EditorLensManager) {
 | 
			
		||||
		enqueue(EditorLensManager.Command.Hide(highlighter))
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun hideAll() {
 | 
			
		||||
		enqueue(EditorLensManager.Command.HideAll)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun enqueue(item: EditorLensManager.Command) {
 | 
			
		||||
		synchronized(this) {
 | 
			
		||||
			queuedItems.add(item)
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,12 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.intellij.openapi.editor.ex.FoldingListener
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Listens for code folding events and reports them to [EditorLensManager].
 | 
			
		||||
 */
 | 
			
		||||
internal class LensFoldingModelListener(private val lensManager: EditorLensManager) : FoldingListener {
 | 
			
		||||
	override fun onFoldProcessingEnd() {
 | 
			
		||||
		lensManager.onFoldRegionsChanged()
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,36 +1,51 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.settings.LensSettings
 | 
			
		||||
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.openapi.Disposable
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.ex.MarkupModelEx
 | 
			
		||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
 | 
			
		||||
import com.intellij.openapi.editor.impl.DocumentMarkupModel
 | 
			
		||||
import com.intellij.openapi.editor.impl.event.MarkupModelListener
 | 
			
		||||
import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
import com.intellij.openapi.util.Disposer
 | 
			
		||||
import com.intellij.openapi.util.Key
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Listens for inspection highlights and reports them to [EditorLensManager].
 | 
			
		||||
 */
 | 
			
		||||
internal class LensMarkupModelListener private constructor(editor: Editor) : MarkupModelListener {
 | 
			
		||||
	private val lensManagerDispatcher = EditorLensManagerDispatcher(EditorLensManager.getOrCreate(editor))
 | 
			
		||||
	private val severityFilter = LensSettings.createSeverityFilter()
 | 
			
		||||
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)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
 | 
			
		||||
		if (getFilteredHighlightInfo(highlighter) != null) {
 | 
			
		||||
		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) {
 | 
			
		||||
@@ -45,28 +60,25 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun showAllValid(highlighters: Array<RangeHighlighter>) {
 | 
			
		||||
	fun showAllValid(highlighters: Array<RangeHighlighter>) {
 | 
			
		||||
		highlighters.forEach(::showIfValid)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun hideAll() {
 | 
			
		||||
		lensManagerDispatcher.hideAll()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
 | 
			
		||||
		return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { severityFilter.test(it.severity) }
 | 
			
		||||
		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 = getHighlightInfoIfValid(highlighter)
 | 
			
		||||
		val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
 | 
			
		||||
		if (info != null) {
 | 
			
		||||
			processHighlighterWithInfo(HighlighterWithInfo.from(highlighter, info), actionForImmediate, actionForAsync)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun getHighlightInfoIfValid(highlighter: RangeHighlighter): HighlightInfo? {
 | 
			
		||||
		return highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		private val EDITOR_KEY = Key<LensMarkupModelListener>(LensMarkupModelListener::class.java.name)
 | 
			
		||||
		
 | 
			
		||||
	private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
 | 
			
		||||
		if (highlighterWithInfo is HighlighterWithInfo.Async) {
 | 
			
		||||
			actionForAsync(highlighterWithInfo)
 | 
			
		||||
@@ -75,37 +87,4 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
 | 
			
		||||
			actionForImmediate(highlighterWithInfo)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
		
 | 
			
		||||
		private fun getMarkupModel(editor: Editor): MarkupModelEx? {
 | 
			
		||||
			return DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
		 * Attaches a new [LensMarkupModelListener] to the [Editor], and reports all existing inspection highlights to [EditorLensManager].
 | 
			
		||||
		 */
 | 
			
		||||
		fun register(editor: Editor, disposable: Disposable) {
 | 
			
		||||
			if (editor.getUserData(EDITOR_KEY) != null) {
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			val markupModel = getMarkupModel(editor) ?: return
 | 
			
		||||
			val listener = LensMarkupModelListener(editor)
 | 
			
		||||
			
 | 
			
		||||
			editor.putUserData(EDITOR_KEY, listener)
 | 
			
		||||
			Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
 | 
			
		||||
			
 | 
			
		||||
			markupModel.addMarkupModelListener(disposable, listener)
 | 
			
		||||
			listener.showAllValid(markupModel.allHighlighters)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
		 * Recreates all inspection highlights in the [Editor].
 | 
			
		||||
		 */
 | 
			
		||||
		fun refresh(editor: Editor) {
 | 
			
		||||
			val listener = editor.getUserData(EDITOR_KEY) ?: return
 | 
			
		||||
			val markupModel = getMarkupModel(editor) ?: return
 | 
			
		||||
			
 | 
			
		||||
			listener.showAllValid(markupModel.allHighlighters)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,61 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HintRenderer
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.Inlay
 | 
			
		||||
import com.intellij.openapi.editor.markup.TextAttributes
 | 
			
		||||
import com.intellij.openapi.util.text.StringUtil
 | 
			
		||||
import java.awt.Graphics
 | 
			
		||||
import java.awt.Rectangle
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Renders the text of an inspection lens.
 | 
			
		||||
 */
 | 
			
		||||
class LensRenderer(info: HighlightInfo) : HintRenderer(null) {
 | 
			
		||||
	private lateinit var severity: LensSeverity
 | 
			
		||||
	
 | 
			
		||||
	init {
 | 
			
		||||
		setPropertiesFrom(info)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun setPropertiesFrom(info: HighlightInfo) {
 | 
			
		||||
		text = getValidDescriptionText(info.description)
 | 
			
		||||
		severity = LensSeverity.from(info.severity)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun paint(inlay: Inlay<*>, g: Graphics, r: Rectangle, textAttributes: TextAttributes) {
 | 
			
		||||
		fixBaselineForTextRendering(r)
 | 
			
		||||
		super.paint(inlay, g, r, textAttributes)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun getTextAttributes(editor: Editor): TextAttributes {
 | 
			
		||||
		return severity.textAttributes
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun useEditorFont(): Boolean {
 | 
			
		||||
		return true
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private companion object {
 | 
			
		||||
		private fun getValidDescriptionText(text: String?): String {
 | 
			
		||||
			return if (text.isNullOrBlank()) " " else addMissingPeriod(unescapeHtmlEntities(text))
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun unescapeHtmlEntities(potentialHtml: String): String {
 | 
			
		||||
			return potentialHtml.ifContains('&', StringUtil::unescapeXmlEntities)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun addMissingPeriod(text: String): String {
 | 
			
		||||
			return if (text.endsWith('.')) text else "$text."
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private inline fun String.ifContains(charToTest: Char, action: (String) -> String): String {
 | 
			
		||||
			return if (this.contains(charToTest)) action(this) else this
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun fixBaselineForTextRendering(rect: Rectangle) {
 | 
			
		||||
			rect.y += 1
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,18 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import java.util.function.Predicate
 | 
			
		||||
 | 
			
		||||
class LensSeverityFilter(private val disabledSeverityIds: Set<String>) : Predicate<HighlightSeverity> {
 | 
			
		||||
	override fun test(severity: HighlightSeverity): Boolean {
 | 
			
		||||
		return Global.test(severity) && severity.name !in disabledSeverityIds
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	object Global {
 | 
			
		||||
		private val MINIMUM_SEVERITY = HighlightSeverity.TEXT_ATTRIBUTES.myVal + 1
 | 
			
		||||
		
 | 
			
		||||
		fun test(severity: HighlightSeverity): Boolean {
 | 
			
		||||
			return severity.myVal >= MINIMUM_SEVERITY
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,47 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
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(info: HighlightInfo, settings: LensSettingsState): Boolean {
 | 
			
		||||
		val editor = inlay.editor
 | 
			
		||||
		val oldSeverity = severity
 | 
			
		||||
		
 | 
			
		||||
		severity = LensSeverity.from(info.severity)
 | 
			
		||||
		
 | 
			
		||||
		if (!inlay.tryUpdate(info)) {
 | 
			
		||||
			inlay = EditorLensInlay.show(editor, info, settings) ?: return false
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (lineBackground.isInvalid || oldSeverity != severity) {
 | 
			
		||||
			lineBackground.hide(editor)
 | 
			
		||||
			lineBackground = EditorLensLineBackground.show(editor, info)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		return true
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun onFoldRegionsChanged() {
 | 
			
		||||
		lineBackground.onFoldRegionsChanged(inlay.editor, severity)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun hide() {
 | 
			
		||||
		inlay.hide()
 | 
			
		||||
		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
 | 
			
		||||
			val lineBackground = EditorLensLineBackground.show(editor, info)
 | 
			
		||||
			val severity = LensSeverity.from(info.severity)
 | 
			
		||||
			return EditorLens(inlay, lineBackground, severity)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.Inlay
 | 
			
		||||
@@ -25,14 +26,19 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		fun show(editor: Editor, info: HighlightInfo): EditorLensInlay? {
 | 
			
		||||
		fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLensInlay? {
 | 
			
		||||
			val offset = getInlayHintOffset(info)
 | 
			
		||||
			val priority = getInlayHintPriority(editor, info)
 | 
			
		||||
			val renderer = LensRenderer(info, settings)
 | 
			
		||||
			
 | 
			
		||||
			val renderer = LensRenderer(info)
 | 
			
		||||
			val properties = InlayProperties().relatesToPrecedingText(true).disableSoftWrapping(true).priority(priority)
 | 
			
		||||
			val properties = InlayProperties()
 | 
			
		||||
				.relatesToPrecedingText(true)
 | 
			
		||||
				.disableSoftWrapping(true)
 | 
			
		||||
				.priority(priority)
 | 
			
		||||
			
 | 
			
		||||
			return editor.inlayModel.addAfterLineEndElement(offset, properties, renderer)?.let(::EditorLensInlay)
 | 
			
		||||
			return editor.inlayModel.addAfterLineEndElement(offset, properties, renderer)
 | 
			
		||||
				?.also(renderer::setInlay)
 | 
			
		||||
				?.let(::EditorLensInlay)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
@@ -1,34 +1,22 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
 | 
			
		||||
import com.intellij.openapi.editor.markup.HighlighterLayer
 | 
			
		||||
import com.intellij.openapi.editor.markup.HighlighterTargetArea.LINES_IN_RANGE
 | 
			
		||||
import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
import com.intellij.openapi.editor.markup.TextAttributes
 | 
			
		||||
 | 
			
		||||
@JvmInline
 | 
			
		||||
internal value class EditorLensLineBackground(private val highlighter: RangeHighlighter) {
 | 
			
		||||
	@Suppress("RedundantIf")
 | 
			
		||||
	fun shouldRecreate(info: HighlightInfo): Boolean {
 | 
			
		||||
		if (!highlighter.isValid) {
 | 
			
		||||
			return true
 | 
			
		||||
	val isInvalid
 | 
			
		||||
		get() = !highlighter.isValid
 | 
			
		||||
	
 | 
			
		||||
	fun onFoldRegionsChanged(editor: Editor, severity: LensSeverity) {
 | 
			
		||||
		if (highlighter is RangeHighlighterEx) {
 | 
			
		||||
			highlighter.textAttributes = getAttributes(editor, highlighter.startOffset, highlighter.endOffset, severity)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		val severity = LensSeverity.from(info.severity)
 | 
			
		||||
		
 | 
			
		||||
		val currentTextAttributes = highlighter.getTextAttributes(null)
 | 
			
		||||
		val newTextAttributes = severity.lineAttributes
 | 
			
		||||
		if (currentTextAttributes !== newTextAttributes) {
 | 
			
		||||
			return true
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		val currentLayer = highlighter.layer
 | 
			
		||||
		val newLayer = getHighlightLayer(severity)
 | 
			
		||||
		if (currentLayer != newLayer) {
 | 
			
		||||
			return true
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		return false
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun hide(editor: Editor) {
 | 
			
		||||
@@ -42,12 +30,20 @@ internal value class EditorLensLineBackground(private val highlighter: RangeHigh
 | 
			
		||||
			
 | 
			
		||||
			val severity = LensSeverity.from(info.severity)
 | 
			
		||||
			val layer = getHighlightLayer(severity)
 | 
			
		||||
			val attributes = getAttributes(editor, startOffset, endOffset, severity)
 | 
			
		||||
			
 | 
			
		||||
			return EditorLensLineBackground(editor.markupModel.addRangeHighlighter(startOffset, endOffset, layer, severity.lineAttributes, LINES_IN_RANGE))
 | 
			
		||||
			return EditorLensLineBackground(editor.markupModel.addRangeHighlighter(startOffset, endOffset, layer, attributes, LINES_IN_RANGE))
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun getHighlightLayer(severity: LensSeverity): Int {
 | 
			
		||||
			return HighlighterLayer.CARET_ROW - 100 - severity.ordinal
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun getAttributes(editor: Editor, startOffset: Int, endOffset: Int, severity: LensSeverity): TextAttributes? {
 | 
			
		||||
			return if (editor.foldingModel.let { it.isOffsetCollapsed(startOffset) || it.isOffsetCollapsed(endOffset) })
 | 
			
		||||
				null
 | 
			
		||||
			else
 | 
			
		||||
				severity.lineAttributes
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,58 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.IntentionsUI
 | 
			
		||||
import com.intellij.codeInsight.hint.HintManager
 | 
			
		||||
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
 | 
			
		||||
import com.intellij.lang.LangBundle
 | 
			
		||||
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.editor.Editor
 | 
			
		||||
import com.intellij.openapi.project.Project
 | 
			
		||||
import com.intellij.psi.PsiDocumentManager
 | 
			
		||||
import com.intellij.psi.PsiFile
 | 
			
		||||
import com.intellij.psi.util.PsiUtilBase
 | 
			
		||||
 | 
			
		||||
internal object IntentionsPopup {
 | 
			
		||||
	fun show(editor: Editor) {
 | 
			
		||||
		if (!tryShow(editor)) {
 | 
			
		||||
			HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	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 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()
 | 
			
		||||
		
 | 
			
		||||
		HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
 | 
			
		||||
		return true
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * 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"
 | 
			
		||||
	
 | 
			
		||||
	private val HANDLER = object : ShowIntentionActionsHandler() {
 | 
			
		||||
		public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
 | 
			
		||||
			super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -0,0 +1,199 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
import com.intellij.openapi.editor.Inlay
 | 
			
		||||
import com.intellij.openapi.editor.ScrollType
 | 
			
		||||
import com.intellij.openapi.editor.colors.EditorFontType
 | 
			
		||||
import com.intellij.openapi.editor.ex.EditorEx
 | 
			
		||||
import com.intellij.openapi.editor.impl.EditorImpl
 | 
			
		||||
import com.intellij.openapi.editor.markup.TextAttributes
 | 
			
		||||
import com.intellij.openapi.util.text.StringUtil
 | 
			
		||||
import com.intellij.ui.paint.EffectPainter
 | 
			
		||||
import java.awt.Cursor
 | 
			
		||||
import java.awt.Graphics
 | 
			
		||||
import java.awt.Graphics2D
 | 
			
		||||
import java.awt.MouseInfo
 | 
			
		||||
import java.awt.Point
 | 
			
		||||
import java.awt.Rectangle
 | 
			
		||||
import java.awt.event.MouseEvent
 | 
			
		||||
import java.util.regex.Pattern
 | 
			
		||||
import javax.swing.SwingUtilities
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Renders the text of an inspection lens.
 | 
			
		||||
 */
 | 
			
		||||
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(info)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun setInlay(inlay: Inlay<*>) {
 | 
			
		||||
		check(!this::inlay.isInitialized) { "Inlay already set" }
 | 
			
		||||
		this.inlay = inlay
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun setPropertiesFrom(info: HighlightInfo) {
 | 
			
		||||
		this.info = info
 | 
			
		||||
		val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
 | 
			
		||||
		
 | 
			
		||||
		text = description
 | 
			
		||||
		attributes = LensSeverity.from(info.severity).textAttributes
 | 
			
		||||
		extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun paint(inlay: Inlay<*>, g: Graphics, r: Rectangle, textAttributes: TextAttributes) {
 | 
			
		||||
		fixBaselineForTextRendering(r)
 | 
			
		||||
		super.paint(inlay, g, r, textAttributes)
 | 
			
		||||
		
 | 
			
		||||
		if (hovered && isHoveringText()) {
 | 
			
		||||
			paintHoverEffect(inlay, g, r)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun paintHoverEffect(inlay: Inlay<*>, g: Graphics, r: Rectangle) {
 | 
			
		||||
		val editor = inlay.editor
 | 
			
		||||
		if (editor !is EditorImpl) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		val font = editor.colorsScheme.getFont(EditorFontType.PLAIN)
 | 
			
		||||
		val x = r.x + TEXT_HORIZONTAL_PADDING
 | 
			
		||||
		val y = r.y + editor.ascent
 | 
			
		||||
		val w = inlay.widthInPixels - UNDERLINE_WIDTH_REDUCTION - extraRightPadding
 | 
			
		||||
		val h = editor.descent
 | 
			
		||||
		
 | 
			
		||||
		g.color = attributes.foregroundColor
 | 
			
		||||
		EffectPainter.LINE_UNDERSCORE.paint(g as Graphics2D, x, y, w, h, font)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun getTextAttributes(editor: Editor): TextAttributes {
 | 
			
		||||
		return attributes
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun useEditorFont(): Boolean {
 | 
			
		||||
		return settings.useEditorFont
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun mouseMoved(event: MouseEvent, translated: Point) {
 | 
			
		||||
		setHovered(isHoveringText(translated))
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun mouseExited() {
 | 
			
		||||
		setHovered(false)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun setHovered(hovered: Boolean) {
 | 
			
		||||
		if (hovered && settings.lensHoverMode == LensHoverMode.DISABLED) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (this.hovered == hovered) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		this.hovered = hovered
 | 
			
		||||
		
 | 
			
		||||
		val editor = inlay.editor
 | 
			
		||||
		if (editor is EditorEx) {
 | 
			
		||||
			val cursor = if (hovered) Cursor.getPredefinedCursor(Cursor.HAND_CURSOR) else null
 | 
			
		||||
			editor.setCustomCursor(this::class.java, cursor)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		inlay.repaint()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun mousePressed(event: MouseEvent, translated: Point) {
 | 
			
		||||
		val hoverMode = settings.lensHoverMode
 | 
			
		||||
		if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (event.button.let { it == MouseEvent.BUTTON1 || it == MouseEvent.BUTTON2 }) {
 | 
			
		||||
			event.consume()
 | 
			
		||||
			
 | 
			
		||||
			val editor = inlay.editor
 | 
			
		||||
			moveToOffset(editor, info.actualStartOffset)
 | 
			
		||||
			
 | 
			
		||||
			if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
 | 
			
		||||
				IntentionsPopup.show(editor)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun isHoveringText(): Boolean {
 | 
			
		||||
		val bounds = inlay.bounds ?: return false
 | 
			
		||||
		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
 | 
			
		||||
			&& point.y < inlay.heightInPixels - 1
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private companion object {
 | 
			
		||||
		/**
 | 
			
		||||
		 * [HintRenderer.paintHint] renders padding around text, but not around effects.
 | 
			
		||||
		 */
 | 
			
		||||
		private const val TEXT_HORIZONTAL_PADDING = 7
 | 
			
		||||
		private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
 | 
			
		||||
		private const val UNDERLINE_WIDTH_REDUCTION = (TEXT_HORIZONTAL_PADDING * 2) - 1
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
		 * Kotlin compiler inspections have an `[UPPERCASE_TAG]` at the beginning.
 | 
			
		||||
		 */
 | 
			
		||||
		private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
 | 
			
		||||
		
 | 
			
		||||
		private fun getValidDescriptionText(text: String?, maxLength: Int): String {
 | 
			
		||||
			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun stripUppercaseTag(text: String): String {
 | 
			
		||||
			if (text.startsWith('[')) {
 | 
			
		||||
				val matcher = UPPERCASE_TAG_REGEX.matcher(text)
 | 
			
		||||
				if (matcher.find()) {
 | 
			
		||||
					return text.substring(matcher.end())
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			return text
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun unescapeHtmlEntities(text: String): String {
 | 
			
		||||
			return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
 | 
			
		||||
			return when {
 | 
			
		||||
				text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
 | 
			
		||||
				!text.endsWith('.')     -> "$text."
 | 
			
		||||
				else                    -> text
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun fixBaselineForTextRendering(rect: Rectangle) {
 | 
			
		||||
			rect.y += 1
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun moveToOffset(editor: Editor, offset: Int) {
 | 
			
		||||
			editor.caretModel.moveToOffset(offset)
 | 
			
		||||
			editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLensRefresher
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.compatibility.SpellCheckerSupport
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.ui.ColorUtil
 | 
			
		||||
@@ -54,7 +54,7 @@ enum class LensSeverity(baseColor: Color, lightThemeDarkening: Int, darkThemeBri
 | 
			
		||||
		 */
 | 
			
		||||
		internal fun registerMapping(severity: HighlightSeverity, lensSeverity: LensSeverity) {
 | 
			
		||||
			if (mapping.put(severity, lensSeverity) != lensSeverity) {
 | 
			
		||||
				InspectionLensRefresher.scheduleRefresh()
 | 
			
		||||
				InspectionLens.scheduleRefresh()
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
@@ -0,0 +1,31 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import java.util.function.Predicate
 | 
			
		||||
 | 
			
		||||
class LensSeverityFilter(private val hiddenSeverityIds: Set<String>, private val showUnknownSeverities: Boolean) : Predicate<HighlightSeverity> {
 | 
			
		||||
	private val knownSeverityIds = getSupportedSeverities().mapTo(HashSet(), HighlightSeverity::getName)
 | 
			
		||||
	
 | 
			
		||||
	override fun test(severity: HighlightSeverity): Boolean {
 | 
			
		||||
		if (!isSupported(severity)) {
 | 
			
		||||
			return false
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		return if (severity.name in knownSeverityIds)
 | 
			
		||||
			severity.name !in hiddenSeverityIds
 | 
			
		||||
		else
 | 
			
		||||
			showUnknownSeverities
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		@Suppress("DEPRECATION")
 | 
			
		||||
		private fun isSupported(severity: HighlightSeverity): Boolean {
 | 
			
		||||
			return severity > HighlightSeverity.TEXT_ATTRIBUTES && severity !== HighlightSeverity.INFO
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		fun getSupportedSeverities(registrar: SeverityRegistrar = SeverityRegistrar.getSeverityRegistrar(null)): List<HighlightSeverity> {
 | 
			
		||||
			return registrar.allSeverities.filter(::isSupported)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.openapi.editor.markup.UnmodifiableTextAttributes
 | 
			
		||||
import com.intellij.ui.JBColor
 | 
			
		||||
@@ -1,67 +1,159 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.settings
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.LensSeverityFilter
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverityFilter
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.editor.event.SelectionEvent
 | 
			
		||||
import com.intellij.openapi.editor.event.SelectionListener
 | 
			
		||||
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 java.awt.Cursor
 | 
			
		||||
 | 
			
		||||
class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
 | 
			
		||||
	companion object {
 | 
			
		||||
		const val ID = "InspectionLens"
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private data class DisplayedSeverity(
 | 
			
		||||
		val id: String,
 | 
			
		||||
		val severity: StoredSeverity,
 | 
			
		||||
		val textAttributes: TextAttributes? = null,
 | 
			
		||||
	) {
 | 
			
		||||
		constructor(
 | 
			
		||||
			severity: HighlightSeverity,
 | 
			
		||||
			registrar: SeverityRegistrar,
 | 
			
		||||
		) : this(
 | 
			
		||||
			id = severity.name,
 | 
			
		||||
			severity = StoredSeverity(severity),
 | 
			
		||||
			textAttributes = registrar.getHighlightInfoTypeBySeverity(severity).attributesKey.defaultAttributes
 | 
			
		||||
		)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private val settingsService = service<LensSettingsState>()
 | 
			
		||||
	
 | 
			
		||||
	private val allSeverities by lazy(LazyThreadSafetyMode.NONE) {
 | 
			
		||||
		val settings = settingsService.state
 | 
			
		||||
		val registrar = SeverityRegistrar.getSeverityRegistrar(null)
 | 
			
		||||
		
 | 
			
		||||
		val knownSeverities = LensSeverityFilter.getSupportedSeverities(registrar).map { DisplayedSeverity(it, registrar) }
 | 
			
		||||
		val knownSeverityIds = knownSeverities.mapTo(HashSet(), DisplayedSeverity::id)
 | 
			
		||||
		
 | 
			
		||||
		// Update names and priorities of stored severities.
 | 
			
		||||
		for ((id, knownSeverity, _) in knownSeverities) {
 | 
			
		||||
			val storedSeverity = settings.hiddenSeverities[id]
 | 
			
		||||
			if (storedSeverity != null && storedSeverity != knownSeverity) {
 | 
			
		||||
				settings.hiddenSeverities[id] = knownSeverity
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		val unknownSeverities = settings.hiddenSeverities.entries
 | 
			
		||||
			.filterNot { it.key in knownSeverityIds }
 | 
			
		||||
			.map { DisplayedSeverity(it.key, it.value) }
 | 
			
		||||
		
 | 
			
		||||
		(knownSeverities + unknownSeverities).sortedByDescending { it.severity.priority }
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun getId(): String {
 | 
			
		||||
		return ID
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun createPanel(): DialogPanel {
 | 
			
		||||
		val settings = service<LensSettingsState>().state
 | 
			
		||||
		val settings = settingsService.state
 | 
			
		||||
		
 | 
			
		||||
		return panel {
 | 
			
		||||
			group("Enabled Severities") {
 | 
			
		||||
				val registrar = SeverityRegistrar.getSeverityRegistrar(null)
 | 
			
		||||
		lateinit var panel: DialogPanel
 | 
			
		||||
		
 | 
			
		||||
				val knownSeverities = registrar.allSeverities
 | 
			
		||||
					.filter(LensSeverityFilter.Global::test)
 | 
			
		||||
					.map { StoredSeverity(it) to registrar.getHighlightInfoTypeBySeverity(it).attributesKey.defaultAttributes }
 | 
			
		||||
				
 | 
			
		||||
				val knownSeverityIds = knownSeverities
 | 
			
		||||
					.mapTo(HashSet()) { it.first.id }
 | 
			
		||||
				
 | 
			
		||||
				val unknownSeverities = settings.disabledSeverities
 | 
			
		||||
					.filterNot { it.id in knownSeverityIds }
 | 
			
		||||
					.map { it to null as TextAttributes? }
 | 
			
		||||
				
 | 
			
		||||
				val allSeverities = (knownSeverities + unknownSeverities)
 | 
			
		||||
					.sortedByDescending { it.first.priority }
 | 
			
		||||
				
 | 
			
		||||
				for ((severity, textAttributes) in allSeverities) {
 | 
			
		||||
		panel = panel {
 | 
			
		||||
			group("Appearance") {
 | 
			
		||||
				row {
 | 
			
		||||
						val checkBox = checkBox(severity.name)
 | 
			
		||||
						checkBox.bindSelectedToNotIn(settings.disabledSeverities, severity)
 | 
			
		||||
						checkBox.gap(RightGap.COLUMNS)
 | 
			
		||||
					checkBox("Use editor font").bindSelected(settings::useEditorFont)
 | 
			
		||||
				}
 | 
			
		||||
				row("Max description length:") {
 | 
			
		||||
					intTextField(LensSettingsState.MAX_DESCRIPTION_LENGTH_RANGE, keyboardStep = 10).bindIntText(settings::maxDescriptionLength)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
						val exampleLabel = SimpleRendererComponent(null, null, true)
 | 
			
		||||
						exampleLabel.setText("Example", textAttributes, false)
 | 
			
		||||
						exampleLabel.editor.contentComponent.setOpaque(false)
 | 
			
		||||
						cell(exampleLabel)
 | 
			
		||||
			group("Behavior") {
 | 
			
		||||
				row("Hover mode:") {
 | 
			
		||||
					val items = LensHoverMode.entries
 | 
			
		||||
					val renderer = SimpleListCellRenderer.create("", LensHoverMode::description)
 | 
			
		||||
					comboBox(items, renderer).bindItem(settings::lensHoverMode) { settings.lensHoverMode = it ?: LensHoverMode.DEFAULT }
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			group("Shown Severities") {
 | 
			
		||||
				for ((id, severity, textAttributes) in allSeverities) {
 | 
			
		||||
					row {
 | 
			
		||||
						checkBox(severity.name)
 | 
			
		||||
							.bindSelectedToNotIn(settings.hiddenSeverities, id, severity)
 | 
			
		||||
							.gap(RightGap.COLUMNS)
 | 
			
		||||
						
 | 
			
		||||
						labelWithAttributes("Example", textAttributes)
 | 
			
		||||
					}.layout(RowLayout.PARENT_GRID)
 | 
			
		||||
				}
 | 
			
		||||
				
 | 
			
		||||
				row {
 | 
			
		||||
					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()
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
	private fun <T> Cell<JBCheckBox>.bindSelectedToNotIn(set: MutableCollection<T>, value: T): Cell<JBCheckBox> {
 | 
			
		||||
		return bindSelected({ value !in set }, { if (it) set.remove(value) else set.add(value) })
 | 
			
		||||
		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 })
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun Row.labelWithAttributes(text: String, textAttributes: TextAttributes?): Cell<SimpleRendererComponent> {
 | 
			
		||||
		val label = SimpleRendererComponent(null, null, true)
 | 
			
		||||
		label.setText(text, textAttributes, false)
 | 
			
		||||
		label.focusTraversalPolicy = DisabledTraversalPolicy()
 | 
			
		||||
		
 | 
			
		||||
		val editor = label.editor
 | 
			
		||||
		editor.setCustomCursor(this, Cursor.getDefaultCursor())
 | 
			
		||||
		editor.contentComponent.setOpaque(false)
 | 
			
		||||
		editor.selectionModel.addSelectionListener(object : SelectionListener {
 | 
			
		||||
			override fun selectionChanged(e: SelectionEvent) {
 | 
			
		||||
				if (!e.newRange.isEmpty) {
 | 
			
		||||
					editor.selectionModel.removeSelection(true)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		})
 | 
			
		||||
		
 | 
			
		||||
		Disposer.register(disposable!!, label)
 | 
			
		||||
		return cell(label)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun apply() {
 | 
			
		||||
		super.apply()
 | 
			
		||||
		settingsService.update()
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,7 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.settings
 | 
			
		||||
 | 
			
		||||
enum class LensHoverMode(val description: String) {
 | 
			
		||||
	DISABLED("Disabled"),
 | 
			
		||||
	DEFAULT("Left click shows intentions, middle click jumps to highlight"),
 | 
			
		||||
	SWAPPED("Left click jumps to highlight, middle click shows intentions")
 | 
			
		||||
}
 | 
			
		||||
@@ -1,13 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.settings
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.LensSeverityFilter
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
 | 
			
		||||
object LensSettings {
 | 
			
		||||
	private val state
 | 
			
		||||
		get() = service<LensSettingsState>().state
 | 
			
		||||
	
 | 
			
		||||
	fun createSeverityFilter(): LensSeverityFilter {
 | 
			
		||||
		return LensSeverityFilter(state.disabledSeveritiesReadOnly.mapTo(HashSet(), StoredSeverity::id))
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,11 +1,13 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.settings
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverityFilter
 | 
			
		||||
import com.intellij.openapi.components.BaseState
 | 
			
		||||
import com.intellij.openapi.components.SettingsCategory
 | 
			
		||||
import com.intellij.openapi.components.SimplePersistentStateComponent
 | 
			
		||||
import com.intellij.openapi.components.State
 | 
			
		||||
import com.intellij.openapi.components.Storage
 | 
			
		||||
import com.intellij.util.xmlb.annotations.XCollection
 | 
			
		||||
import com.intellij.util.xmlb.annotations.XMap
 | 
			
		||||
 | 
			
		||||
@State(
 | 
			
		||||
	name = LensApplicationConfigurable.ID,
 | 
			
		||||
@@ -14,10 +16,58 @@ import com.intellij.util.xmlb.annotations.XCollection
 | 
			
		||||
)
 | 
			
		||||
class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State>(State()) {
 | 
			
		||||
	class State : BaseState() {
 | 
			
		||||
		@get:XCollection
 | 
			
		||||
		val disabledSeverities by list<StoredSeverity>()
 | 
			
		||||
		@get:XMap
 | 
			
		||||
		val hiddenSeverities by map<String, StoredSeverity>()
 | 
			
		||||
		
 | 
			
		||||
		val disabledSeveritiesReadOnly: List<StoredSeverity>
 | 
			
		||||
			get() = disabledSeverities
 | 
			
		||||
		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()
 | 
			
		||||
		private set
 | 
			
		||||
	
 | 
			
		||||
	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()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun update() {
 | 
			
		||||
		severityFilter = createSeverityFilter()
 | 
			
		||||
		InspectionLens.scheduleRefresh()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun createSeverityFilter(): LensSeverityFilter {
 | 
			
		||||
		val state = state
 | 
			
		||||
		return LensSeverityFilter(state.hiddenSeverities.keys, state.showUnknownSeverities)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,22 +1,9 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.settings
 | 
			
		||||
 | 
			
		||||
import com.intellij.configurationStore.Property
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.util.xmlb.annotations.Tag
 | 
			
		||||
 | 
			
		||||
@Tag("severity")
 | 
			
		||||
data class StoredSeverity(
 | 
			
		||||
	@Property var id: String = "",
 | 
			
		||||
	@Property var name: String = "",
 | 
			
		||||
	@Property var priority: Int = 0,
 | 
			
		||||
) {
 | 
			
		||||
	constructor(severity: HighlightSeverity) : this(id = severity.name, name = severity.displayCapitalizedName, priority = severity.myVal)
 | 
			
		||||
	
 | 
			
		||||
	override fun equals(other: Any?): Boolean {
 | 
			
		||||
		return other is StoredSeverity && id == other.id
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun hashCode(): Int {
 | 
			
		||||
		return id.hashCode()
 | 
			
		||||
	}
 | 
			
		||||
data class StoredSeverity(var name: String = "", var priority: Int = 0) {
 | 
			
		||||
	constructor(severity: HighlightSeverity) : this(severity.displayCapitalizedName, severity.myVal)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,19 +4,44 @@
 | 
			
		||||
  <vendor url="https://chylex.com">chylex</vendor>
 | 
			
		||||
  
 | 
			
		||||
  <description><![CDATA[
 | 
			
		||||
    Shows errors, warnings, and other inspection highlights inline.
 | 
			
		||||
    Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
 | 
			
		||||
    <br><br>
 | 
			
		||||
    After installing the plugin, inspection descriptions will appear after the ends of lines, and the lines will be highlighted with a background color.
 | 
			
		||||
    Shown inspection severities are <b>Errors</b>, <b>Warnings</b>, <b>Weak Warnings</b>, <b>Server Problems</b>, <b>Grammar Errors</b>, <b>Typos</b>, and other inspections from plugins or future IntelliJ versions that have a high enough severity level.
 | 
			
		||||
    Each severity has a different color, with support for both light and dark themes.
 | 
			
		||||
    By default, the plugin shows <b>Errors</b>, <b>Warnings</b>, <b>Weak Warnings</b>, <b>Server Problems</b>, <b>Grammar Errors</b>, <b>Typos</b>, and other inspections with a high enough severity level. Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
 | 
			
		||||
    <br><br>
 | 
			
		||||
    Note: The plugin is not customizable outside the ability to disable/enable the plugin without restarting the IDE.
 | 
			
		||||
    If the defaults don't work for you, I recommend trying the <a href="https://plugins.jetbrains.com/plugin/17302-inlineerror">Inline Error</a> plugin which can be customized, building your own version of Inspection Lens, or proposing your change in the <a href="https://github.com/chylex/IntelliJ-Inspection-Lens/issues">issue tracker</a>.
 | 
			
		||||
    Configure appearance, behavior of clicking on inspections, and visible severities in <b>Settings | Tools | Inspection Lens</b>.
 | 
			
		||||
    <br><br>
 | 
			
		||||
    Inspired by <a href="https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens">Error Lens</a> for VS Code, and <a href="https://plugins.jetbrains.com/plugin/17302-inlineerror">Inline Error</a> for IntelliJ Platform.
 | 
			
		||||
  ]]></description>
 | 
			
		||||
  
 | 
			
		||||
  <change-notes><![CDATA[
 | 
			
		||||
    <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>
 | 
			
		||||
    <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>
 | 
			
		||||
    <b>Version 1.5</b>
 | 
			
		||||
    <ul>
 | 
			
		||||
      <li>Added possibility to left-click an inspection to show quick fixes.</li>
 | 
			
		||||
      <li>Added possibility to middle-click an inspection to navigate to relevant code in the editor.</li>
 | 
			
		||||
      <li>Added option to use UI font instead of editor font.</li>
 | 
			
		||||
      <li>Long inspection descriptions are now truncated to 120 characters.</li>
 | 
			
		||||
      <li>Improved descriptions of Kotlin compiler inspections.</li>
 | 
			
		||||
      <li>Fixed visual artifacts in Rendered Doc comments.</li>
 | 
			
		||||
    </ul>
 | 
			
		||||
    <b>Version 1.4.1</b>
 | 
			
		||||
    <ul>
 | 
			
		||||
      <li>Fixed warnings in usage of IntelliJ SDK.</li>
 | 
			
		||||
    </ul>
 | 
			
		||||
    <b>Version 1.4</b>
 | 
			
		||||
    <ul>
 | 
			
		||||
      <li>Added configuration of visible severities to <b>Settings | Tools | Inspection Lens</b>.</li>
 | 
			
		||||
    </ul>
 | 
			
		||||
    <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>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.EditorLensInlay
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import org.junit.jupiter.api.Assertions.assertEquals
 | 
			
		||||
import org.junit.jupiter.api.Nested
 | 
			
		||||
@@ -48,7 +47,7 @@ class EditorLensTest {
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
		 * If any of these change, re-evaluate [EditorLensInlay.MAXIMUM_SEVERITY] and the priority calculations.
 | 
			
		||||
		 * If any of these changes, re-evaluate [EditorLensInlay.MAXIMUM_SEVERITY] and the priority calculations.
 | 
			
		||||
		 */
 | 
			
		||||
		@Nested
 | 
			
		||||
		inner class IdeaHighlightSeverityAssumptions {
 | 
			
		||||
@@ -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)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user