mirror of
https://github.com/chylex/IntelliJ-Inspection-Lens.git
synced 2026-10-16 23:33:58 +02:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed0b37b86c
|
+14
-27
@@ -1,21 +1,12 @@
|
|||||||
@file:Suppress("ConvertLambdaToReference")
|
@file:Suppress("ConvertLambdaToReference")
|
||||||
|
|
||||||
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("org.jetbrains.intellij.platform")
|
id("org.jetbrains.intellij.platform")
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.chylex.intellij.inspectionlens"
|
group = "com.chylex.intellij.inspectionlens"
|
||||||
version = "1.7.0"
|
version = "1.5.1"
|
||||||
|
|
||||||
idea {
|
|
||||||
module {
|
|
||||||
excludeDirs.add(file(".kotlin"))
|
|
||||||
excludeDirs.add(file("build"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@@ -27,44 +18,40 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
intellijIdeaUltimate("2025.3")
|
intellijIdeaUltimate("2023.3.3")
|
||||||
bundledPlugin("tanvd.grazi")
|
bundledPlugin("tanvd.grazi")
|
||||||
|
|
||||||
testFramework(TestFrameworkType.JUnit5)
|
// https://plugins.jetbrains.com/plugin/12175-grazie-lite/versions
|
||||||
|
// plugin("tanvd.grazi", "233.13135.14")
|
||||||
}
|
}
|
||||||
|
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
|
||||||
testRuntimeOnly("junit:junit:4.13.2") // https://youtrack.jetbrains.com/projects/IJPL/issues/IJPL-159134
|
|
||||||
}
|
}
|
||||||
|
|
||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
pluginConfiguration {
|
pluginConfiguration {
|
||||||
ideaVersion {
|
ideaVersion {
|
||||||
sinceBuild.set("253")
|
sinceBuild.set("233.11361.10")
|
||||||
untilBuild.set(provider { null })
|
untilBuild.set(provider { null })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginVerification {
|
|
||||||
freeArgs.add("-mute")
|
|
||||||
freeArgs.add("TemplateWordInPluginId")
|
|
||||||
|
|
||||||
ides {
|
|
||||||
recommended()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
|
|
||||||
compilerOptions {
|
compilerOptions {
|
||||||
freeCompilerArgs = listOf(
|
freeCompilerArgs = listOf(
|
||||||
"-X" + "jvm-default=all",
|
"-X" + "jvm-default=all"
|
||||||
"-X" + "lambdas=indy"
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.test {
|
tasks.withType<Test>().configureEach {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val testSnapshot by intellijPlatformTesting.testIde.registering {
|
||||||
|
version = "LATEST-EAP-SNAPSHOT"
|
||||||
|
useInstaller = false
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
org.gradle.caching = true
|
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+1
-3
@@ -1,9 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015 the original authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# gradlew start up script for POSIX generated by Gradle.
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
#
|
#
|
||||||
# Important for running:
|
# Important for running:
|
||||||
#
|
#
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
# bash, then to run this script, type that shell name before the whole
|
# bash, then to run this script, type that shell name before the whole
|
||||||
# command line, like:
|
# command line, like:
|
||||||
#
|
#
|
||||||
# ksh gradlew
|
# ksh Gradle
|
||||||
#
|
#
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -114,6 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -171,6 +172,7 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -203,14 +205,15 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# and any embedded shellness will be escaped.
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# treated as '${Hostname}' itself on the command line.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
Vendored
+24
-12
@@ -19,12 +19,12 @@
|
|||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem gradlew startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
@rem Set local scope for the variables with windows NT shell
|
||||||
setlocal EnableExtensions
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@@ -51,7 +51,7 @@ echo. 1>&2
|
|||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
@@ -65,18 +65,30 @@ echo. 1>&2
|
|||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
goto fail
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute gradlew
|
@rem Execute Gradle
|
||||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
@rem which allows us to clear the local environment before executing the java command
|
|
||||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
|
||||||
|
|
||||||
:exitWithErrorLevel
|
:end
|
||||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
@rem End local scope for the variables with windows NT shell
|
||||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@ rootProject.name = "InspectionLens"
|
|||||||
|
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "2.4.0" // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
|
kotlin("jvm") version "1.9.21"
|
||||||
id("org.jetbrains.intellij.platform") version "2.18.1" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
|
id("org.jetbrains.intellij.platform") version "2.2.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,10 @@ package com.chylex.intellij.inspectionlens
|
|||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.EditorLensFeatures
|
import com.chylex.intellij.inspectionlens.editor.EditorLensFeatures
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.openapi.diagnostic.logger
|
import com.intellij.openapi.components.service
|
||||||
import com.intellij.openapi.fileEditor.FileEditorManager
|
import com.intellij.openapi.fileEditor.FileEditorManager
|
||||||
import com.intellij.openapi.fileEditor.TextEditor
|
import com.intellij.openapi.fileEditor.TextEditor
|
||||||
import com.intellij.openapi.project.ProjectManager
|
import com.intellij.openapi.project.ProjectManager
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles installation and uninstallation of plugin features in editors.
|
* Handles installation and uninstallation of plugin features in editors.
|
||||||
@@ -14,33 +13,27 @@ import java.util.concurrent.atomic.AtomicBoolean
|
|||||||
internal object InspectionLens {
|
internal object InspectionLens {
|
||||||
const val PLUGIN_ID = "com.chylex.intellij.inspectionlens"
|
const val PLUGIN_ID = "com.chylex.intellij.inspectionlens"
|
||||||
|
|
||||||
val LOG = logger<InspectionLens>()
|
|
||||||
|
|
||||||
var SHOW_LENSES = true
|
|
||||||
set(value) {
|
|
||||||
field = value
|
|
||||||
scheduleRefresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Installs lenses into [editor].
|
* Installs lenses into [editor].
|
||||||
*/
|
*/
|
||||||
fun install(editor: TextEditor) {
|
fun install(editor: TextEditor) {
|
||||||
EditorLensFeatures.install(editor)
|
EditorLensFeatures.install(editor.editor, service<InspectionLensPluginDisposableService>().intersect(editor))
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Installs lenses into all open editors.
|
* Installs lenses into all open editors.
|
||||||
*/
|
*/
|
||||||
fun install() {
|
fun install() {
|
||||||
forEachOpenEditor(EditorLensFeatures::install)
|
forEachOpenEditor(::install)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refreshes lenses in all open editors.
|
* Refreshes lenses in all open editors.
|
||||||
*/
|
*/
|
||||||
private fun refresh() {
|
private fun refresh() {
|
||||||
forEachOpenEditor(EditorLensFeatures::refresh)
|
forEachOpenEditor {
|
||||||
|
EditorLensFeatures.refresh(it.editor)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -56,31 +49,31 @@ internal object InspectionLens {
|
|||||||
private inline fun forEachOpenEditor(action: (TextEditor) -> Unit) {
|
private inline fun forEachOpenEditor(action: (TextEditor) -> Unit) {
|
||||||
val projectManager = ProjectManager.getInstanceIfCreated() ?: return
|
val projectManager = ProjectManager.getInstanceIfCreated() ?: return
|
||||||
|
|
||||||
for (project in projectManager.openProjects) {
|
for (project in projectManager.openProjects.filterNot { it.isDisposed }) {
|
||||||
if (project.isDisposed) {
|
for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
|
||||||
continue
|
action(editor)
|
||||||
}
|
|
||||||
|
|
||||||
for (editor in FileEditorManager.getInstance(project).allEditors) {
|
|
||||||
if (editor is TextEditor) {
|
|
||||||
action(editor)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private object Refresh : Runnable {
|
private object Refresh {
|
||||||
private val needsRefresh = AtomicBoolean(false)
|
private var needsRefresh = false
|
||||||
|
|
||||||
fun schedule() {
|
fun schedule() {
|
||||||
if (needsRefresh.compareAndSet(false, true)) {
|
synchronized(this) {
|
||||||
ApplicationManager.getApplication().invokeLater(this)
|
if (!needsRefresh) {
|
||||||
|
needsRefresh = true
|
||||||
|
ApplicationManager.getApplication().invokeLater(this::run)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun run() {
|
private fun run() {
|
||||||
if (needsRefresh.compareAndSet(true, false)) {
|
synchronized(this) {
|
||||||
refresh()
|
if (needsRefresh) {
|
||||||
|
needsRefresh = false
|
||||||
|
refresh()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens
|
|
||||||
|
|
||||||
import com.intellij.openapi.fileEditor.FileEditorManager
|
|
||||||
import com.intellij.openapi.fileEditor.FileEditorManagerListener
|
|
||||||
import com.intellij.openapi.fileEditor.FileOpenedSyncListener
|
|
||||||
import com.intellij.openapi.fileEditor.TextEditor
|
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Installs [InspectionLens] in opened editors.
|
|
||||||
*
|
|
||||||
* Used instead of [FileOpenedSyncListener], because [FileOpenedSyncListener] randomly fails to register during IDE startup.
|
|
||||||
*/
|
|
||||||
class InspectionLensFileEditorManagerListener : FileEditorManagerListener {
|
|
||||||
override fun fileOpened(source: FileEditorManager, file: VirtualFile) {
|
|
||||||
for (editor in source.getEditors(file)) {
|
|
||||||
if (editor is TextEditor) {
|
|
||||||
InspectionLens.install(editor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens
|
||||||
|
|
||||||
|
import com.intellij.openapi.fileEditor.FileEditorManager
|
||||||
|
import com.intellij.openapi.fileEditor.FileOpenedSyncListener
|
||||||
|
import com.intellij.openapi.fileEditor.TextEditor
|
||||||
|
import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider
|
||||||
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Installs [InspectionLens] in newly opened editors.
|
||||||
|
*/
|
||||||
|
class InspectionLensFileOpenedListener : FileOpenedSyncListener {
|
||||||
|
override fun fileOpenedSync(source: FileEditorManager, file: VirtualFile, editorsWithProviders: List<FileEditorWithProvider>) {
|
||||||
|
for (editorWrapper in editorsWithProviders) {
|
||||||
|
val fileEditor = editorWrapper.fileEditor
|
||||||
|
if (fileEditor is TextEditor) {
|
||||||
|
InspectionLens.install(fileEditor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.actions
|
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
|
||||||
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
|
||||||
import com.intellij.openapi.actionSystem.AnActionEvent
|
|
||||||
import com.intellij.openapi.actionSystem.KeepPopupOnPerform
|
|
||||||
import com.intellij.openapi.project.DumbAwareToggleAction
|
|
||||||
|
|
||||||
class ToggleLensVisibilityAction : DumbAwareToggleAction() {
|
|
||||||
init {
|
|
||||||
templatePresentation.keepPopupOnPerform = KeepPopupOnPerform.IfRequested
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getActionUpdateThread(): ActionUpdateThread {
|
|
||||||
return ActionUpdateThread.BGT
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isSelected(e: AnActionEvent): Boolean {
|
|
||||||
return InspectionLens.SHOW_LENSES
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun setSelected(e: AnActionEvent, state: Boolean) {
|
|
||||||
InspectionLens.SHOW_LENSES = state
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,6 +8,8 @@ import com.intellij.openapi.startup.ProjectActivity
|
|||||||
class GrazieSupport : ProjectActivity {
|
class GrazieSupport : ProjectActivity {
|
||||||
override suspend fun execute(project: Project) {
|
override suspend fun execute(project: Project) {
|
||||||
LensSeverity.registerMapping(TextProblemSeverities.GRAMMAR_ERROR, LensSeverity.ERROR)
|
LensSeverity.registerMapping(TextProblemSeverities.GRAMMAR_ERROR, LensSeverity.ERROR)
|
||||||
|
LensSeverity.registerMapping(TextProblemSeverities.STYLE_ERROR, LensSeverity.GRAZIE)
|
||||||
|
LensSeverity.registerMapping(TextProblemSeverities.STYLE_WARNING, LensSeverity.GRAZIE)
|
||||||
LensSeverity.registerMapping(TextProblemSeverities.STYLE_SUGGESTION, LensSeverity.GRAZIE)
|
LensSeverity.registerMapping(TextProblemSeverities.STYLE_SUGGESTION, LensSeverity.GRAZIE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.InspectionLensPluginDisposableService
|
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.Disposable
|
||||||
import com.intellij.openapi.components.service
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.editor.ex.FoldingModelEx
|
import com.intellij.openapi.editor.ex.FoldingModelEx
|
||||||
import com.intellij.openapi.editor.ex.MarkupModelEx
|
import com.intellij.openapi.editor.ex.MarkupModelEx
|
||||||
import com.intellij.openapi.editor.impl.DocumentMarkupModel
|
import com.intellij.openapi.editor.impl.DocumentMarkupModel
|
||||||
import com.intellij.openapi.fileEditor.TextEditor
|
|
||||||
import com.intellij.openapi.util.Disposer
|
import com.intellij.openapi.util.Disposer
|
||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
|
|
||||||
@@ -39,24 +36,21 @@ internal class EditorLensFeatures private constructor(
|
|||||||
companion object {
|
companion object {
|
||||||
private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
|
private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
|
||||||
|
|
||||||
fun install(owner: TextEditor) {
|
fun install(editor: Editor, disposable: Disposable) {
|
||||||
val editor = owner.editor
|
|
||||||
if (editor.getUserData(EDITOR_KEY) != null) {
|
if (editor.getUserData(EDITOR_KEY) != null) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val markupModel = DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx ?: return
|
val markupModel = DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx ?: return
|
||||||
val foldingModel = editor.foldingModel as? FoldingModelEx
|
val foldingModel = editor.foldingModel as? FoldingModelEx
|
||||||
|
|
||||||
val disposable = service<InspectionLensPluginDisposableService>().intersect(owner)
|
|
||||||
val features = EditorLensFeatures(editor, markupModel, foldingModel, disposable)
|
val features = EditorLensFeatures(editor, markupModel, foldingModel, disposable)
|
||||||
|
|
||||||
editor.putUserData(EDITOR_KEY, features)
|
editor.putUserData(EDITOR_KEY, features)
|
||||||
Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
|
Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun refresh(owner: TextEditor) {
|
fun refresh(editor: Editor) {
|
||||||
owner.editor.getUserData(EDITOR_KEY)?.refresh()
|
editor.getUserData(EDITOR_KEY)?.refresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,26 +14,23 @@ internal class EditorLensManager(private val editor: Editor) {
|
|||||||
private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
|
private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
|
||||||
private val settings = service<LensSettingsState>()
|
private val settings = service<LensSettingsState>()
|
||||||
|
|
||||||
private fun show(inspection: Inspection) {
|
private fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||||
if (editor.isDisposed) {
|
val (highlighter, info) = highlighterWithInfo
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val highlighter = inspection.highlighter
|
|
||||||
if (!highlighter.isValid) {
|
if (!highlighter.isValid) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val existingLens = lenses[highlighter]
|
val existingLens = lenses[highlighter]
|
||||||
if (existingLens != null) {
|
if (existingLens != null) {
|
||||||
if (existingLens.update(inspection, settings)) {
|
if (existingLens.update(info, settings)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
existingLens.hide()
|
existingLens.hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
val newLens = EditorLens.show(editor, inspection, settings)
|
val newLens = EditorLens.show(editor, info, settings)
|
||||||
if (newLens != null) {
|
if (newLens != null) {
|
||||||
lenses[highlighter] = newLens
|
lenses[highlighter] = newLens
|
||||||
}
|
}
|
||||||
@@ -66,9 +63,9 @@ internal class EditorLensManager(private val editor: Editor) {
|
|||||||
sealed interface Command {
|
sealed interface Command {
|
||||||
fun apply(lensManager: EditorLensManager)
|
fun apply(lensManager: EditorLensManager)
|
||||||
|
|
||||||
class Show(private val inspection: Inspection) : Command {
|
class Show(private val highlighter: HighlighterWithInfo) : Command {
|
||||||
override fun apply(lensManager: EditorLensManager) {
|
override fun apply(lensManager: EditorLensManager) {
|
||||||
lensManager.show(inspection)
|
lensManager.show(highlighter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +85,7 @@ internal class EditorLensManager(private val editor: Editor) {
|
|||||||
/**
|
/**
|
||||||
* Batch mode affects both inlays and highlighters used for line colors.
|
* Batch mode affects both inlays and highlighters used for line colors.
|
||||||
*/
|
*/
|
||||||
|
@Suppress("ConvertLambdaToReference")
|
||||||
private inline fun executeInBatchMode(operations: Int, crossinline action: () -> Unit) {
|
private inline fun executeInBatchMode(operations: Int, crossinline action: () -> Unit) {
|
||||||
if (operations > 1000) {
|
if (operations > 1000) {
|
||||||
editor.inlayModel.execute(true) { action() }
|
editor.inlayModel.execute(true) { action() }
|
||||||
|
|||||||
+2
-2
@@ -7,8 +7,8 @@ internal class EditorLensManagerDispatcher(private val lensManager: EditorLensMa
|
|||||||
private var queuedItems = mutableListOf<EditorLensManager.Command>()
|
private var queuedItems = mutableListOf<EditorLensManager.Command>()
|
||||||
private var isEnqueued = false
|
private var isEnqueued = false
|
||||||
|
|
||||||
fun show(inspection: Inspection) {
|
fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||||
enqueue(EditorLensManager.Command.Show(inspection))
|
enqueue(EditorLensManager.Command.Show(highlighterWithInfo))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun hide(highlighter: RangeHighlighter) {
|
fun hide(highlighter: RangeHighlighter) {
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.daemon.impl.AsyncDescriptionSupplier
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
|
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||||
|
import java.util.function.Consumer
|
||||||
|
|
||||||
|
open class HighlighterWithInfo private constructor(val highlighter: RangeHighlighter, private val info: HighlightInfo) {
|
||||||
|
val hasDescription
|
||||||
|
get() = info.description != null
|
||||||
|
|
||||||
|
operator fun component1() = highlighter
|
||||||
|
operator fun component2() = info
|
||||||
|
|
||||||
|
class Async(highlighter: RangeHighlighter, info: HighlightInfo, private val provider: AsyncDescriptionSupplier) : HighlighterWithInfo(highlighter, info) {
|
||||||
|
fun requestDescription(callback: Consumer<String?>) {
|
||||||
|
provider.requestDescription().onSuccess(callback)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun from(highlighter: RangeHighlighter, info: HighlightInfo) =
|
||||||
|
if (info is AsyncDescriptionSupplier)
|
||||||
|
Async(highlighter, info, info)
|
||||||
|
else
|
||||||
|
HighlighterWithInfo(highlighter, info)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
|
||||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
|
||||||
|
|
||||||
data class Inspection(val highlighter: RangeHighlighter, val info: HighlightInfo)
|
|
||||||
+36
-41
@@ -1,10 +1,7 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
|
||||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
import com.intellij.codeInsight.daemon.impl.AsyncDescriptionSupplier
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
import com.intellij.codeInsight.daemon.impl.UpdateHighlightersUtil.isFileLevelOrGutterAnnotation
|
|
||||||
import com.intellij.openapi.components.service
|
import com.intellij.openapi.components.service
|
||||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
||||||
import com.intellij.openapi.editor.impl.event.MarkupModelListener
|
import com.intellij.openapi.editor.impl.event.MarkupModelListener
|
||||||
@@ -24,51 +21,49 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
|
|||||||
showIfValid(highlighter)
|
showIfValid(highlighter)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
|
||||||
if (InspectionLens.SHOW_LENSES) {
|
|
||||||
highlighters.forEach(::showIfValid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showIfValid(highlighter: RangeHighlighter) {
|
|
||||||
if (!InspectionLens.SHOW_LENSES) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
|
|
||||||
if (info == null || isFileLevelOrGutterAnnotation(info)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (info is AsyncDescriptionSupplier) {
|
|
||||||
info.requestDescription().onSuccess {
|
|
||||||
if (highlighter.isValid) {
|
|
||||||
showInspection(highlighter, info)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
showInspection(highlighter, info)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
|
||||||
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showInspection(highlighter: RangeHighlighter, info: HighlightInfo) {
|
|
||||||
if (info.description != null) {
|
|
||||||
lensManagerDispatcher.show(Inspection(highlighter, info))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
||||||
if (getFilteredHighlightInfo(highlighter) != null) {
|
if (getFilteredHighlightInfo(highlighter) != null) {
|
||||||
lensManagerDispatcher.hide(highlighter)
|
lensManagerDispatcher.hide(highlighter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun showIfValid(highlighter: RangeHighlighter) {
|
||||||
|
runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
||||||
|
highlighterWithInfo.requestDescription {
|
||||||
|
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
||||||
|
lensManagerDispatcher.show(highlighterWithInfo)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
||||||
|
highlighters.forEach(::showIfValid)
|
||||||
|
}
|
||||||
|
|
||||||
fun hideAll() {
|
fun hideAll() {
|
||||||
lensManagerDispatcher.hideAll()
|
lensManagerDispatcher.hideAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
||||||
|
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
||||||
|
}
|
||||||
|
|
||||||
|
private inline fun runWithHighlighterIfValid(highlighter: RangeHighlighter, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
||||||
|
val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
|
||||||
|
if (info != null) {
|
||||||
|
processHighlighterWithInfo(HighlighterWithInfo.from(highlighter, info), actionForImmediate, actionForAsync)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
||||||
|
if (highlighterWithInfo is HighlighterWithInfo.Async) {
|
||||||
|
actionForAsync(highlighterWithInfo)
|
||||||
|
}
|
||||||
|
else if (highlighterWithInfo.hasDescription) {
|
||||||
|
actionForImmediate(highlighterWithInfo)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
|
||||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
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.Editor
|
||||||
|
|
||||||
internal class EditorLens private constructor(private var inlay: EditorLensInlay, private var lineBackground: EditorLensLineBackground, private var severity: LensSeverity) {
|
internal class EditorLens private constructor(private var inlay: EditorLensInlay, private var lineBackground: EditorLensLineBackground, private var severity: LensSeverity) {
|
||||||
fun update(inspection: Inspection, settings: LensSettingsState): Boolean {
|
fun update(info: HighlightInfo, settings: LensSettingsState): Boolean {
|
||||||
val editor = inlay.editor
|
val editor = inlay.editor
|
||||||
val oldSeverity = severity
|
val oldSeverity = severity
|
||||||
|
|
||||||
severity = LensSeverity.from(inspection.info.severity)
|
severity = LensSeverity.from(info.severity)
|
||||||
|
|
||||||
if (!inlay.tryUpdate(inspection)) {
|
if (!inlay.tryUpdate(info)) {
|
||||||
inlay = EditorLensInlay.show(editor, inspection, settings) ?: return false
|
inlay = EditorLensInlay.show(editor, info, settings) ?: return false
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lineBackground.isInvalid || oldSeverity != severity) {
|
if (lineBackground.isInvalid || oldSeverity != severity) {
|
||||||
lineBackground.hide(editor)
|
lineBackground.hide(editor)
|
||||||
lineBackground = EditorLensLineBackground.show(editor, inspection.info)
|
lineBackground = EditorLensLineBackground.show(editor, info)
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
@@ -33,9 +33,8 @@ internal class EditorLens private constructor(private var inlay: EditorLensInlay
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun show(editor: Editor, inspection: Inspection, settings: LensSettingsState): EditorLens? {
|
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
|
||||||
val info = inspection.info
|
val inlay = EditorLensInlay.show(editor, info, settings) ?: return null
|
||||||
val inlay = EditorLensInlay.show(editor, inspection, settings) ?: return null
|
|
||||||
val lineBackground = EditorLensLineBackground.show(editor, info)
|
val lineBackground = EditorLensLineBackground.show(editor, info)
|
||||||
val severity = LensSeverity.from(info.severity)
|
val severity = LensSeverity.from(info.severity)
|
||||||
return EditorLens(inlay, lineBackground, severity)
|
return EditorLens(inlay, lineBackground, severity)
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
|
||||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
@@ -12,12 +11,12 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
|||||||
val editor
|
val editor
|
||||||
get() = inlay.editor
|
get() = inlay.editor
|
||||||
|
|
||||||
fun tryUpdate(inspection: Inspection): Boolean {
|
fun tryUpdate(info: HighlightInfo): Boolean {
|
||||||
if (!inlay.isValid) {
|
if (!inlay.isValid) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
inlay.renderer.setPropertiesFrom(inspection)
|
inlay.renderer.setPropertiesFrom(info)
|
||||||
inlay.update()
|
inlay.update()
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -27,10 +26,10 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun show(editor: Editor, inspection: Inspection, settings: LensSettingsState): EditorLensInlay? {
|
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLensInlay? {
|
||||||
val offset = getInlayHintOffset(inspection.info)
|
val offset = getInlayHintOffset(info)
|
||||||
val priority = getInlayHintPriority(editor, inspection.info)
|
val priority = getInlayHintPriority(editor, info)
|
||||||
val renderer = LensRenderer(inspection, settings)
|
val renderer = LensRenderer(info, settings)
|
||||||
|
|
||||||
val properties = InlayProperties()
|
val properties = InlayProperties()
|
||||||
.relatesToPrecedingText(true)
|
.relatesToPrecedingText(true)
|
||||||
@@ -72,6 +71,6 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
|||||||
private fun getLineStartOffset(editor: Editor, offset: Int): Int {
|
private fun getLineStartOffset(editor: Editor, offset: Int): Int {
|
||||||
val position = editor.offsetToLogicalPosition(offset)
|
val position = editor.offsetToLogicalPosition(offset)
|
||||||
return editor.document.getLineStartOffset(position.line)
|
return editor.document.getLineStartOffset(position.line)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-4
@@ -14,10 +14,6 @@ internal value class EditorLensLineBackground(private val highlighter: RangeHigh
|
|||||||
get() = !highlighter.isValid
|
get() = !highlighter.isValid
|
||||||
|
|
||||||
fun onFoldRegionsChanged(editor: Editor, severity: LensSeverity) {
|
fun onFoldRegionsChanged(editor: Editor, severity: LensSeverity) {
|
||||||
if (isInvalid) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (highlighter is RangeHighlighterEx) {
|
if (highlighter is RangeHighlighterEx) {
|
||||||
highlighter.textAttributes = getAttributes(editor, highlighter.startOffset, highlighter.endOffset, severity)
|
highlighter.textAttributes = getAttributes(editor, highlighter.startOffset, highlighter.endOffset, severity)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,128 +1,54 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo.IntentionActionDescriptor
|
|
||||||
import com.intellij.codeInsight.daemon.impl.IntentionsUI
|
import com.intellij.codeInsight.daemon.impl.IntentionsUI
|
||||||
import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass
|
|
||||||
import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass.IntentionsInfo
|
|
||||||
import com.intellij.codeInsight.hint.HintManager
|
import com.intellij.codeInsight.hint.HintManager
|
||||||
import com.intellij.codeInsight.intention.impl.CachedIntentions
|
import com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction
|
||||||
import com.intellij.codeInsight.intention.impl.IntentionHintComponent
|
|
||||||
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
|
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
|
||||||
import com.intellij.ide.DataManager
|
import com.intellij.lang.LangBundle
|
||||||
import com.intellij.openapi.actionSystem.ActionManager
|
import com.intellij.openapi.actionSystem.ActionManager
|
||||||
import com.intellij.openapi.actionSystem.ActionPlaces
|
import com.intellij.openapi.actionSystem.ActionPlaces
|
||||||
import com.intellij.openapi.actionSystem.ActionUiKind
|
|
||||||
import com.intellij.openapi.actionSystem.AnActionEvent
|
|
||||||
import com.intellij.openapi.actionSystem.IdeActions
|
import com.intellij.openapi.actionSystem.IdeActions
|
||||||
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
import com.intellij.openapi.actionSystem.ex.ActionUtil
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.editor.Inlay
|
|
||||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.PsiDocumentManager
|
import com.intellij.psi.PsiDocumentManager
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import com.intellij.psi.util.PsiUtilBase
|
import com.intellij.psi.util.PsiUtilBase
|
||||||
import com.intellij.ui.awt.RelativePoint
|
|
||||||
import java.lang.reflect.Method
|
|
||||||
|
|
||||||
internal object IntentionsPopup {
|
internal object IntentionsPopup {
|
||||||
private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
|
fun show(editor: Editor) {
|
||||||
|
if (!tryShow(editor)) {
|
||||||
private val showPopupMethod: ShowPopupMethod? = try {
|
HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
|
||||||
val method = IntentionHintComponent::class.java.declaredMethods.first { method ->
|
|
||||||
val parameterTypes = method.parameterTypes
|
|
||||||
|
|
||||||
method.name == "showPopup" &&
|
|
||||||
parameterTypes.size == 2 &&
|
|
||||||
parameterTypes[0] === RelativePoint::class.java &&
|
|
||||||
parameterTypes[1].name == INTENTION_SOURCE_CLASS_NAME
|
|
||||||
}
|
|
||||||
|
|
||||||
method.isAccessible = true
|
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val intentionSourceEnum = Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>
|
|
||||||
val intentionSource = intentionSourceEnum.enumConstants.first { it.name == "OTHER" }
|
|
||||||
|
|
||||||
ShowPopupMethod(method, arrayOf(null, intentionSource))
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
InspectionLens.LOG.warn("Could not initialize intention popup", t)
|
|
||||||
null
|
|
||||||
}
|
|
||||||
|
|
||||||
val hasShowPopupMethod
|
|
||||||
get() = showPopupMethod != null
|
|
||||||
|
|
||||||
private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
|
|
||||||
operator fun invoke(component: IntentionHintComponent) {
|
|
||||||
method.invoke(component, *args)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun show(inspection: Inspection, inlay: Inlay<*>) {
|
private fun tryShow(editor: Editor): Boolean {
|
||||||
if (!tryShow(inspection, inlay)) {
|
// If the IDE uses the default Show Intentions action and handler,
|
||||||
HintManager.getInstance().showInformationHint(inlay.editor, "No context actions available at this location")
|
// use the handler directly to bypass additional logic from the action.
|
||||||
|
val action = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
||||||
|
if (action.javaClass === ShowIntentionActionsAction::class.java) {
|
||||||
|
return tryShowWithDefaultHandler(editor)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ActionUtil.invokeAction(action, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryShow(inspection: Inspection, inlay: Inlay<*>): Boolean {
|
private fun tryShowWithDefaultHandler(editor: Editor): Boolean {
|
||||||
val editor = inlay.editor
|
|
||||||
val project = editor.project ?: return false
|
val project = editor.project ?: return false
|
||||||
val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
|
val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
|
||||||
|
|
||||||
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
IntentionsUI.getInstance(project).hide()
|
IntentionsUI.getInstance(project).hide()
|
||||||
|
|
||||||
val intentions = collectIntentions(editor, file, inspection.highlighter, inlay.offset)
|
HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
|
||||||
if (intentions == null) {
|
return true
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
showIntentionsPopup(project, file, editor, intentions)
|
|
||||||
return true
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
InspectionLens.LOG.error("Could not show intention popup", t)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun collectIntentions(editor: Editor, file: PsiFile, highlighter: RangeHighlighter, offset: Int): IntentionsInfo? {
|
private val HANDLER = object : ShowIntentionActionsHandler() {
|
||||||
val resolvedInfo = HighlightInfo.fromRangeHighlighter(highlighter)
|
public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
|
||||||
if (resolvedInfo == null) {
|
super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
val intentionActions = mutableListOf<IntentionActionDescriptor>()
|
|
||||||
|
|
||||||
resolvedInfo.findRegisteredQuickFix { descriptor, _ ->
|
|
||||||
if (ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
|
|
||||||
intentionActions.add(descriptor)
|
|
||||||
}
|
|
||||||
null
|
|
||||||
}
|
|
||||||
|
|
||||||
return IntentionsInfo().also {
|
|
||||||
it.offset = offset
|
|
||||||
ShowIntentionsPass.fillIntentionsInfoForHighlightInfo(resolvedInfo, it, intentionActions)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showIntentionsPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
|
||||||
if (intentions.isEmpty || showPopupMethod == null) {
|
|
||||||
val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
|
||||||
val dataContext = DataManager.getInstance().getDataContext(editor.component)
|
|
||||||
val event = AnActionEvent.createEvent(showIntentionsAction, dataContext, null, ActionPlaces.EDITOR_INLAY, ActionUiKind.NONE, null)
|
|
||||||
ActionUtil.performAction(showIntentionsAction, event)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
val cachedIntentions = CachedIntentions.create(project, file, editor, intentions)
|
|
||||||
val hintComponent = IntentionHintComponent.showIntentionHint(project, file, editor, false, cachedIntentions)
|
|
||||||
showPopupMethod.invoke(hintComponent)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
|
||||||
import com.chylex.intellij.inspectionlens.settings.LensHoverMode
|
import com.chylex.intellij.inspectionlens.settings.LensHoverMode
|
||||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
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.daemon.impl.HintRenderer
|
||||||
import com.intellij.codeInsight.hints.presentation.InputHandler
|
import com.intellij.codeInsight.hints.presentation.InputHandler
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
@@ -27,14 +27,14 @@ import javax.swing.SwingUtilities
|
|||||||
/**
|
/**
|
||||||
* Renders the text of an inspection lens.
|
* Renders the text of an inspection lens.
|
||||||
*/
|
*/
|
||||||
class LensRenderer(private var inspection: Inspection, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
|
class LensRenderer(private var info: HighlightInfo, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
|
||||||
private lateinit var inlay: Inlay<*>
|
private lateinit var inlay: Inlay<*>
|
||||||
private lateinit var attributes: LensSeverityTextAttributes
|
private lateinit var attributes: LensSeverityTextAttributes
|
||||||
private var extraRightPadding = 0
|
private var extraRightPadding = 0
|
||||||
private var hovered = false
|
private var hovered = false
|
||||||
|
|
||||||
init {
|
init {
|
||||||
setPropertiesFrom(inspection)
|
setPropertiesFrom(info)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setInlay(inlay: Inlay<*>) {
|
fun setInlay(inlay: Inlay<*>) {
|
||||||
@@ -42,12 +42,12 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
this.inlay = inlay
|
this.inlay = inlay
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setPropertiesFrom(inspection: Inspection) {
|
fun setPropertiesFrom(info: HighlightInfo) {
|
||||||
this.inspection = inspection
|
this.info = info
|
||||||
val description = getValidDescriptionText(inspection.info.description, settings.maxDescriptionLength)
|
val description = getValidDescriptionText(info.description)
|
||||||
|
|
||||||
text = description
|
text = description
|
||||||
attributes = LensSeverity.from(inspection.info.severity).textAttributes
|
attributes = LensSeverity.from(info.severity).textAttributes
|
||||||
extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
|
extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
fixBaselineForTextRendering(r)
|
fixBaselineForTextRendering(r)
|
||||||
super.paint(inlay, g, r, textAttributes)
|
super.paint(inlay, g, r, textAttributes)
|
||||||
|
|
||||||
if (hovered) {
|
if (hovered && isHoveringText()) {
|
||||||
paintHoverEffect(inlay, g, r)
|
paintHoverEffect(inlay, g, r)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun mouseMoved(event: MouseEvent, translated: Point) {
|
override fun mouseMoved(event: MouseEvent, translated: Point) {
|
||||||
setHovered(isHoveringText())
|
setHovered(isHoveringText(translated))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun mouseExited() {
|
override fun mouseExited() {
|
||||||
@@ -114,7 +114,7 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
|
|
||||||
override fun mousePressed(event: MouseEvent, translated: Point) {
|
override fun mousePressed(event: MouseEvent, translated: Point) {
|
||||||
val hoverMode = settings.lensHoverMode
|
val hoverMode = settings.lensHoverMode
|
||||||
if (hoverMode == LensHoverMode.DISABLED || !isHoveringText()) {
|
if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,21 +122,25 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
event.consume()
|
event.consume()
|
||||||
|
|
||||||
val editor = inlay.editor
|
val editor = inlay.editor
|
||||||
moveToOffset(editor, inspection.info.actualStartOffset)
|
moveToOffset(editor, info.actualStartOffset)
|
||||||
|
|
||||||
if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
|
if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
|
||||||
IntentionsPopup.show(inspection, inlay)
|
IntentionsPopup.show(editor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun isHoveringText(): Boolean {
|
private fun isHoveringText(): Boolean {
|
||||||
val bounds = inlay.bounds ?: return false
|
val bounds = inlay.bounds ?: return false
|
||||||
val point = MouseInfo.getPointerInfo().location.apply {
|
val translatedPoint = MouseInfo.getPointerInfo().location.apply {
|
||||||
SwingUtilities.convertPointFromScreen(this, inlay.editor.contentComponent)
|
SwingUtilities.convertPointFromScreen(this, inlay.editor.contentComponent)
|
||||||
translate(-bounds.x, -bounds.y)
|
translate(-bounds.x, -bounds.y)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return isHoveringText(translatedPoint)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isHoveringText(point: Point): Boolean {
|
||||||
return point.x >= HOVER_HORIZONTAL_PADDING
|
return point.x >= HOVER_HORIZONTAL_PADDING
|
||||||
&& point.y >= 4
|
&& point.y >= 4
|
||||||
&& point.x < inlay.widthInPixels - HOVER_HORIZONTAL_PADDING - extraRightPadding
|
&& point.x < inlay.widthInPixels - HOVER_HORIZONTAL_PADDING - extraRightPadding
|
||||||
@@ -151,13 +155,15 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
|
private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
|
||||||
private const val UNDERLINE_WIDTH_REDUCTION = (TEXT_HORIZONTAL_PADDING * 2) - 1
|
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.
|
* Kotlin compiler inspections have an `[UPPERCASE_TAG]` at the beginning.
|
||||||
*/
|
*/
|
||||||
private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
|
private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
|
||||||
|
|
||||||
private fun getValidDescriptionText(text: String?, maxLength: Int): String {
|
private fun getValidDescriptionText(text: String?): String {
|
||||||
return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
|
return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun stripUppercaseTag(text: String): String {
|
private fun stripUppercaseTag(text: String): String {
|
||||||
@@ -175,11 +181,11 @@ class LensRenderer(private var inspection: Inspection, private val settings: Len
|
|||||||
return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
|
return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
|
private fun addEllipsisOrMissingPeriod(text: String): String {
|
||||||
return when {
|
return when {
|
||||||
text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
|
text.length > MAX_DESCRIPTION_LENGTH -> text.take(MAX_DESCRIPTION_LENGTH).trimEnd { it.isWhitespace() || it == '.' } + "…"
|
||||||
!text.endsWith('.') -> "$text."
|
!text.endsWith('.') -> "$text."
|
||||||
else -> text
|
else -> text
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -19,8 +19,9 @@ class LensSeverityFilter(private val hiddenSeverityIds: Set<String>, private val
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
private fun isSupported(severity: HighlightSeverity): Boolean {
|
private fun isSupported(severity: HighlightSeverity): Boolean {
|
||||||
return severity > HighlightSeverity.TEXT_ATTRIBUTES
|
return severity > HighlightSeverity.TEXT_ATTRIBUTES && severity !== HighlightSeverity.INFO
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getSupportedSeverities(registrar: SeverityRegistrar = SeverityRegistrar.getSeverityRegistrar(null)): List<HighlightSeverity> {
|
fun getSupportedSeverities(registrar: SeverityRegistrar = SeverityRegistrar.getSeverityRegistrar(null)): List<HighlightSeverity> {
|
||||||
|
|||||||
+4
-24
@@ -10,20 +10,18 @@ import com.intellij.openapi.editor.markup.TextAttributes
|
|||||||
import com.intellij.openapi.options.BoundConfigurable
|
import com.intellij.openapi.options.BoundConfigurable
|
||||||
import com.intellij.openapi.options.ConfigurableWithId
|
import com.intellij.openapi.options.ConfigurableWithId
|
||||||
import com.intellij.openapi.ui.DialogPanel
|
import com.intellij.openapi.ui.DialogPanel
|
||||||
import com.intellij.openapi.ui.MessageDialogBuilder
|
|
||||||
import com.intellij.openapi.util.Disposer
|
import com.intellij.openapi.util.Disposer
|
||||||
import com.intellij.ui.DisabledTraversalPolicy
|
import com.intellij.ui.DisabledTraversalPolicy
|
||||||
import com.intellij.ui.EditorTextFieldCellRenderer.SimpleRendererComponent
|
import com.intellij.ui.EditorTextFieldCellRenderer.SimpleRendererComponent
|
||||||
|
import com.intellij.ui.SimpleListCellRenderer
|
||||||
import com.intellij.ui.components.JBCheckBox
|
import com.intellij.ui.components.JBCheckBox
|
||||||
import com.intellij.ui.dsl.builder.Cell
|
import com.intellij.ui.dsl.builder.Cell
|
||||||
import com.intellij.ui.dsl.builder.RightGap
|
import com.intellij.ui.dsl.builder.RightGap
|
||||||
import com.intellij.ui.dsl.builder.Row
|
import com.intellij.ui.dsl.builder.Row
|
||||||
import com.intellij.ui.dsl.builder.RowLayout
|
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.bindItem
|
||||||
import com.intellij.ui.dsl.builder.bindSelected
|
import com.intellij.ui.dsl.builder.bindSelected
|
||||||
import com.intellij.ui.dsl.builder.panel
|
import com.intellij.ui.dsl.builder.panel
|
||||||
import com.intellij.ui.dsl.listCellRenderer.textListCellRenderer
|
|
||||||
import java.awt.Cursor
|
import java.awt.Cursor
|
||||||
|
|
||||||
class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
|
class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
|
||||||
@@ -77,22 +75,17 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
|
|||||||
override fun createPanel(): DialogPanel {
|
override fun createPanel(): DialogPanel {
|
||||||
val settings = settingsService.state
|
val settings = settingsService.state
|
||||||
|
|
||||||
lateinit var panel: DialogPanel
|
return panel {
|
||||||
|
|
||||||
panel = panel {
|
|
||||||
group("Appearance") {
|
group("Appearance") {
|
||||||
row {
|
row {
|
||||||
checkBox("Use editor font").bindSelected(settings::useEditorFont)
|
checkBox("Use editor font").bindSelected(settings::useEditorFont)
|
||||||
}
|
}
|
||||||
row("Max description length:") {
|
|
||||||
intTextField(LensSettingsState.MAX_DESCRIPTION_LENGTH_RANGE, keyboardStep = 10).bindIntText(settings::maxDescriptionLength)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
group("Behavior") {
|
group("Behavior") {
|
||||||
row("Hover mode:") {
|
row("Hover mode:") {
|
||||||
val items = LensHoverMode.entries
|
val items = LensHoverMode.values().toList()
|
||||||
val renderer = textListCellRenderer<LensHoverMode?> { it?.description ?: "" }
|
val renderer = SimpleListCellRenderer.create("", LensHoverMode::description)
|
||||||
comboBox(items, renderer).bindItem(settings::lensHoverMode) { settings.lensHoverMode = it ?: LensHoverMode.DEFAULT }
|
comboBox(items, renderer).bindItem(settings::lensHoverMode) { settings.lensHoverMode = it ?: LensHoverMode.DEFAULT }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -112,20 +105,7 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
|
|||||||
checkBox("Other").bindSelected(settings::showUnknownSeverities)
|
checkBox("Other").bindSelected(settings::showUnknownSeverities)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
group("Actions") {
|
|
||||||
row {
|
|
||||||
button("Reset to Default") {
|
|
||||||
if (MessageDialogBuilder.yesNo("Reset to Default", "Are you sure you want to reset settings to default?").ask(panel)) {
|
|
||||||
settingsService.resetState()
|
|
||||||
reset()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return panel
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun <K, V> Cell<JBCheckBox>.bindSelectedToNotIn(collection: MutableMap<K, V>, key: K, value: V): Cell<JBCheckBox> {
|
private fun <K, V> Cell<JBCheckBox>.bindSelectedToNotIn(collection: MutableMap<K, V>, key: K, value: V): Cell<JBCheckBox> {
|
||||||
|
|||||||
@@ -21,14 +21,9 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
|
|||||||
|
|
||||||
var showUnknownSeverities by property(true)
|
var showUnknownSeverities by property(true)
|
||||||
var useEditorFont by property(true)
|
var useEditorFont by property(true)
|
||||||
var maxDescriptionLength by property(120)
|
|
||||||
var lensHoverMode by enum(LensHoverMode.DEFAULT)
|
var lensHoverMode by enum(LensHoverMode.DEFAULT)
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
|
||||||
val MAX_DESCRIPTION_LENGTH_RANGE = 20..1000
|
|
||||||
}
|
|
||||||
|
|
||||||
@get:Synchronized
|
@get:Synchronized
|
||||||
@set:Synchronized
|
@set:Synchronized
|
||||||
var severityFilter = createSeverityFilter()
|
var severityFilter = createSeverityFilter()
|
||||||
@@ -37,27 +32,11 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
|
|||||||
val useEditorFont
|
val useEditorFont
|
||||||
get() = state.useEditorFont
|
get() = state.useEditorFont
|
||||||
|
|
||||||
val maxDescriptionLength
|
|
||||||
get() = state.maxDescriptionLength
|
|
||||||
|
|
||||||
val lensHoverMode
|
val lensHoverMode
|
||||||
get() = state.lensHoverMode
|
get() = state.lensHoverMode
|
||||||
|
|
||||||
override fun loadState(state: State) {
|
override fun loadState(state: State) {
|
||||||
super.loadState(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()
|
update()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,40 +14,12 @@
|
|||||||
]]></description>
|
]]></description>
|
||||||
|
|
||||||
<change-notes><![CDATA[
|
<change-notes><![CDATA[
|
||||||
<b>Version 1.7.0</b>
|
|
||||||
<ul>
|
|
||||||
<li>Updated minimum version to IntelliJ 2025.3 to address API deprecations.</li>
|
|
||||||
<li>Improved reliability of only showing relevant quick fixes when clicking an inspection.</li>
|
|
||||||
<li>Fixed lenses not always rendering an underline when hovered.</li>
|
|
||||||
</ul>
|
|
||||||
<b>Version 1.6.1</b>
|
|
||||||
<ul>
|
|
||||||
<li>Fixed exception caused by accessing disposed editors.</li>
|
|
||||||
<li>Fixed exception caused by accessing disposed line background highlighters.</li>
|
|
||||||
</ul>
|
|
||||||
<br>
|
|
||||||
<b>Version 1.6.0</b>
|
|
||||||
<ul>
|
|
||||||
<li>Added action to <b>View | Show Inspection Lenses</b> that temporarily toggles visibility of all inspections.</li>
|
|
||||||
<li>File-wide inspections no longer appear.</li>
|
|
||||||
<li>Fixed quick fix popup disappearing when the floating toolbar is enabled.</li>
|
|
||||||
<li>Clicking an inspection now only shows relevant quick fixes (not supported for ReSharper-based languages, which use a non-standard popup).</li>
|
|
||||||
<li>Tried to work around an issue where the IDE randomly fails to load the plugin.</li>
|
|
||||||
</ul>
|
|
||||||
<br>
|
|
||||||
<b>Version 1.5.2</b>
|
|
||||||
<ul>
|
|
||||||
<li>Added option to change maximum description length.</li>
|
|
||||||
<li>Added button to <b>Settings | Tools | Inspection Lens</b> that resets all settings to default.</li>
|
|
||||||
</ul>
|
|
||||||
<br>
|
|
||||||
<b>Version 1.5.1</b>
|
<b>Version 1.5.1</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added option to change the behavior of clicking on inspections.</li>
|
<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 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>
|
<li>Fixed hover underline not rendering correctly with some combinations of high DPI and line height settings.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.5</b>
|
<b>Version 1.5</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added possibility to left-click an inspection to show quick fixes.</li>
|
<li>Added possibility to left-click an inspection to show quick fixes.</li>
|
||||||
@@ -57,62 +29,51 @@
|
|||||||
<li>Improved descriptions of Kotlin compiler inspections.</li>
|
<li>Improved descriptions of Kotlin compiler inspections.</li>
|
||||||
<li>Fixed visual artifacts in Rendered Doc comments.</li>
|
<li>Fixed visual artifacts in Rendered Doc comments.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.4.1</b>
|
<b>Version 1.4.1</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Fixed warnings in usage of IntelliJ SDK.</li>
|
<li>Fixed warnings in usage of IntelliJ SDK.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.4</b>
|
<b>Version 1.4</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added configuration of visible severities to <b>Settings | Tools | Inspection Lens</b>.</li>
|
<li>Added configuration of visible severities to <b>Settings | Tools | Inspection Lens</b>.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.3.3</b>
|
<b>Version 1.3.3</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Partially reverted fix for inspections that include HTML in their description due to breaking inspections with angled brackets.</li>
|
<li>Partially reverted fix for inspections that include HTML in their description due to breaking inspections with angled brackets.</li>
|
||||||
<li>Fixed plugin not working when installed on JetBrains Gateway Client.</li>
|
<li>Fixed plugin not working when installed on JetBrains Gateway Client.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.3.2</b>
|
<b>Version 1.3.2</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Fixed inspections randomly not disappearing.</li>
|
<li>Fixed inspections randomly not disappearing.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.3.1</b>
|
<b>Version 1.3.1</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Updated minimum version to IntelliJ 2023.3 due to breaking API changes.</li>
|
<li>Updated minimum version to IntelliJ 2023.3 due to breaking API changes.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.3.0</b>
|
<b>Version 1.3.0</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added background colors to lines containing inspections. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/15">PR #15</a> by <a href="https://github.com/synopss">synopss</a>)</li>
|
<li>Added background colors to lines containing inspections. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/15">PR #15</a> by <a href="https://github.com/synopss">synopss</a>)</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.2.0</b>
|
<b>Version 1.2.0</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Support for IntelliJ 2023.2 EAP.</li>
|
<li>Support for IntelliJ 2023.2 EAP.</li>
|
||||||
<li>Added distinct colors for typos and Grazie inspections.</li>
|
<li>Added distinct colors for typos and Grazie inspections.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.1.2</b>
|
<b>Version 1.1.2</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Added plugin icon.</li>
|
<li>Added plugin icon.</li>
|
||||||
<li>Updated minimum version to IntelliJ 2023.1 due to deprecated APIs.</li>
|
<li>Updated minimum version to IntelliJ 2023.1 due to deprecated APIs.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.1.1</b>
|
<b>Version 1.1.1</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Multiple inspections at the same place in the document are now ordered by severity.</li>
|
<li>Multiple inspections at the same place in the document are now ordered by severity.</li>
|
||||||
<li>Improved performance of processing inspections which do not contain HTML.</li>
|
<li>Improved performance of processing inspections which do not contain HTML.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.1.0</b>
|
<b>Version 1.1.0</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Fixed showing inspections that include HTML in their description. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/3">PR #3</a> by <a href="https://github.com/KostkaBrukowa">KostkaBrukowa</a>)</li>
|
<li>Fixed showing inspections that include HTML in their description. (<a href="https://github.com/chylex/IntelliJ-Inspection-Lens/pull/3">PR #3</a> by <a href="https://github.com/KostkaBrukowa">KostkaBrukowa</a>)</li>
|
||||||
<li>Fixed exception when asynchronous inspections run on a non-EDT thread.</li>
|
<li>Fixed exception when asynchronous inspections run on a non-EDT thread.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<br>
|
|
||||||
<b>Version 1.0.0</b>
|
<b>Version 1.0.0</b>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Initial version with support for IntelliJ 2022.2 and newer.</li>
|
<li>Initial version with support for IntelliJ 2022.2 and newer.</li>
|
||||||
@@ -130,17 +91,11 @@
|
|||||||
parentId="tools" />
|
parentId="tools" />
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
<actions>
|
|
||||||
<action id="chylex.InspectionLens.ToggleLensVisibility" class="com.chylex.intellij.inspectionlens.actions.ToggleLensVisibilityAction" text="Show Inspection Lenses">
|
|
||||||
<add-to-group group-id="ViewMenu" anchor="after" relative-to-action="EditorResetFontSizeGlobal" />
|
|
||||||
</action>
|
|
||||||
</actions>
|
|
||||||
|
|
||||||
<applicationListeners>
|
<applicationListeners>
|
||||||
<listener class="com.chylex.intellij.inspectionlens.InspectionLensPluginListener" topic="com.intellij.ide.plugins.DynamicPluginListener" />
|
<listener class="com.chylex.intellij.inspectionlens.InspectionLensPluginListener" topic="com.intellij.ide.plugins.DynamicPluginListener" />
|
||||||
</applicationListeners>
|
</applicationListeners>
|
||||||
|
|
||||||
<projectListeners>
|
<projectListeners>
|
||||||
<listener class="com.chylex.intellij.inspectionlens.InspectionLensFileEditorManagerListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener" />
|
<listener class="com.chylex.intellij.inspectionlens.InspectionLensFileOpenedListener" topic="com.intellij.openapi.fileEditor.FileOpenedSyncListener" />
|
||||||
</projectListeners>
|
</projectListeners>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Assertions.assertTrue
|
|
||||||
import org.junit.jupiter.api.Test
|
|
||||||
|
|
||||||
class IntentionsPopupTest {
|
|
||||||
@Test
|
|
||||||
fun hasShowPopupMethod() {
|
|
||||||
assertTrue(IntentionsPopup.hasShowPopupMethod)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user