mirror of
				https://github.com/chylex/IntelliJ-Inspection-Lens.git
				synced 2025-11-04 11:40:10 +01:00 
			
		
		
		
	Compare commits
	
		
			13 Commits
		
	
	
		
			debug
			...
			debug-logs
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						2be1144cbf
	
				 | 
					
					
						|||
| 
						
						
							
						
						fbe67d6068
	
				 | 
					
					
						|||
| 
						
						
							
						
						98d3e5db01
	
				 | 
					
					
						|||
| 
						
						
							
						
						102352a2eb
	
				 | 
					
					
						|||
| 
						
						
							
						
						3aeeb32bef
	
				 | 
					
					
						|||
| 
						
						
							
						
						0bc85fd69b
	
				 | 
					
					
						|||
| 
						
						
							
						
						cde4d81afe
	
				 | 
					
					
						|||
| 
						
						
							
						
						b1d6ed4d30
	
				 | 
					
					
						|||
| 
						
						
							
						
						2a4764fa15
	
				 | 
					
					
						|||
| 
						
						
							
						
						4bd0931d71
	
				 | 
					
					
						|||
| 
						
						
							
						
						0f41b22872
	
				 | 
					
					
						|||
| 
						
						
							
						
						603b35abdb
	
				 | 
					
					
						|||
| 
						
						
							
						
						08ed1aadea
	
				 | 
					
					
						
							
								
								
									
										2
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/FUNDING.yml
									
									
									
									
										vendored
									
									
								
							@@ -1,3 +1 @@
 | 
			
		||||
github: chylex
 | 
			
		||||
patreon: chylex
 | 
			
		||||
ko_fi: chylex
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -3,4 +3,5 @@
 | 
			
		||||
!/.idea/runConfigurations
 | 
			
		||||
 | 
			
		||||
/.gradle/
 | 
			
		||||
/.intellijPlatform/
 | 
			
		||||
/build/
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
 | 
			
		||||
Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
 | 
			
		||||
 | 
			
		||||
By default, the plugin shows **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections with a high enough severity level. Configure visible severities in **Settings | Tools | Inspection Lens**.
 | 
			
		||||
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.
 | 
			
		||||
 | 
			
		||||
Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
 | 
			
		||||
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.5"
 | 
			
		||||
version = "1.5.2.902"
 | 
			
		||||
 | 
			
		||||
repositories {
 | 
			
		||||
	mavenCentral()
 | 
			
		||||
	
 | 
			
		||||
	intellijPlatform {
 | 
			
		||||
		defaultRepositories()
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
intellij {
 | 
			
		||||
	version.set("2023.3.3")
 | 
			
		||||
	updateSinceUntilBuild.set(false)
 | 
			
		||||
dependencies {
 | 
			
		||||
	intellijPlatform {
 | 
			
		||||
		intellijIdeaUltimate("2025.1")
 | 
			
		||||
		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")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.patchPluginXml {
 | 
			
		||||
	sinceBuild.set("233.11361.10")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.buildSearchableOptions {
 | 
			
		||||
	enabled = false
 | 
			
		||||
	
 | 
			
		||||
	compilerOptions {
 | 
			
		||||
		freeCompilerArgs = listOf(
 | 
			
		||||
			"-X" + "jvm-default=all",
 | 
			
		||||
			"-X" + "lambdas=indy"
 | 
			
		||||
		)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
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.2.1"
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@ package com.chylex.intellij.inspectionlens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.EditorLensFeatures
 | 
			
		||||
import com.intellij.openapi.application.ApplicationManager
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.diagnostic.logger
 | 
			
		||||
import com.intellij.openapi.fileEditor.FileEditorManager
 | 
			
		||||
import com.intellij.openapi.fileEditor.TextEditor
 | 
			
		||||
import com.intellij.openapi.project.ProjectManager
 | 
			
		||||
@@ -13,6 +14,8 @@ import com.intellij.openapi.project.ProjectManager
 | 
			
		||||
internal object InspectionLens {
 | 
			
		||||
	const val PLUGIN_ID = "com.chylex.intellij.inspectionlens"
 | 
			
		||||
	
 | 
			
		||||
	val LOG = logger<InspectionLens>()
 | 
			
		||||
	
 | 
			
		||||
	/**
 | 
			
		||||
	 * Installs lenses into [editor].
 | 
			
		||||
	 */
 | 
			
		||||
 
 | 
			
		||||
@@ -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) {
 | 
			
		||||
 
 | 
			
		||||
@@ -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,274 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.debug
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.ColorGenerator
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.ColorMode
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.EditorLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverity
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfoType
 | 
			
		||||
import com.intellij.grazie.ide.TextProblemSeverities
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.openapi.Disposable
 | 
			
		||||
import com.intellij.openapi.actionSystem.ActionUpdateThread
 | 
			
		||||
import com.intellij.openapi.actionSystem.AnAction
 | 
			
		||||
import com.intellij.openapi.actionSystem.AnActionEvent
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.EditorFactory
 | 
			
		||||
import com.intellij.openapi.editor.colors.EditorColorsManager
 | 
			
		||||
import com.intellij.openapi.editor.colors.EditorColorsScheme
 | 
			
		||||
import com.intellij.openapi.editor.event.CaretEvent
 | 
			
		||||
import com.intellij.openapi.editor.event.CaretListener
 | 
			
		||||
import com.intellij.openapi.editor.event.SelectionEvent
 | 
			
		||||
import com.intellij.openapi.editor.event.SelectionListener
 | 
			
		||||
import com.intellij.openapi.editor.ex.EditorEx
 | 
			
		||||
import com.intellij.openapi.project.Project
 | 
			
		||||
import com.intellij.openapi.ui.DialogPanel
 | 
			
		||||
import com.intellij.openapi.ui.DialogWrapper
 | 
			
		||||
import com.intellij.openapi.util.Disposer
 | 
			
		||||
import com.intellij.openapi.util.Key
 | 
			
		||||
import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
 | 
			
		||||
import com.intellij.ui.ColorUtil
 | 
			
		||||
import com.intellij.ui.dsl.builder.Align
 | 
			
		||||
import com.intellij.ui.dsl.builder.Cell
 | 
			
		||||
import com.intellij.ui.dsl.builder.LabelPosition
 | 
			
		||||
import com.intellij.ui.dsl.builder.Row
 | 
			
		||||
import com.intellij.ui.dsl.builder.panel
 | 
			
		||||
import com.intellij.ui.dsl.builder.selected
 | 
			
		||||
import javax.swing.Action
 | 
			
		||||
import javax.swing.JSlider
 | 
			
		||||
 | 
			
		||||
class ShowColorEditorAction : AnAction() {
 | 
			
		||||
	override fun getActionUpdateThread(): ActionUpdateThread {
 | 
			
		||||
		return ActionUpdateThread.BGT
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun actionPerformed(e: AnActionEvent) {
 | 
			
		||||
		Dialog(e.project).show()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private class Dialog(project: Project?) : DialogWrapper(project) {
 | 
			
		||||
		private val editorSyncer = EditorSyncer(disposable)
 | 
			
		||||
		
 | 
			
		||||
		init {
 | 
			
		||||
			title = "Inspection Lens - Color Editor"
 | 
			
		||||
			init()
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		@Suppress("DuplicatedCode")
 | 
			
		||||
		override fun createCenterPanel(): DialogPanel {
 | 
			
		||||
			return panel {
 | 
			
		||||
				row {
 | 
			
		||||
					for (scheme in EditorColorsManager.getInstance().allSchemes.sortedWith(compareBy({ ColorUtil.isDark(it.defaultBackground) }, { it.displayName }))) {
 | 
			
		||||
						createEditor(scheme)
 | 
			
		||||
					}
 | 
			
		||||
				}.resizableRow()
 | 
			
		||||
				
 | 
			
		||||
				row {
 | 
			
		||||
					val generateColors = checkBox("Generate colors")
 | 
			
		||||
						.selected(ColorGenerator.useGenerator)
 | 
			
		||||
						.onChanged {
 | 
			
		||||
							ColorGenerator.useGenerator = it.isSelected
 | 
			
		||||
							refreshColors()
 | 
			
		||||
						}
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 15, 1, 5)
 | 
			
		||||
						.label("Light theme desaturation", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::lightThemeDesaturation) { ColorGenerator.lightThemeDesaturation = it }
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 15, 1, 5)
 | 
			
		||||
						.label("Dark theme desaturation", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::darkThemeDesaturation) { ColorGenerator.darkThemeDesaturation = it }
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 100, 5, 25)
 | 
			
		||||
						.label("Light theme threshold", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::lightThemeThreshold) { ColorGenerator.lightThemeThreshold = it }
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 100, 5, 25)
 | 
			
		||||
						.label("Dark theme threshold", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::darkThemeThreshold) { ColorGenerator.darkThemeThreshold = it }
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 25, 1, 5)
 | 
			
		||||
						.label("Light theme line alpha", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::lightThemeLineAlpha) { ColorGenerator.lightThemeLineAlpha = it }
 | 
			
		||||
					
 | 
			
		||||
					slider(0, 25, 1, 5)
 | 
			
		||||
						.label("Dark theme line alpha", LabelPosition.TOP)
 | 
			
		||||
						.enabledIf(generateColors.selected)
 | 
			
		||||
						.bindColorValue(ColorGenerator::darkThemeLineAlpha) { ColorGenerator.darkThemeLineAlpha = it }
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun Row.createEditor(scheme: EditorColorsScheme) {
 | 
			
		||||
			val editor = createPreviewEditor(scheme, disposable)
 | 
			
		||||
			editorSyncer.add(editor)
 | 
			
		||||
			
 | 
			
		||||
			panel {
 | 
			
		||||
				row {
 | 
			
		||||
					cell(editor.component)
 | 
			
		||||
						.label(scheme.displayName, LabelPosition.TOP)
 | 
			
		||||
						.align(Align.FILL)
 | 
			
		||||
						.resizableColumn()
 | 
			
		||||
				}.resizableRow()
 | 
			
		||||
			}.resizableColumn()
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun Cell<JSlider>.bindColorValue(getter: () -> Int, setter: (Int) -> Unit): Cell<JSlider> {
 | 
			
		||||
			return applyToComponent {
 | 
			
		||||
				value = getter()
 | 
			
		||||
				toolTipText = value.toString()
 | 
			
		||||
				
 | 
			
		||||
				addChangeListener {
 | 
			
		||||
					toolTipText = value.toString()
 | 
			
		||||
					setter(value)
 | 
			
		||||
					refreshColors()
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun refreshColors() {
 | 
			
		||||
			for (severity in LensSeverity.values()) {
 | 
			
		||||
				severity.refreshColors()
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			for (editor in editorSyncer.editors) {
 | 
			
		||||
				recreateLenses(editor)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		override fun createActions(): Array<Action> {
 | 
			
		||||
			return arrayOf(okAction)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		override fun getDimensionServiceKey(): String {
 | 
			
		||||
			return this::class.java.name
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private class EditorSyncer(private val disposable: Disposable) {
 | 
			
		||||
		val editors = mutableListOf<Editor>()
 | 
			
		||||
		
 | 
			
		||||
		fun add(editor: Editor) {
 | 
			
		||||
			editors.add(editor)
 | 
			
		||||
			
 | 
			
		||||
			editor.caretModel.addCaretListener(object : CaretListener {
 | 
			
		||||
				override fun caretPositionChanged(event: CaretEvent) {
 | 
			
		||||
					syncCarets(editor)
 | 
			
		||||
				}
 | 
			
		||||
				
 | 
			
		||||
				override fun caretAdded(event: CaretEvent) {
 | 
			
		||||
					syncCarets(editor)
 | 
			
		||||
				}
 | 
			
		||||
				
 | 
			
		||||
				override fun caretRemoved(event: CaretEvent) {
 | 
			
		||||
					syncCarets(editor)
 | 
			
		||||
				}
 | 
			
		||||
			}, disposable)
 | 
			
		||||
			
 | 
			
		||||
			editor.selectionModel.addSelectionListener(object : SelectionListener {
 | 
			
		||||
				override fun selectionChanged(e: SelectionEvent) {
 | 
			
		||||
					syncCarets(editor)
 | 
			
		||||
				}
 | 
			
		||||
			}, disposable)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private var isSyncing = false
 | 
			
		||||
		
 | 
			
		||||
		private fun syncCarets(mainEditor: Editor) {
 | 
			
		||||
			val caretsAndSelections = mainEditor.caretModel.caretsAndSelections
 | 
			
		||||
			
 | 
			
		||||
			syncEditors(mainEditor) {
 | 
			
		||||
				it.caretModel.caretsAndSelections = caretsAndSelections
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private inline fun syncEditors(mainEditor: Editor, action: (Editor) -> Unit) {
 | 
			
		||||
			if (isSyncing) {
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			isSyncing = true
 | 
			
		||||
			try {
 | 
			
		||||
				for (editor in editors) {
 | 
			
		||||
					if (editor !== mainEditor) {
 | 
			
		||||
						action(editor)
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			} finally {
 | 
			
		||||
				isSyncing = false
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private companion object {
 | 
			
		||||
		private val SEVERITIES = listOf(
 | 
			
		||||
			HighlightSeverity.ERROR,
 | 
			
		||||
			HighlightSeverity.WARNING,
 | 
			
		||||
			HighlightSeverity.WEAK_WARNING,
 | 
			
		||||
			HighlightSeverity.GENERIC_SERVER_ERROR_OR_WARNING,
 | 
			
		||||
			TextProblemSeverities.STYLE_SUGGESTION,
 | 
			
		||||
			SpellCheckerSeveritiesProvider.TYPO,
 | 
			
		||||
			HighlightSeverity("Other", 50)
 | 
			
		||||
		)
 | 
			
		||||
		
 | 
			
		||||
		private val LENSES_KEY = Key.create<MutableList<EditorLens>>("InspectionLens.ShowColorEditorAction.Lenses")
 | 
			
		||||
		
 | 
			
		||||
		private fun createPreviewEditor(scheme: EditorColorsScheme, disposable: Disposable): Editor {
 | 
			
		||||
			val editorFactory = EditorFactory.getInstance()
 | 
			
		||||
			
 | 
			
		||||
			val document = editorFactory.createDocument(('A'..'Z').take(SEVERITIES.size * 3).joinToString(separator = "\n", postfix = "\n\n") { "$it = 0;" })
 | 
			
		||||
			val editor = editorFactory.createViewer(document) as EditorEx
 | 
			
		||||
			
 | 
			
		||||
			editor.colorsScheme = scheme
 | 
			
		||||
			editor.caretModel.moveToOffset(editor.document.textLength)
 | 
			
		||||
			
 | 
			
		||||
			with(editor.settings) {
 | 
			
		||||
				additionalColumnsCount = 0
 | 
			
		||||
				additionalLinesCount = 0
 | 
			
		||||
				isIndentGuidesShown = false
 | 
			
		||||
				isLineMarkerAreaShown = false
 | 
			
		||||
				isLineNumbersShown = true
 | 
			
		||||
				isRightMarginShown = false
 | 
			
		||||
				isWhitespacesShown = true
 | 
			
		||||
				setGutterIconsShown(false)
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			ColorMode.setForEditor(editor, if (ColorUtil.isDark(scheme.defaultBackground)) ColorMode.ALWAYS_DARK else ColorMode.ALWAYS_LIGHT)
 | 
			
		||||
			recreateLenses(editor)
 | 
			
		||||
			
 | 
			
		||||
			Disposer.register(disposable) { editorFactory.releaseEditor(editor) }
 | 
			
		||||
			return editor
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun recreateLenses(editor: Editor) {
 | 
			
		||||
			LENSES_KEY.get(editor)?.forEach(EditorLens::hide)
 | 
			
		||||
			
 | 
			
		||||
			val lenses = mutableListOf<EditorLens>()
 | 
			
		||||
			LENSES_KEY.set(editor, lenses)
 | 
			
		||||
			
 | 
			
		||||
			for ((index, severity) in SEVERITIES.withIndex()) {
 | 
			
		||||
				addLens(editor, severity, index, lenses)
 | 
			
		||||
				addLens(editor, severity, (index * 2) + 1 + SEVERITIES.size, lenses)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun addLens(editor: Editor, severity: HighlightSeverity, line: Int, list: MutableList<EditorLens>) {
 | 
			
		||||
			val startOffset = editor.document.getLineStartOffset(line)
 | 
			
		||||
			val endOffset = editor.document.getLineEndOffset(line)
 | 
			
		||||
			
 | 
			
		||||
			val highlightInfo = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
 | 
			
		||||
				.severity(severity)
 | 
			
		||||
				.range(startOffset, endOffset)
 | 
			
		||||
				.descriptionAndTooltip("Example - ${severity.displayCapitalizedName}")
 | 
			
		||||
				.createUnconditionally()
 | 
			
		||||
			
 | 
			
		||||
			EditorLens.show(editor, highlightInfo, service())?.let(list::add)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
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
 | 
			
		||||
@@ -19,7 +20,7 @@ internal class EditorLensFeatures private constructor(
 | 
			
		||||
) {
 | 
			
		||||
	private val lensManager = EditorLensManager(editor)
 | 
			
		||||
	private val lensManagerDispatcher = EditorLensManagerDispatcher(lensManager)
 | 
			
		||||
	private val markupModelListener = LensMarkupModelListener(lensManagerDispatcher)
 | 
			
		||||
	private val markupModelListener = LensMarkupModelListener(editor, lensManagerDispatcher)
 | 
			
		||||
	
 | 
			
		||||
	init {
 | 
			
		||||
		markupModel.addMarkupModelListener(disposable, markupModelListener)
 | 
			
		||||
@@ -38,19 +39,28 @@ internal class EditorLensFeatures private constructor(
 | 
			
		||||
		
 | 
			
		||||
		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) { editor.putUserData(EDITOR_KEY, null) }
 | 
			
		||||
			
 | 
			
		||||
			Disposer.register(disposable) {
 | 
			
		||||
				InspectionLens.LOG.info("Installation disposed: $editor", Exception("DISPOSE STACK TRACE"))
 | 
			
		||||
				editor.putUserData(EDITOR_KEY, null)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		fun refresh(editor: Editor) {
 | 
			
		||||
			editor.getUserData(EDITOR_KEY)?.refresh()
 | 
			
		||||
			val userData = editor.getUserData(EDITOR_KEY)
 | 
			
		||||
			InspectionLens.LOG.info("Refreshing: $editor ($userData)")
 | 
			
		||||
			userData?.refresh()
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,9 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.debug.Highlighter
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.EditorLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
@@ -14,6 +16,9 @@ internal class EditorLensManager(private val editor: Editor) {
 | 
			
		||||
	private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
 | 
			
		||||
	private val settings = service<LensSettingsState>()
 | 
			
		||||
	
 | 
			
		||||
	private val highlighters
 | 
			
		||||
		get() = lenses.keys.map { Highlighter(it, HighlightInfo.fromRangeHighlighter(it)!!) }
 | 
			
		||||
	
 | 
			
		||||
	private fun show(highlighterWithInfo: HighlighterWithInfo) {
 | 
			
		||||
		val (highlighter, info) = highlighterWithInfo
 | 
			
		||||
		
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,13 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.debug.Highlighter
 | 
			
		||||
import com.chylex.intellij.inspectionlens.debug.LensEventData
 | 
			
		||||
import com.chylex.intellij.inspectionlens.debug.LensEventManager
 | 
			
		||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
 | 
			
		||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
 | 
			
		||||
import com.intellij.openapi.components.service
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
 | 
			
		||||
import com.intellij.openapi.editor.impl.event.MarkupModelListener
 | 
			
		||||
import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
@@ -10,20 +15,36 @@ import com.intellij.openapi.editor.markup.RangeHighlighter
 | 
			
		||||
/**
 | 
			
		||||
 * Listens for inspection highlights and reports them to [EditorLensManager].
 | 
			
		||||
 */
 | 
			
		||||
internal class LensMarkupModelListener(private val lensManagerDispatcher: EditorLensManagerDispatcher) : MarkupModelListener {
 | 
			
		||||
internal class LensMarkupModelListener(private val editor: Editor, private val lensManagerDispatcher: EditorLensManagerDispatcher) : MarkupModelListener {
 | 
			
		||||
	private val settings = service<LensSettingsState>()
 | 
			
		||||
	
 | 
			
		||||
	override fun afterAdded(highlighter: RangeHighlighterEx) {
 | 
			
		||||
		showIfValid(highlighter)
 | 
			
		||||
		try {
 | 
			
		||||
			getFilteredHighlightInfo(highlighter)?.let { LensEventManager.addEvent(editor, LensEventData.MarkupModelAfterAdded(Highlighter(highlighter, it))) }
 | 
			
		||||
			showIfValid(highlighter)
 | 
			
		||||
		} catch (e: Exception) {
 | 
			
		||||
			InspectionLens.LOG.error("Error showing inspection", e)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun attributesChanged(highlighter: RangeHighlighterEx, renderersChanged: Boolean, fontStyleOrColorChanged: Boolean) {
 | 
			
		||||
		showIfValid(highlighter)
 | 
			
		||||
		try {
 | 
			
		||||
			getFilteredHighlightInfo(highlighter)?.let { LensEventManager.addEvent(editor, LensEventData.MarkupModelAttributesChanged(Highlighter(highlighter, it))) }
 | 
			
		||||
			showIfValid(highlighter)
 | 
			
		||||
		} catch (e: Exception) {
 | 
			
		||||
			InspectionLens.LOG.error("Error updating inspection", e)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun beforeRemoved(highlighter: RangeHighlighterEx) {
 | 
			
		||||
		if (getFilteredHighlightInfo(highlighter) != null) {
 | 
			
		||||
			lensManagerDispatcher.hide(highlighter)
 | 
			
		||||
		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)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
@@ -1,80 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.ui.ColorUtil
 | 
			
		||||
import java.awt.Color
 | 
			
		||||
import java.util.Locale
 | 
			
		||||
import kotlin.math.abs
 | 
			
		||||
import kotlin.math.pow
 | 
			
		||||
 | 
			
		||||
internal object ColorGenerator {
 | 
			
		||||
	private const val HACK_BRIGHTNESS_STEP = 1.025F
 | 
			
		||||
	
 | 
			
		||||
	var useGenerator = false
 | 
			
		||||
	var lightThemeDesaturation = 1
 | 
			
		||||
	var lightThemeThreshold = 32
 | 
			
		||||
	var lightThemeLineAlpha = 10
 | 
			
		||||
	var darkThemeDesaturation = 2
 | 
			
		||||
	var darkThemeThreshold = 62
 | 
			
		||||
	var darkThemeLineAlpha = 13
 | 
			
		||||
	
 | 
			
		||||
	data class Theme(
 | 
			
		||||
		val lightThemeTextColor: Color,
 | 
			
		||||
		val lightThemeLineColor: Color,
 | 
			
		||||
		val darkThemeTextColor: Color,
 | 
			
		||||
		val darkThemeLineColor: Color,
 | 
			
		||||
	)
 | 
			
		||||
 | 
			
		||||
	fun generate(name: String, baseColor: Color): Theme {
 | 
			
		||||
		val lightThemeTextColor: Color = findColorWithPerceivedBrightness("$name / Light", baseColor, lightThemeDesaturation, 50 downTo -50) { it <= lightThemeThreshold }
 | 
			
		||||
		val darkThemeTextColor: Color = findColorWithPerceivedBrightness("$name / Dark", baseColor, darkThemeDesaturation, -50..50) { it >= darkThemeThreshold }
 | 
			
		||||
		
 | 
			
		||||
		val lightThemeLineColor = ColorUtil.toAlpha(lightThemeTextColor, lightThemeLineAlpha)
 | 
			
		||||
		val darkThemeLineColor = ColorUtil.toAlpha(darkThemeTextColor, darkThemeLineAlpha)
 | 
			
		||||
		
 | 
			
		||||
		return Theme(lightThemeTextColor, lightThemeLineColor, darkThemeTextColor, darkThemeLineColor)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun findColorWithPerceivedBrightness(name: String, baseColor: Color, desaturation: Int, steps: IntProgression, testPerceivedBrightness: (Double) -> Boolean): Color {
 | 
			
		||||
		var finalColor = baseColor
 | 
			
		||||
		var finalBrightening = 0
 | 
			
		||||
		var finalPerceivedBrightness = 0.0
 | 
			
		||||
		
 | 
			
		||||
		for (brightening in steps) {
 | 
			
		||||
			finalColor = ColorUtil.desaturate(ColorUtil.hackBrightness(baseColor, abs(brightening), if (brightening < 0) 1F / HACK_BRIGHTNESS_STEP else HACK_BRIGHTNESS_STEP), desaturation)
 | 
			
		||||
			finalBrightening = brightening
 | 
			
		||||
			finalPerceivedBrightness = getPerceivedBrightness(finalColor)
 | 
			
		||||
			
 | 
			
		||||
			if (testPerceivedBrightness(finalPerceivedBrightness)) {
 | 
			
		||||
				break
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		println("$name - ${baseColor.red},${baseColor.green},${baseColor.blue} --> step $finalBrightening; brightness ${String.format(Locale.ROOT, "%.2f", finalPerceivedBrightness)}; color ${finalColor.red},${finalColor.green},${finalColor.blue}")
 | 
			
		||||
		return finalColor
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun getLuminance(r: Double, g: Double, b: Double): Double {
 | 
			
		||||
		return 0.2126 * srgbToLinearRgb(r) + 0.7152 * srgbToLinearRgb(g) + 0.0722 * srgbToLinearRgb(b)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun srgbToLinearRgb(channel: Double): Double {
 | 
			
		||||
		return if (channel <= 0.04045)
 | 
			
		||||
			channel / 12.92
 | 
			
		||||
		else
 | 
			
		||||
			((channel + 0.055) / 1.055).pow(2.4)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun getPerceivedBrightness(luminance: Double): Double {
 | 
			
		||||
		return if (luminance <= (216.0 / 24389.0))
 | 
			
		||||
			luminance * (24389.0 / 27.0)
 | 
			
		||||
		else
 | 
			
		||||
			luminance.pow(1.0 / 3.0) * 116 - 16
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun getPerceivedBrightness(color: Color): Double {
 | 
			
		||||
		val r = color.red / 255.0
 | 
			
		||||
		val g = color.green / 255.0
 | 
			
		||||
		val b = color.blue / 255.0
 | 
			
		||||
		return getPerceivedBrightness(getLuminance(r, g, b))
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -1,35 +0,0 @@
 | 
			
		||||
package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.intellij.openapi.editor.Editor
 | 
			
		||||
import com.intellij.openapi.util.Key
 | 
			
		||||
import com.intellij.ui.JBColor
 | 
			
		||||
import java.awt.Color
 | 
			
		||||
import java.util.EnumMap
 | 
			
		||||
 | 
			
		||||
internal enum class ColorMode {
 | 
			
		||||
	AUTO,
 | 
			
		||||
	ALWAYS_LIGHT,
 | 
			
		||||
	ALWAYS_DARK;
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		private val KEY = Key.create<ColorMode>("InspectionLens.ColorMode")
 | 
			
		||||
		
 | 
			
		||||
		fun getFromEditor(editor: Editor): ColorMode {
 | 
			
		||||
			return KEY.get(editor, AUTO)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		fun setForEditor(editor: Editor, colorMode: ColorMode) {
 | 
			
		||||
			KEY.set(editor, colorMode)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		inline fun createColorAttributes(lightThemeColor: Color, darkThemeColor: Color, attributesFactory: (JBColor) -> LensSeverityTextAttributes): EnumMap<ColorMode, LensSeverityTextAttributes> {
 | 
			
		||||
			val result = EnumMap<ColorMode, LensSeverityTextAttributes>(ColorMode::class.java)
 | 
			
		||||
			
 | 
			
		||||
			result[AUTO] = attributesFactory(JBColor(lightThemeColor, darkThemeColor))
 | 
			
		||||
			result[ALWAYS_LIGHT] = attributesFactory(JBColor(lightThemeColor, lightThemeColor))
 | 
			
		||||
			result[ALWAYS_DARK] = attributesFactory(JBColor(darkThemeColor, darkThemeColor))
 | 
			
		||||
			
 | 
			
		||||
			return result
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -32,6 +32,10 @@ internal class EditorLens private constructor(private var inlay: EditorLensInlay
 | 
			
		||||
		lineBackground.hide(inlay.editor)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun toString(): String {
 | 
			
		||||
		return "$inlay"
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
 | 
			
		||||
			val inlay = EditorLensInlay.show(editor, info, settings) ?: return null
 | 
			
		||||
 
 | 
			
		||||
@@ -43,7 +43,7 @@ internal value class EditorLensLineBackground(private val highlighter: RangeHigh
 | 
			
		||||
			return if (editor.foldingModel.let { it.isOffsetCollapsed(startOffset) || it.isOffsetCollapsed(endOffset) })
 | 
			
		||||
				null
 | 
			
		||||
			else
 | 
			
		||||
				severity.getLineAttributes(ColorMode.getFromEditor(editor))
 | 
			
		||||
				severity.lineAttributes
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,10 @@ 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
 | 
			
		||||
@@ -18,6 +22,19 @@ internal object IntentionsPopup {
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	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
 | 
			
		||||
		
 | 
			
		||||
@@ -28,6 +45,11 @@ internal object IntentionsPopup {
 | 
			
		||||
		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)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
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
 | 
			
		||||
@@ -16,6 +17,7 @@ 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
 | 
			
		||||
@@ -25,10 +27,9 @@ import javax.swing.SwingUtilities
 | 
			
		||||
/**
 | 
			
		||||
 * Renders the text of an inspection lens.
 | 
			
		||||
 */
 | 
			
		||||
class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState) : HintRenderer(null), InputHandler {
 | 
			
		||||
	private val useEditorFont = settings.useEditorFont
 | 
			
		||||
class LensRenderer(private var info: HighlightInfo, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
 | 
			
		||||
	private lateinit var inlay: Inlay<*>
 | 
			
		||||
	private lateinit var severity: LensSeverity
 | 
			
		||||
	private lateinit var attributes: LensSeverityTextAttributes
 | 
			
		||||
	private var extraRightPadding = 0
 | 
			
		||||
	private var hovered = false
 | 
			
		||||
	
 | 
			
		||||
@@ -43,10 +44,10 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
	
 | 
			
		||||
	fun setPropertiesFrom(info: HighlightInfo) {
 | 
			
		||||
		this.info = info
 | 
			
		||||
		val description = getValidDescriptionText(info.description)
 | 
			
		||||
		val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
 | 
			
		||||
		
 | 
			
		||||
		text = description
 | 
			
		||||
		severity = LensSeverity.from(info.severity)
 | 
			
		||||
		attributes = LensSeverity.from(info.severity).textAttributes
 | 
			
		||||
		extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
@@ -54,7 +55,7 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
		fixBaselineForTextRendering(r)
 | 
			
		||||
		super.paint(inlay, g, r, textAttributes)
 | 
			
		||||
		
 | 
			
		||||
		if (hovered) {
 | 
			
		||||
		if (hovered && isHoveringText()) {
 | 
			
		||||
			paintHoverEffect(inlay, g, r)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
@@ -67,20 +68,20 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
		
 | 
			
		||||
		val font = editor.colorsScheme.getFont(EditorFontType.PLAIN)
 | 
			
		||||
		val x = r.x + TEXT_HORIZONTAL_PADDING
 | 
			
		||||
		val y = r.y + editor.ascent + 1
 | 
			
		||||
		val y = r.y + editor.ascent
 | 
			
		||||
		val w = inlay.widthInPixels - UNDERLINE_WIDTH_REDUCTION - extraRightPadding
 | 
			
		||||
		val h = editor.descent
 | 
			
		||||
		
 | 
			
		||||
		g.color = getTextAttributes(editor).foregroundColor
 | 
			
		||||
		g.color = attributes.foregroundColor
 | 
			
		||||
		EffectPainter.LINE_UNDERSCORE.paint(g as Graphics2D, x, y, w, h, font)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun getTextAttributes(editor: Editor): TextAttributes {
 | 
			
		||||
		return severity.getTextAttributes(ColorMode.getFromEditor(editor))
 | 
			
		||||
		return attributes
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun useEditorFont(): Boolean {
 | 
			
		||||
		return useEditorFont
 | 
			
		||||
		return settings.useEditorFont
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun mouseMoved(event: MouseEvent, translated: Point) {
 | 
			
		||||
@@ -92,6 +93,10 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun setHovered(hovered: Boolean) {
 | 
			
		||||
		if (hovered && settings.lensHoverMode == LensHoverMode.DISABLED) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (this.hovered == hovered) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
@@ -108,22 +113,33 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	override fun mousePressed(event: MouseEvent, translated: Point) {
 | 
			
		||||
		if (!isHoveringText(translated)) {
 | 
			
		||||
		val hoverMode = settings.lensHoverMode
 | 
			
		||||
		if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		if (SwingUtilities.isLeftMouseButton(event) || SwingUtilities.isMiddleMouseButton(event)) {
 | 
			
		||||
		if (event.button.let { it == MouseEvent.BUTTON1 || it == MouseEvent.BUTTON2 }) {
 | 
			
		||||
			event.consume()
 | 
			
		||||
			
 | 
			
		||||
			val editor = inlay.editor
 | 
			
		||||
			moveToOffset(editor, info.actualStartOffset)
 | 
			
		||||
			
 | 
			
		||||
			if (SwingUtilities.isLeftMouseButton(event)) {
 | 
			
		||||
			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
 | 
			
		||||
@@ -139,15 +155,13 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
		private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
 | 
			
		||||
		private const val UNDERLINE_WIDTH_REDUCTION = (TEXT_HORIZONTAL_PADDING * 2) - 1
 | 
			
		||||
		
 | 
			
		||||
		private const val MAX_DESCRIPTION_LENGTH = 120
 | 
			
		||||
		
 | 
			
		||||
		/**
 | 
			
		||||
		 * Kotlin compiler inspections have an `[UPPERCASE_TAG]` at the beginning.
 | 
			
		||||
		 */
 | 
			
		||||
		private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
 | 
			
		||||
		
 | 
			
		||||
		private fun getValidDescriptionText(text: String?): String {
 | 
			
		||||
			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)))
 | 
			
		||||
		private fun getValidDescriptionText(text: String?, maxLength: Int): String {
 | 
			
		||||
			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun stripUppercaseTag(text: String): String {
 | 
			
		||||
@@ -165,11 +179,11 @@ class LensRenderer(private var info: HighlightInfo, settings: LensSettingsState)
 | 
			
		||||
			return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		private fun addEllipsisOrMissingPeriod(text: String): String {
 | 
			
		||||
		private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
 | 
			
		||||
			return when {
 | 
			
		||||
				text.length > MAX_DESCRIPTION_LENGTH -> text.take(MAX_DESCRIPTION_LENGTH).trimEnd { it.isWhitespace() || it == '.' } + "…"
 | 
			
		||||
				!text.endsWith('.')                  -> "$text."
 | 
			
		||||
				else                                 -> text
 | 
			
		||||
				text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
 | 
			
		||||
				!text.endsWith('.')     -> "$text."
 | 
			
		||||
				else                    -> text
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
 
 | 
			
		||||
@@ -2,20 +2,19 @@ package com.chylex.intellij.inspectionlens.editor.lens
 | 
			
		||||
 | 
			
		||||
import com.chylex.intellij.inspectionlens.InspectionLens
 | 
			
		||||
import com.chylex.intellij.inspectionlens.compatibility.SpellCheckerSupport
 | 
			
		||||
import com.chylex.intellij.inspectionlens.editor.lens.ColorMode.Companion.createColorAttributes
 | 
			
		||||
import com.intellij.lang.annotation.HighlightSeverity
 | 
			
		||||
import com.intellij.ui.ColorUtil
 | 
			
		||||
import com.intellij.ui.ColorUtil.toAlpha
 | 
			
		||||
import com.intellij.ui.JBColor
 | 
			
		||||
import java.awt.Color
 | 
			
		||||
import java.awt.Font
 | 
			
		||||
import java.util.Collections
 | 
			
		||||
import java.util.EnumMap
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Determines properties of inspection lenses based on severity.
 | 
			
		||||
 */
 | 
			
		||||
@Suppress("UseJBColor", "InspectionUsingGrayColors")
 | 
			
		||||
enum class LensSeverity(private val baseColor: Color, private val lightThemeDarkening: Int, private val darkThemeBrightening: Int) {
 | 
			
		||||
enum class LensSeverity(baseColor: Color, lightThemeDarkening: Int, darkThemeBrightening: Int) {
 | 
			
		||||
	ERROR          (Color(158,  41,  39), lightThemeDarkening = 2, darkThemeBrightening = 4),
 | 
			
		||||
	WARNING        (Color(190, 145,  23), lightThemeDarkening = 5, darkThemeBrightening = 1),
 | 
			
		||||
	WEAK_WARNING   (Color(117, 109,  86), lightThemeDarkening = 4, darkThemeBrightening = 4),
 | 
			
		||||
@@ -24,37 +23,18 @@ enum class LensSeverity(private val baseColor: Color, private val lightThemeDark
 | 
			
		||||
	TYPO           (Color( 73, 156,  84), lightThemeDarkening = 4, darkThemeBrightening = 1),
 | 
			
		||||
	OTHER          (Color(128, 128, 128), lightThemeDarkening = 2, darkThemeBrightening = 2);
 | 
			
		||||
	
 | 
			
		||||
	private lateinit var textAttributes: EnumMap<ColorMode, LensSeverityTextAttributes>
 | 
			
		||||
	private lateinit var lineAttributes: EnumMap<ColorMode, LensSeverityTextAttributes>
 | 
			
		||||
	val textAttributes: LensSeverityTextAttributes
 | 
			
		||||
	val lineAttributes: LensSeverityTextAttributes
 | 
			
		||||
	
 | 
			
		||||
	init {
 | 
			
		||||
		refreshColors()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	internal fun refreshColors() {
 | 
			
		||||
		val theme = if (ColorGenerator.useGenerator) {
 | 
			
		||||
			ColorGenerator.generate(name, baseColor)
 | 
			
		||||
		}
 | 
			
		||||
		else {
 | 
			
		||||
			val lightThemeTextColor = ColorUtil.saturate(ColorUtil.darker(baseColor, lightThemeDarkening), 1)
 | 
			
		||||
			val darkThemeTextColor = ColorUtil.desaturate(ColorUtil.brighter(baseColor, darkThemeBrightening), 2)
 | 
			
		||||
			
 | 
			
		||||
			val lightThemeLineColor = toAlpha(lightThemeTextColor, 10)
 | 
			
		||||
			val darkThemeLineColor = toAlpha(darkThemeTextColor, 13)
 | 
			
		||||
			
 | 
			
		||||
			ColorGenerator.Theme(lightThemeTextColor, lightThemeLineColor, darkThemeTextColor, darkThemeLineColor)
 | 
			
		||||
		}
 | 
			
		||||
		val lightThemeColor = ColorUtil.saturate(ColorUtil.darker(baseColor, lightThemeDarkening), 1)
 | 
			
		||||
		val darkThemeColor = ColorUtil.desaturate(ColorUtil.brighter(baseColor, darkThemeBrightening), 2)
 | 
			
		||||
		
 | 
			
		||||
		textAttributes = createColorAttributes(theme.lightThemeTextColor, theme.darkThemeTextColor) { LensSeverityTextAttributes(foregroundColor = it, fontStyle = Font.ITALIC) }
 | 
			
		||||
		lineAttributes = createColorAttributes(theme.lightThemeLineColor, theme.darkThemeLineColor) { LensSeverityTextAttributes(backgroundColor = it) }
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	internal fun getTextAttributes(colorMode: ColorMode): LensSeverityTextAttributes {
 | 
			
		||||
		return textAttributes.getValue(colorMode)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	internal fun getLineAttributes(colorMode: ColorMode): LensSeverityTextAttributes {
 | 
			
		||||
		return lineAttributes.getValue(colorMode)
 | 
			
		||||
		val textColor = JBColor(lightThemeColor, darkThemeColor)
 | 
			
		||||
		val lineColor = JBColor(toAlpha(lightThemeColor, 10), toAlpha(darkThemeColor, 13))
 | 
			
		||||
		
 | 
			
		||||
		textAttributes = LensSeverityTextAttributes(foregroundColor = textColor, fontStyle = Font.ITALIC)
 | 
			
		||||
		lineAttributes = LensSeverityTextAttributes(backgroundColor = lineColor)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
 
 | 
			
		||||
@@ -10,14 +10,18 @@ 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
 | 
			
		||||
@@ -73,7 +77,26 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 | 
			
		||||
	override fun createPanel(): DialogPanel {
 | 
			
		||||
		val settings = settingsService.state
 | 
			
		||||
		
 | 
			
		||||
		return panel {
 | 
			
		||||
		lateinit var panel: DialogPanel
 | 
			
		||||
		
 | 
			
		||||
		panel = panel {
 | 
			
		||||
			group("Appearance") {
 | 
			
		||||
				row {
 | 
			
		||||
					checkBox("Use editor font").bindSelected(settings::useEditorFont)
 | 
			
		||||
				}
 | 
			
		||||
				row("Max description length:") {
 | 
			
		||||
					intTextField(LensSettingsState.MAX_DESCRIPTION_LENGTH_RANGE, keyboardStep = 10).bindIntText(settings::maxDescriptionLength)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			group("Behavior") {
 | 
			
		||||
				row("Hover mode:") {
 | 
			
		||||
					val items = LensHoverMode.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 {
 | 
			
		||||
@@ -90,12 +113,19 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			group("Appearance") {
 | 
			
		||||
			group("Actions") {
 | 
			
		||||
				row {
 | 
			
		||||
					checkBox("Use editor font").bindSelected(settings::useEditorFont)
 | 
			
		||||
					button("Reset to Default") {
 | 
			
		||||
						if (MessageDialogBuilder.yesNo("Reset to Default", "Are you sure you want to reset settings to default?").ask(panel)) {
 | 
			
		||||
							settingsService.resetState()
 | 
			
		||||
							reset()
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
		return panel
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	private fun <K, V> Cell<JBCheckBox>.bindSelectedToNotIn(collection: MutableMap<K, V>, key: K, value: V): Cell<JBCheckBox> {
 | 
			
		||||
 
 | 
			
		||||
@@ -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")
 | 
			
		||||
}
 | 
			
		||||
@@ -21,6 +21,12 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 | 
			
		||||
		
 | 
			
		||||
		var showUnknownSeverities by property(true)
 | 
			
		||||
		var useEditorFont by property(true)
 | 
			
		||||
		var maxDescriptionLength by property(120)
 | 
			
		||||
		var lensHoverMode by enum(LensHoverMode.DEFAULT)
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	companion object {
 | 
			
		||||
		val MAX_DESCRIPTION_LENGTH_RANGE = 20..1000
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	@get:Synchronized
 | 
			
		||||
@@ -31,8 +37,27 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 | 
			
		||||
	val useEditorFont
 | 
			
		||||
		get() = state.useEditorFont
 | 
			
		||||
	
 | 
			
		||||
	val maxDescriptionLength
 | 
			
		||||
		get() = state.maxDescriptionLength
 | 
			
		||||
	
 | 
			
		||||
	val lensHoverMode
 | 
			
		||||
		get() = state.lensHoverMode
 | 
			
		||||
	
 | 
			
		||||
	override fun loadState(state: State) {
 | 
			
		||||
		super.loadState(state)
 | 
			
		||||
		state.maxDescriptionLength = state.maxDescriptionLength.coerceIn(MAX_DESCRIPTION_LENGTH_RANGE)
 | 
			
		||||
		update()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	fun resetState() {
 | 
			
		||||
		val default = State()
 | 
			
		||||
		
 | 
			
		||||
		state.hiddenSeverities.apply { clear(); putAll(default.hiddenSeverities) }
 | 
			
		||||
		state.showUnknownSeverities = default.showUnknownSeverities
 | 
			
		||||
		state.useEditorFont = default.useEditorFont
 | 
			
		||||
		state.maxDescriptionLength = default.maxDescriptionLength
 | 
			
		||||
		state.lensHoverMode = default.lensHoverMode
 | 
			
		||||
		
 | 
			
		||||
		update()
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
@@ -6,14 +6,25 @@
 | 
			
		||||
  <description><![CDATA[
 | 
			
		||||
    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>
 | 
			
		||||
    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. Configure visible severities in <b>Settings | Tools | Inspection Lens</a>.
 | 
			
		||||
    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>
 | 
			
		||||
    Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor. 
 | 
			
		||||
    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>
 | 
			
		||||
@@ -92,10 +103,4 @@
 | 
			
		||||
  <projectListeners>
 | 
			
		||||
    <listener class="com.chylex.intellij.inspectionlens.InspectionLensFileOpenedListener" topic="com.intellij.openapi.fileEditor.FileOpenedSyncListener" />
 | 
			
		||||
  </projectListeners>
 | 
			
		||||
  
 | 
			
		||||
  <actions>
 | 
			
		||||
    <action id="com.chylex.intellij.inspectionlens.debug.ShowColorEditorAction" class="com.chylex.intellij.inspectionlens.debug.ShowColorEditorAction" text="Inspection Lens - Show Color Editor">
 | 
			
		||||
      <add-to-group group-id="ToolsMenu" anchor="last" />
 | 
			
		||||
    </action>
 | 
			
		||||
  </actions>
 | 
			
		||||
</idea-plugin>
 | 
			
		||||
 
 | 
			
		||||
@@ -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