mirror of
https://github.com/chylex/IntelliJ-Inspection-Lens.git
synced 2025-09-15 08:32:10 +02:00
Compare commits
37 Commits
9f395476df
...
main
Author | SHA1 | Date | |
---|---|---|---|
08d0f5fe34
|
|||
4cd76a8a8c
|
|||
05ced823a6
|
|||
766ba4c74c
|
|||
4e9fdf8fa3
|
|||
a754276a6c
|
|||
fbe67d6068
|
|||
98d3e5db01
|
|||
102352a2eb
|
|||
3aeeb32bef
|
|||
0bc85fd69b
|
|||
cde4d81afe
|
|||
b1d6ed4d30
|
|||
2a4764fa15
|
|||
4bd0931d71
|
|||
0f41b22872
|
|||
603b35abdb
|
|||
08ed1aadea
|
|||
8936f0e5be
|
|||
89e71d5301
|
|||
4c80573375
|
|||
816440a150
|
|||
4899498522
|
|||
8ee14ff55e
|
|||
632a052ff9
|
|||
f2ec3c3d9b
|
|||
624254fba3
|
|||
c1b52ec3a5
|
|||
a84bc72fd4
|
|||
e28804ad5d
|
|||
043c02e432
|
|||
223fceb6b9
|
|||
640d95cddc
|
|||
fcd4d6588d
|
|||
1c92cf000f
|
|||
83c179574a
|
|||
536650510d
|
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@@ -1,3 +1 @@
|
|||||||
github: chylex
|
|
||||||
patreon: chylex
|
|
||||||
ko_fi: chylex
|
ko_fi: chylex
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,7 @@
|
|||||||
/.idea/*
|
/.idea/*
|
||||||
|
!/.idea/dictionaries
|
||||||
!/.idea/runConfigurations
|
!/.idea/runConfigurations
|
||||||
|
|
||||||
/.gradle/
|
/.gradle/
|
||||||
|
/.intellijPlatform/
|
||||||
/build/
|
/build/
|
||||||
|
7
.idea/dictionaries/default_user.xml
generated
Normal file
7
.idea/dictionaries/default_user.xml
generated
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<component name="ProjectDictionaryState">
|
||||||
|
<dictionary name="default.user">
|
||||||
|
<words>
|
||||||
|
<w>inspectionlens</w>
|
||||||
|
</words>
|
||||||
|
</dictionary>
|
||||||
|
</component>
|
@@ -1,10 +1,10 @@
|
|||||||
# Inspection Lens <img align="right" src="logo.png" alt="Plugin Logo">
|
# Inspection Lens <img align="right" src="logo.png" alt="Plugin Logo">
|
||||||
|
|
||||||
IntelliJ plugin that shows errors, warnings, and other inspection highlights inline.
|
Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
|
||||||
|
|
||||||
After installing the plugin, inspection descriptions will appear after the ends of lines, and the lines will be highlighted with a background color. Shown inspection severities are **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections from plugins or future IntelliJ versions that have a high enough severity level. Each severity has a different color, with support for both light and dark themes.
|
By default, the plugin shows **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections with a high enough severity level. Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
|
||||||
|
|
||||||
Note: The plugin is not customizable outside the ability to disable/enable the plugin without restarting the IDE. If the defaults don't work for you, I recommend trying the [Inline Error](https://plugins.jetbrains.com/plugin/17302-inlineerror) plugin which can be customized, building your own version of Inspection Lens, or proposing your change in the [issue tracker](https://github.com/chylex/IntelliJ-Inspection-Lens/issues).
|
Configure appearance, behavior of clicking on inspections, and visible severities in **Settings | Tools | Inspection Lens**.
|
||||||
|
|
||||||
Inspired by [Error Lens](https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens) for Visual Studio Code, and [Inline Error](https://plugins.jetbrains.com/plugin/17302-inlineerror) for IntelliJ Platform.
|
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,59 @@
|
|||||||
@file:Suppress("ConvertLambdaToReference")
|
@file:Suppress("ConvertLambdaToReference")
|
||||||
|
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.8.0"
|
kotlin("jvm")
|
||||||
id("org.jetbrains.intellij") version "1.16.0"
|
id("org.jetbrains.intellij.platform")
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.chylex.intellij.inspectionlens"
|
group = "com.chylex.intellij.inspectionlens"
|
||||||
version = "1.3.1"
|
version = "1.6.0"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|
||||||
|
intellijPlatform {
|
||||||
|
defaultRepositories()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
intellij {
|
dependencies {
|
||||||
version.set("233.11555.11-EAP-SNAPSHOT")
|
intellijPlatform {
|
||||||
updateSinceUntilBuild.set(false)
|
intellijIdeaUltimate("2024.2")
|
||||||
|
bundledPlugin("tanvd.grazi")
|
||||||
|
}
|
||||||
|
|
||||||
plugins.add("tanvd.grazi")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
|
||||||
|
}
|
||||||
|
|
||||||
|
intellijPlatform {
|
||||||
|
pluginConfiguration {
|
||||||
|
ideaVersion {
|
||||||
|
sinceBuild.set("242")
|
||||||
|
untilBuild.set(provider { null })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pluginVerification {
|
||||||
|
freeArgs.add("-mute")
|
||||||
|
freeArgs.add("TemplateWordInPluginId")
|
||||||
|
|
||||||
|
ides {
|
||||||
|
recommended()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain(17)
|
jvmToolchain(17)
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
compilerOptions {
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
|
freeCompilerArgs = listOf(
|
||||||
}
|
"-X" + "jvm-default=all",
|
||||||
|
"-X" + "lambdas=indy"
|
||||||
tasks.patchPluginXml {
|
)
|
||||||
sinceBuild.set("233.11361.10")
|
}
|
||||||
}
|
|
||||||
|
|
||||||
tasks.buildSearchableOptions {
|
|
||||||
enabled = false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.test {
|
tasks.test {
|
||||||
useJUnitPlatform()
|
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
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
6
gradlew
vendored
6
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,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/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.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -84,7 +86,7 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# 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.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
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 See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@@ -1 +1,8 @@
|
|||||||
rootProject.name = "InspectionLens"
|
rootProject.name = "InspectionLens"
|
||||||
|
|
||||||
|
pluginManagement {
|
||||||
|
plugins {
|
||||||
|
kotlin("jvm") version "1.9.24" // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#bundled-stdlib-versions
|
||||||
|
id("org.jetbrains.intellij.platform") version "2.6.0" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -1,15 +1,12 @@
|
|||||||
package com.chylex.intellij.inspectionlens
|
package com.chylex.intellij.inspectionlens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.EditorLensManager
|
import com.chylex.intellij.inspectionlens.editor.EditorLensFeatures
|
||||||
import com.chylex.intellij.inspectionlens.editor.LensMarkupModelListener
|
|
||||||
import com.intellij.openapi.Disposable
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.diagnostic.logger
|
||||||
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 com.intellij.openapi.rd.createLifetime
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
import com.intellij.openapi.rd.createNestedDisposable
|
|
||||||
import com.jetbrains.rd.util.lifetime.Lifetime
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles installation and uninstallation of plugin features in editors.
|
* Handles installation and uninstallation of plugin features in editors.
|
||||||
@@ -17,45 +14,40 @@ import com.jetbrains.rd.util.lifetime.Lifetime
|
|||||||
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) {
|
||||||
LensMarkupModelListener.register(editor.editor, createEditorDisposable(editor))
|
EditorLensFeatures.install(editor)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Installs lenses into all open editors.
|
* Installs lenses into all open editors.
|
||||||
*/
|
*/
|
||||||
fun install() {
|
fun install() {
|
||||||
forEachOpenEditor(::install)
|
forEachOpenEditor(EditorLensFeatures::install)
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Uninstalls lenses from all open editors.
|
|
||||||
*/
|
|
||||||
fun uninstall() {
|
|
||||||
forEachOpenEditor {
|
|
||||||
EditorLensManager.remove(it.editor)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refreshes lenses in all open editors.
|
* Refreshes lenses in all open editors.
|
||||||
*/
|
*/
|
||||||
fun refresh() {
|
private fun refresh() {
|
||||||
forEachOpenEditor {
|
forEachOpenEditor(EditorLensFeatures::refresh)
|
||||||
LensMarkupModelListener.refresh(it.editor)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a [Disposable] that will be disposed when either the [TextEditor] is disposed or the plugin is unloaded.
|
* Schedules a refresh of lenses in all open editors.
|
||||||
*/
|
*/
|
||||||
private fun createEditorDisposable(textEditor: TextEditor): Disposable {
|
fun scheduleRefresh() {
|
||||||
val pluginLifetime = ApplicationManager.getApplication().getService(InspectionLensPluginDisposableService::class.java).createLifetime()
|
Refresh.schedule()
|
||||||
val editorLifetime = textEditor.createLifetime()
|
|
||||||
return Lifetime.intersect(pluginLifetime, editorLifetime).createNestedDisposable("InspectionLensIntersectedLifetime")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -64,10 +56,32 @@ 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.filterNot { it.isDisposed }) {
|
for (project in projectManager.openProjects) {
|
||||||
for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
|
if (project.isDisposed) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for (editor in FileEditorManager.getInstance(project).allEditors) {
|
||||||
|
if (editor is TextEditor) {
|
||||||
action(editor)
|
action(editor)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private object Refresh : Runnable {
|
||||||
|
private val needsRefresh = AtomicBoolean(false)
|
||||||
|
|
||||||
|
fun schedule() {
|
||||||
|
if (needsRefresh.compareAndSet(false, true)) {
|
||||||
|
ApplicationManager.getApplication().invokeLater(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
if (needsRefresh.compareAndSet(true, false)) {
|
||||||
|
refresh()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,22 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens
|
||||||
|
|
||||||
|
import com.intellij.openapi.fileEditor.FileEditorManager
|
||||||
|
import com.intellij.openapi.fileEditor.FileEditorManagerListener
|
||||||
|
import com.intellij.openapi.fileEditor.FileOpenedSyncListener
|
||||||
|
import com.intellij.openapi.fileEditor.TextEditor
|
||||||
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Installs [InspectionLens] in opened editors.
|
||||||
|
*
|
||||||
|
* Used instead of [FileOpenedSyncListener], because [FileOpenedSyncListener] randomly fails to register during IDE startup.
|
||||||
|
*/
|
||||||
|
class InspectionLensFileEditorManagerListener : FileEditorManagerListener {
|
||||||
|
override fun fileOpened(source: FileEditorManager, file: VirtualFile) {
|
||||||
|
for (editor in source.getEditors(file)) {
|
||||||
|
if (editor is TextEditor) {
|
||||||
|
InspectionLens.install(editor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,21 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens
|
|
||||||
|
|
||||||
import com.intellij.openapi.fileEditor.FileEditorManager
|
|
||||||
import com.intellij.openapi.fileEditor.FileOpenedSyncListener
|
|
||||||
import com.intellij.openapi.fileEditor.TextEditor
|
|
||||||
import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider
|
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Installs [InspectionLens] in newly opened editors.
|
|
||||||
*/
|
|
||||||
class InspectionLensFileOpenedListener : FileOpenedSyncListener {
|
|
||||||
override fun fileOpenedSync(source: FileEditorManager, file: VirtualFile, editorsWithProviders: List<FileEditorWithProvider>) {
|
|
||||||
for (editorWrapper in editorsWithProviders) {
|
|
||||||
val fileEditor = editorWrapper.fileEditor
|
|
||||||
if (fileEditor is TextEditor) {
|
|
||||||
InspectionLens.install(fileEditor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -2,11 +2,21 @@ package com.chylex.intellij.inspectionlens
|
|||||||
|
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.Disposable
|
||||||
import com.intellij.openapi.components.Service
|
import com.intellij.openapi.components.Service
|
||||||
|
import com.intellij.openapi.rd.createLifetime
|
||||||
|
import com.intellij.openapi.rd.createNestedDisposable
|
||||||
|
import com.jetbrains.rd.util.lifetime.Lifetime
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets automatically disposed when the plugin is unloaded.
|
* Gets automatically disposed when the plugin is unloaded.
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
class InspectionLensPluginDisposableService : Disposable {
|
class InspectionLensPluginDisposableService : Disposable {
|
||||||
|
/**
|
||||||
|
* Creates a [Disposable] that will be disposed when either plugin is unloaded, or the [other] [Disposable] is disposed.
|
||||||
|
*/
|
||||||
|
fun intersect(other: Disposable): Disposable {
|
||||||
|
return Lifetime.intersect(createLifetime(), other.createLifetime()).createNestedDisposable("InspectionLensIntersectedLifetime")
|
||||||
|
}
|
||||||
|
|
||||||
override fun dispose() {}
|
override fun dispose() {}
|
||||||
}
|
}
|
||||||
|
@@ -4,7 +4,7 @@ import com.intellij.ide.plugins.DynamicPluginListener
|
|||||||
import com.intellij.ide.plugins.IdeaPluginDescriptor
|
import com.intellij.ide.plugins.IdeaPluginDescriptor
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Installs [InspectionLens] in open editors when the plugin is loaded, and uninstalls it when the plugin is unloaded.
|
* Installs [InspectionLens] in open editors when the plugin is loaded.
|
||||||
*/
|
*/
|
||||||
class InspectionLensPluginListener : DynamicPluginListener {
|
class InspectionLensPluginListener : DynamicPluginListener {
|
||||||
override fun pluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
|
override fun pluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
|
||||||
@@ -12,10 +12,4 @@ class InspectionLensPluginListener : DynamicPluginListener {
|
|||||||
InspectionLens.install()
|
InspectionLens.install()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun beforePluginUnload(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {
|
|
||||||
if (pluginDescriptor.pluginId.idString == InspectionLens.PLUGIN_ID) {
|
|
||||||
InspectionLens.uninstall()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,25 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.actions
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||||
|
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.actionSystem.KeepPopupOnPerform
|
||||||
|
import com.intellij.openapi.project.DumbAwareToggleAction
|
||||||
|
|
||||||
|
class ToggleLensVisibilityAction : DumbAwareToggleAction() {
|
||||||
|
init {
|
||||||
|
templatePresentation.keepPopupOnPerform = KeepPopupOnPerform.IfRequested
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getActionUpdateThread(): ActionUpdateThread {
|
||||||
|
return ActionUpdateThread.BGT
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun isSelected(e: AnActionEvent): Boolean {
|
||||||
|
return InspectionLens.SHOW_LENSES
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun setSelected(e: AnActionEvent, state: Boolean) {
|
||||||
|
InspectionLens.SHOW_LENSES = state
|
||||||
|
}
|
||||||
|
}
|
@@ -1,6 +1,6 @@
|
|||||||
package com.chylex.intellij.inspectionlens.compatibility
|
package com.chylex.intellij.inspectionlens.compatibility
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.LensSeverity
|
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverity
|
||||||
import com.intellij.grazie.ide.TextProblemSeverities
|
import com.intellij.grazie.ide.TextProblemSeverities
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.startup.ProjectActivity
|
import com.intellij.openapi.startup.ProjectActivity
|
||||||
|
@@ -0,0 +1,23 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.compatibility
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverity
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
|
import com.intellij.openapi.diagnostic.logger
|
||||||
|
import com.intellij.profile.codeInspection.InspectionProfileManager
|
||||||
|
import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
|
||||||
|
|
||||||
|
internal object SpellCheckerSupport {
|
||||||
|
private val log = logger<SpellCheckerSupport>()
|
||||||
|
|
||||||
|
fun load() {
|
||||||
|
typoSeverity?.let { LensSeverity.registerMapping(it, LensSeverity.TYPO) }
|
||||||
|
}
|
||||||
|
|
||||||
|
private val typoSeverity: HighlightSeverity?
|
||||||
|
get() = try {
|
||||||
|
SpellCheckerSeveritiesProvider.TYPO
|
||||||
|
} catch (e: NoClassDefFoundError) {
|
||||||
|
log.warn("Falling back to registered severity search due to ${e.javaClass.simpleName}: ${e.message}")
|
||||||
|
InspectionProfileManager.getInstance().severityRegistrar.getSeverity("TYPO")
|
||||||
|
}
|
||||||
|
}
|
@@ -1,36 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
|
|
||||||
internal class EditorLens private constructor(private var inlay: EditorLensInlay, private var lineBackground: EditorLensLineBackground) {
|
|
||||||
fun update(info: HighlightInfo): Boolean {
|
|
||||||
val editor = inlay.editor
|
|
||||||
|
|
||||||
if (!inlay.tryUpdate(info)) {
|
|
||||||
inlay = EditorLensInlay.show(editor, info) ?: return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lineBackground.shouldRecreate(info)) {
|
|
||||||
lineBackground.hide(editor)
|
|
||||||
lineBackground = EditorLensLineBackground.show(editor, info)
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
fun hide() {
|
|
||||||
val editor = inlay.editor
|
|
||||||
|
|
||||||
inlay.hide()
|
|
||||||
lineBackground.hide(editor)
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun show(editor: Editor, info: HighlightInfo): EditorLens? {
|
|
||||||
val inlay = EditorLensInlay.show(editor, info) ?: return null
|
|
||||||
val lineBackground = EditorLensLineBackground.show(editor, info)
|
|
||||||
return EditorLens(inlay, lineBackground)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -0,0 +1,62 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.InspectionLensPluginDisposableService
|
||||||
|
import com.intellij.openapi.Disposable
|
||||||
|
import com.intellij.openapi.components.service
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.editor.ex.FoldingModelEx
|
||||||
|
import com.intellij.openapi.editor.ex.MarkupModelEx
|
||||||
|
import com.intellij.openapi.editor.impl.DocumentMarkupModel
|
||||||
|
import com.intellij.openapi.fileEditor.TextEditor
|
||||||
|
import com.intellij.openapi.util.Disposer
|
||||||
|
import com.intellij.openapi.util.Key
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Manages Inspection Lens features for a single [Editor].
|
||||||
|
*/
|
||||||
|
internal class EditorLensFeatures private constructor(
|
||||||
|
editor: Editor,
|
||||||
|
private val markupModel: MarkupModelEx,
|
||||||
|
foldingModel: FoldingModelEx?,
|
||||||
|
disposable: Disposable
|
||||||
|
) {
|
||||||
|
private val lensManager = EditorLensManager(editor)
|
||||||
|
private val lensManagerDispatcher = EditorLensManagerDispatcher(lensManager)
|
||||||
|
private val markupModelListener = LensMarkupModelListener(lensManagerDispatcher)
|
||||||
|
|
||||||
|
init {
|
||||||
|
markupModel.addMarkupModelListener(disposable, markupModelListener)
|
||||||
|
markupModelListener.showAllValid(markupModel.allHighlighters)
|
||||||
|
|
||||||
|
foldingModel?.addListener(LensFoldingModelListener(lensManager), disposable)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun refresh() {
|
||||||
|
markupModelListener.hideAll()
|
||||||
|
markupModelListener.showAllValid(markupModel.allHighlighters)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val EDITOR_KEY = Key<EditorLensFeatures>(EditorLensFeatures::class.java.name)
|
||||||
|
|
||||||
|
fun install(owner: TextEditor) {
|
||||||
|
val editor = owner.editor
|
||||||
|
if (editor.getUserData(EDITOR_KEY) != null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val markupModel = DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx ?: return
|
||||||
|
val foldingModel = editor.foldingModel as? FoldingModelEx
|
||||||
|
|
||||||
|
val disposable = service<InspectionLensPluginDisposableService>().intersect(owner)
|
||||||
|
val features = EditorLensFeatures(editor, markupModel, foldingModel, disposable)
|
||||||
|
|
||||||
|
editor.putUserData(EDITOR_KEY, features)
|
||||||
|
Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun refresh(owner: TextEditor) {
|
||||||
|
owner.editor.getUserData(EDITOR_KEY)?.refresh()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,45 +1,36 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.editor.lens.EditorLens
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
|
import com.intellij.openapi.components.service
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import java.util.IdentityHashMap
|
import java.util.IdentityHashMap
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manages visible inspection lenses for an [Editor].
|
* Manages visible inspection lenses for an [Editor].
|
||||||
*/
|
*/
|
||||||
class EditorLensManager private constructor(private val editor: Editor) {
|
internal class EditorLensManager(private val editor: Editor) {
|
||||||
companion object {
|
|
||||||
private val EDITOR_KEY = Key<EditorLensManager>(EditorLensManager::class.java.name)
|
|
||||||
|
|
||||||
fun getOrCreate(editor: Editor): EditorLensManager {
|
|
||||||
return editor.getUserData(EDITOR_KEY) ?: EditorLensManager(editor).also { editor.putUserData(EDITOR_KEY, it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun remove(editor: Editor) {
|
|
||||||
val manager = editor.getUserData(EDITOR_KEY)
|
|
||||||
if (manager != null) {
|
|
||||||
manager.hideAll()
|
|
||||||
editor.putUserData(EDITOR_KEY, null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
|
private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
|
||||||
|
private val settings = service<LensSettingsState>()
|
||||||
|
|
||||||
private fun show(highlighterWithInfo: HighlighterWithInfo) {
|
private fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||||
val (highlighter, info) = highlighterWithInfo
|
val (highlighter, info) = highlighterWithInfo
|
||||||
|
|
||||||
|
if (!highlighter.isValid) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
val existingLens = lenses[highlighter]
|
val existingLens = lenses[highlighter]
|
||||||
if (existingLens != null) {
|
if (existingLens != null) {
|
||||||
if (existingLens.update(info)) {
|
if (existingLens.update(info, settings)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
existingLens.hide()
|
existingLens.hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
val newLens = EditorLens.show(editor, info)
|
val newLens = EditorLens.show(editor, info, settings)
|
||||||
if (newLens != null) {
|
if (newLens != null) {
|
||||||
lenses[highlighter] = newLens
|
lenses[highlighter] = newLens
|
||||||
}
|
}
|
||||||
@@ -48,22 +39,10 @@ class EditorLensManager private constructor(private val editor: Editor) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun show(highlightersWithInfo: Collection<HighlighterWithInfo>) {
|
|
||||||
executeInBatchMode(highlightersWithInfo.size) {
|
|
||||||
highlightersWithInfo.forEach(::show)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun hide(highlighter: RangeHighlighter) {
|
private fun hide(highlighter: RangeHighlighter) {
|
||||||
lenses.remove(highlighter)?.hide()
|
lenses.remove(highlighter)?.hide()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun hide(highlighters: Collection<RangeHighlighter>) {
|
|
||||||
executeInBatchMode(highlighters.size) {
|
|
||||||
highlighters.forEach(::hide)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun hideAll() {
|
fun hideAll() {
|
||||||
executeInBatchMode(lenses.size) {
|
executeInBatchMode(lenses.size) {
|
||||||
lenses.values.forEach(EditorLens::hide)
|
lenses.values.forEach(EditorLens::hide)
|
||||||
@@ -71,6 +50,38 @@ class EditorLensManager private constructor(private val editor: Editor) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun execute(commands: Collection<Command>) {
|
||||||
|
executeInBatchMode(commands.size) {
|
||||||
|
commands.forEach { it.apply(this) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onFoldRegionsChanged() {
|
||||||
|
lenses.values.forEach(EditorLens::onFoldRegionsChanged)
|
||||||
|
}
|
||||||
|
|
||||||
|
sealed interface Command {
|
||||||
|
fun apply(lensManager: EditorLensManager)
|
||||||
|
|
||||||
|
class Show(private val highlighter: HighlighterWithInfo) : Command {
|
||||||
|
override fun apply(lensManager: EditorLensManager) {
|
||||||
|
lensManager.show(highlighter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Hide(private val highlighter: RangeHighlighter) : Command {
|
||||||
|
override fun apply(lensManager: EditorLensManager) {
|
||||||
|
lensManager.hide(highlighter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
object HideAll : Command {
|
||||||
|
override fun apply(lensManager: EditorLensManager) {
|
||||||
|
lensManager.hideAll()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Batch mode affects both inlays and highlighters used for line colors.
|
* Batch mode affects both inlays and highlighters used for line colors.
|
||||||
*/
|
*/
|
||||||
|
@@ -0,0 +1,45 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
|
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||||
|
|
||||||
|
internal class EditorLensManagerDispatcher(private val lensManager: EditorLensManager) {
|
||||||
|
private var queuedItems = mutableListOf<EditorLensManager.Command>()
|
||||||
|
private var isEnqueued = false
|
||||||
|
|
||||||
|
fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||||
|
enqueue(EditorLensManager.Command.Show(highlighterWithInfo))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hide(highlighter: RangeHighlighter) {
|
||||||
|
enqueue(EditorLensManager.Command.Hide(highlighter))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hideAll() {
|
||||||
|
enqueue(EditorLensManager.Command.HideAll)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun enqueue(item: EditorLensManager.Command) {
|
||||||
|
synchronized(this) {
|
||||||
|
queuedItems.add(item)
|
||||||
|
|
||||||
|
// Enqueue even if already on dispatch thread to debounce consecutive calls.
|
||||||
|
if (!isEnqueued) {
|
||||||
|
isEnqueued = true
|
||||||
|
ApplicationManager.getApplication().invokeLater(::process)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun process() {
|
||||||
|
var itemsToProcess: List<EditorLensManager.Command>
|
||||||
|
|
||||||
|
synchronized(this) {
|
||||||
|
itemsToProcess = queuedItems
|
||||||
|
queuedItems = mutableListOf()
|
||||||
|
isEnqueued = false
|
||||||
|
}
|
||||||
|
|
||||||
|
lensManager.execute(itemsToProcess)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,12 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
|
import com.intellij.openapi.editor.ex.FoldingListener
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Listens for code folding events and reports them to [EditorLensManager].
|
||||||
|
*/
|
||||||
|
internal class LensFoldingModelListener(private val lensManager: EditorLensManager) : FoldingListener {
|
||||||
|
override fun onFoldProcessingEnd() {
|
||||||
|
lensManager.onFoldRegionsChanged()
|
||||||
|
}
|
||||||
|
}
|
@@ -1,26 +1,19 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.utils.DebouncingInvokeOnDispatchThread
|
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
import com.intellij.codeInsight.daemon.impl.UpdateHighlightersUtil.isFileLevelOrGutterAnnotation
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.components.service
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.editor.ex.MarkupModelEx
|
|
||||||
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
||||||
import com.intellij.openapi.editor.impl.DocumentMarkupModel
|
|
||||||
import com.intellij.openapi.editor.impl.event.MarkupModelListener
|
import com.intellij.openapi.editor.impl.event.MarkupModelListener
|
||||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||||
import com.intellij.openapi.util.Disposer
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Listens for inspection highlights and reports them to [EditorLensManager].
|
* Listens for inspection highlights and reports them to [EditorLensManager].
|
||||||
*/
|
*/
|
||||||
internal class LensMarkupModelListener private constructor(editor: Editor) : MarkupModelListener {
|
internal class LensMarkupModelListener(private val lensManagerDispatcher: EditorLensManagerDispatcher) : MarkupModelListener {
|
||||||
private val lensManager = EditorLensManager.getOrCreate(editor)
|
private val settings = service<LensSettingsState>()
|
||||||
|
|
||||||
private val showOnDispatchThread = DebouncingInvokeOnDispatchThread(lensManager::show)
|
|
||||||
private val hideOnDispatchThread = DebouncingInvokeOnDispatchThread(lensManager::hide)
|
|
||||||
|
|
||||||
override fun afterAdded(highlighter: RangeHighlighterEx) {
|
override fun afterAdded(highlighter: RangeHighlighterEx) {
|
||||||
showIfValid(highlighter)
|
showIfValid(highlighter)
|
||||||
@@ -30,41 +23,28 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
|
|||||||
showIfValid(highlighter)
|
showIfValid(highlighter)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
||||||
if (getFilteredHighlightInfo(highlighter) != null) {
|
if (InspectionLens.SHOW_LENSES) {
|
||||||
hideOnDispatchThread.enqueue(highlighter)
|
highlighters.forEach(::showIfValid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showIfValid(highlighter: RangeHighlighter) {
|
private fun showIfValid(highlighter: RangeHighlighter) {
|
||||||
runWithHighlighterIfValid(highlighter, showOnDispatchThread::enqueue, ::showAsynchronously)
|
if (!InspectionLens.SHOW_LENSES) {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
|
||||||
highlighterWithInfo.requestDescription {
|
if (info == null || isFileLevelOrGutterAnnotation(info)) {
|
||||||
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
return
|
||||||
showOnDispatchThread.enqueue(highlighterWithInfo)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
val highlighterWithInfo = HighlighterWithInfo.from(highlighter, info)
|
||||||
highlighters.forEach(::showIfValid)
|
processHighlighterWithInfo(highlighterWithInfo, lensManagerDispatcher::show, ::showAsynchronously)
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
|
||||||
private val EDITOR_KEY = Key<LensMarkupModelListener>(LensMarkupModelListener::class.java.name)
|
|
||||||
private val MINIMUM_SEVERITY = HighlightSeverity.TEXT_ATTRIBUTES.myVal + 1
|
|
||||||
|
|
||||||
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
||||||
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { it.severity.myVal >= MINIMUM_SEVERITY }
|
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
||||||
}
|
|
||||||
|
|
||||||
private inline fun runWithHighlighterIfValid(highlighter: RangeHighlighter, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
|
||||||
val info = 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) {
|
private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
||||||
@@ -76,36 +56,21 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getMarkupModel(editor: Editor): MarkupModelEx? {
|
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
||||||
return DocumentMarkupModel.forDocument(editor.document, editor.project, false) as? MarkupModelEx
|
highlighterWithInfo.requestDescription {
|
||||||
|
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
||||||
|
lensManagerDispatcher.show(highlighterWithInfo)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
||||||
* Attaches a new [LensMarkupModelListener] to the [Editor], and reports all existing inspection highlights to [EditorLensManager].
|
if (getFilteredHighlightInfo(highlighter) != null) {
|
||||||
*/
|
lensManagerDispatcher.hide(highlighter)
|
||||||
fun register(editor: Editor, disposable: Disposable) {
|
}
|
||||||
if (editor.getUserData(EDITOR_KEY) != null) {
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val markupModel = getMarkupModel(editor) ?: return
|
fun hideAll() {
|
||||||
val listener = LensMarkupModelListener(editor)
|
lensManagerDispatcher.hideAll()
|
||||||
|
|
||||||
editor.putUserData(EDITOR_KEY, listener)
|
|
||||||
Disposer.register(disposable) { editor.putUserData(EDITOR_KEY, null) }
|
|
||||||
|
|
||||||
markupModel.addMarkupModelListener(disposable, listener)
|
|
||||||
listener.showAllValid(markupModel.allHighlighters)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recreates all inspection highlights in the [Editor].
|
|
||||||
*/
|
|
||||||
fun refresh(editor: Editor) {
|
|
||||||
val listener = editor.getUserData(EDITOR_KEY) ?: return
|
|
||||||
val markupModel = getMarkupModel(editor) ?: return
|
|
||||||
|
|
||||||
listener.showAllValid(markupModel.allHighlighters)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,63 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HintRenderer
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.editor.Inlay
|
|
||||||
import com.intellij.openapi.editor.markup.TextAttributes
|
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
|
||||||
import java.awt.Graphics
|
|
||||||
import java.awt.Rectangle
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Renders the text of an inspection lens.
|
|
||||||
*/
|
|
||||||
class LensRenderer(info: HighlightInfo) : HintRenderer(null) {
|
|
||||||
private lateinit var severity: LensSeverity
|
|
||||||
|
|
||||||
init {
|
|
||||||
setPropertiesFrom(info)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun setPropertiesFrom(info: HighlightInfo) {
|
|
||||||
text = getValidDescriptionText(info.description)
|
|
||||||
severity = LensSeverity.from(info.severity)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun paint(inlay: Inlay<*>, g: Graphics, r: Rectangle, textAttributes: TextAttributes) {
|
|
||||||
fixBaselineForTextRendering(r)
|
|
||||||
super.paint(inlay, g, r, textAttributes)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getTextAttributes(editor: Editor): TextAttributes {
|
|
||||||
return severity.textAttributes
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun useEditorFont(): Boolean {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
private companion object {
|
|
||||||
private fun getValidDescriptionText(text: String?): String {
|
|
||||||
return if (text.isNullOrBlank()) " " else addMissingPeriod(convertHtmlToText(text))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun convertHtmlToText(potentialHtml: String): String {
|
|
||||||
return potentialHtml
|
|
||||||
.ifContains('<') { StringUtil.stripHtml(it, " ") }
|
|
||||||
.ifContains('&', StringUtil::unescapeXmlEntities)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun addMissingPeriod(text: String): String {
|
|
||||||
return if (text.endsWith('.')) text else "$text."
|
|
||||||
}
|
|
||||||
|
|
||||||
private inline fun String.ifContains(charToTest: Char, action: (String) -> String): String {
|
|
||||||
return if (this.contains(charToTest)) action(this) else this
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun fixBaselineForTextRendering(rect: Rectangle) {
|
|
||||||
rect.y += 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -0,0 +1,43 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
|
||||||
|
internal class EditorLens private constructor(private var inlay: EditorLensInlay, private var lineBackground: EditorLensLineBackground, private var severity: LensSeverity) {
|
||||||
|
fun update(info: HighlightInfo, settings: LensSettingsState): Boolean {
|
||||||
|
val editor = inlay.editor
|
||||||
|
val oldSeverity = severity
|
||||||
|
|
||||||
|
severity = LensSeverity.from(info.severity)
|
||||||
|
|
||||||
|
if (!inlay.tryUpdate(info)) {
|
||||||
|
inlay = EditorLensInlay.show(editor, info, settings) ?: return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lineBackground.isInvalid || oldSeverity != severity) {
|
||||||
|
lineBackground.hide(editor)
|
||||||
|
lineBackground = EditorLensLineBackground.show(editor, info)
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onFoldRegionsChanged() {
|
||||||
|
lineBackground.onFoldRegionsChanged(inlay.editor, severity)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hide() {
|
||||||
|
inlay.hide()
|
||||||
|
lineBackground.hide(inlay.editor)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
|
||||||
|
val inlay = EditorLensInlay.show(editor, info, settings) ?: return null
|
||||||
|
val lineBackground = EditorLensLineBackground.show(editor, info)
|
||||||
|
val severity = LensSeverity.from(info.severity)
|
||||||
|
return EditorLens(inlay, lineBackground, severity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,5 +1,6 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.editor.Inlay
|
import com.intellij.openapi.editor.Inlay
|
||||||
@@ -25,14 +26,19 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun show(editor: Editor, info: HighlightInfo): EditorLensInlay? {
|
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLensInlay? {
|
||||||
val offset = getInlayHintOffset(info)
|
val offset = getInlayHintOffset(info)
|
||||||
val priority = getInlayHintPriority(editor, info)
|
val priority = getInlayHintPriority(editor, info)
|
||||||
|
val renderer = LensRenderer(info, settings)
|
||||||
|
|
||||||
val renderer = LensRenderer(info)
|
val properties = InlayProperties()
|
||||||
val properties = InlayProperties().relatesToPrecedingText(true).disableSoftWrapping(true).priority(priority)
|
.relatesToPrecedingText(true)
|
||||||
|
.disableSoftWrapping(true)
|
||||||
|
.priority(priority)
|
||||||
|
|
||||||
return editor.inlayModel.addAfterLineEndElement(offset, properties, renderer)?.let(::EditorLensInlay)
|
return editor.inlayModel.addAfterLineEndElement(offset, properties, renderer)
|
||||||
|
?.also(renderer::setInlay)
|
||||||
|
?.let(::EditorLensInlay)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
@@ -1,34 +1,22 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.editor.ex.RangeHighlighterEx
|
||||||
import com.intellij.openapi.editor.markup.HighlighterLayer
|
import com.intellij.openapi.editor.markup.HighlighterLayer
|
||||||
import com.intellij.openapi.editor.markup.HighlighterTargetArea.LINES_IN_RANGE
|
import com.intellij.openapi.editor.markup.HighlighterTargetArea.LINES_IN_RANGE
|
||||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||||
|
import com.intellij.openapi.editor.markup.TextAttributes
|
||||||
|
|
||||||
@JvmInline
|
@JvmInline
|
||||||
internal value class EditorLensLineBackground(private val highlighter: RangeHighlighter) {
|
internal value class EditorLensLineBackground(private val highlighter: RangeHighlighter) {
|
||||||
@Suppress("RedundantIf")
|
val isInvalid
|
||||||
fun shouldRecreate(info: HighlightInfo): Boolean {
|
get() = !highlighter.isValid
|
||||||
if (!highlighter.isValid) {
|
|
||||||
return true
|
fun onFoldRegionsChanged(editor: Editor, severity: LensSeverity) {
|
||||||
|
if (highlighter is RangeHighlighterEx) {
|
||||||
|
highlighter.textAttributes = getAttributes(editor, highlighter.startOffset, highlighter.endOffset, severity)
|
||||||
}
|
}
|
||||||
|
|
||||||
val severity = LensSeverity.from(info.severity)
|
|
||||||
|
|
||||||
val currentTextAttributes = highlighter.getTextAttributes(null)
|
|
||||||
val newTextAttributes = severity.lineAttributes
|
|
||||||
if (currentTextAttributes !== newTextAttributes) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
val currentLayer = highlighter.layer
|
|
||||||
val newLayer = getHighlightLayer(severity)
|
|
||||||
if (currentLayer != newLayer) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun hide(editor: Editor) {
|
fun hide(editor: Editor) {
|
||||||
@@ -42,12 +30,20 @@ internal value class EditorLensLineBackground(private val highlighter: RangeHigh
|
|||||||
|
|
||||||
val severity = LensSeverity.from(info.severity)
|
val severity = LensSeverity.from(info.severity)
|
||||||
val layer = getHighlightLayer(severity)
|
val layer = getHighlightLayer(severity)
|
||||||
|
val attributes = getAttributes(editor, startOffset, endOffset, severity)
|
||||||
|
|
||||||
return EditorLensLineBackground(editor.markupModel.addRangeHighlighter(startOffset, endOffset, layer, severity.lineAttributes, LINES_IN_RANGE))
|
return EditorLensLineBackground(editor.markupModel.addRangeHighlighter(startOffset, endOffset, layer, attributes, LINES_IN_RANGE))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getHighlightLayer(severity: LensSeverity): Int {
|
private fun getHighlightLayer(severity: LensSeverity): Int {
|
||||||
return HighlighterLayer.CARET_ROW - 100 - severity.ordinal
|
return HighlighterLayer.CARET_ROW - 100 - severity.ordinal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getAttributes(editor: Editor, startOffset: Int, endOffset: Int, severity: LensSeverity): TextAttributes? {
|
||||||
|
return if (editor.foldingModel.let { it.isOffsetCollapsed(startOffset) || it.isOffsetCollapsed(endOffset) })
|
||||||
|
null
|
||||||
|
else
|
||||||
|
severity.lineAttributes
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -0,0 +1,132 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo.IntentionActionDescriptor
|
||||||
|
import com.intellij.codeInsight.daemon.impl.IntentionsUI
|
||||||
|
import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass.IntentionsInfo
|
||||||
|
import com.intellij.codeInsight.hint.HintManager
|
||||||
|
import com.intellij.codeInsight.intention.impl.CachedIntentions
|
||||||
|
import com.intellij.codeInsight.intention.impl.IntentionHintComponent
|
||||||
|
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
|
||||||
|
import com.intellij.lang.LangBundle
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
|
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.application.ModalityState
|
||||||
|
import com.intellij.openapi.application.ReadAction
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.editor.Inlay
|
||||||
|
import com.intellij.openapi.project.DumbService
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.psi.PsiDocumentManager
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.util.PsiUtilBase
|
||||||
|
import com.intellij.ui.awt.RelativePoint
|
||||||
|
import com.intellij.util.concurrency.AppExecutorUtil
|
||||||
|
import java.lang.reflect.Method
|
||||||
|
|
||||||
|
internal object IntentionsPopup {
|
||||||
|
private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
|
||||||
|
|
||||||
|
private val showPopupMethod: ShowPopupMethod? = try {
|
||||||
|
val method = IntentionHintComponent::class.java.declaredMethods.first { method ->
|
||||||
|
val parameterTypes = method.parameterTypes
|
||||||
|
|
||||||
|
method.name == "showPopup" &&
|
||||||
|
parameterTypes.size in 1..2 &&
|
||||||
|
parameterTypes[0] === RelativePoint::class.java &&
|
||||||
|
parameterTypes.getOrNull(1).let { p -> p == null || p.name == INTENTION_SOURCE_CLASS_NAME }
|
||||||
|
}
|
||||||
|
|
||||||
|
method.isAccessible = true
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
val args: Array<Any?> = if (method.parameterCount == 1)
|
||||||
|
arrayOf(null)
|
||||||
|
else
|
||||||
|
arrayOf(null, (Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>).enumConstants.first { it.name == "OTHER" })
|
||||||
|
|
||||||
|
ShowPopupMethod(method, args)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
InspectionLens.LOG.warn("Could not initialize intention popup", t)
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
|
||||||
|
operator fun invoke(component: IntentionHintComponent) {
|
||||||
|
method.invoke(component, *args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun show(highlightInfo: HighlightInfo, inlay: Inlay<*>) {
|
||||||
|
if (!tryShow(highlightInfo, inlay)) {
|
||||||
|
showNoActionsAvailable(inlay.editor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun tryShow(highlightInfo: HighlightInfo, inlay: Inlay<*>): Boolean {
|
||||||
|
val editor = inlay.editor
|
||||||
|
val project = editor.project ?: return false
|
||||||
|
val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
|
||||||
|
|
||||||
|
PsiDocumentManager.getInstance(project).commitAllDocuments()
|
||||||
|
IntentionsUI.getInstance(project).hide()
|
||||||
|
|
||||||
|
ReadAction
|
||||||
|
.nonBlocking<IntentionsInfo> { collectIntentions(editor, project, file, highlightInfo, inlay.offset) }
|
||||||
|
.finishOnUiThread(ModalityState.current()) { tryShowPopup(project, file, editor, it) }
|
||||||
|
.submit(AppExecutorUtil.getAppExecutorService())
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun collectIntentions(editor: Editor, project: Project, file: PsiFile, info: HighlightInfo, offset: Int): IntentionsInfo {
|
||||||
|
val intentions = mutableListOf<IntentionActionDescriptor>()
|
||||||
|
|
||||||
|
info.findRegisteredQuickFix { descriptor, _ ->
|
||||||
|
if (DumbService.getInstance(project).isUsableInCurrentContext(descriptor.action) && ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
|
||||||
|
intentions.add(descriptor)
|
||||||
|
}
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
return IntentionsInfo().also {
|
||||||
|
it.offset = offset
|
||||||
|
|
||||||
|
if (info.severity === HighlightSeverity.ERROR) {
|
||||||
|
it.errorFixesToShow.addAll(intentions)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
it.inspectionFixesToShow.addAll(intentions)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun tryShowPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
||||||
|
try {
|
||||||
|
showPopup(project, file, editor, intentions)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
InspectionLens.LOG.error("Could not show intention popup", t)
|
||||||
|
showNoActionsAvailable(editor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun showPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
||||||
|
if (intentions.isEmpty || showPopupMethod == null) {
|
||||||
|
val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
||||||
|
ActionUtil.invokeAction(showIntentionsAction, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
val cachedIntentions = CachedIntentions.create(project, file, editor, intentions)
|
||||||
|
val hintComponent = IntentionHintComponent.showIntentionHint(project, file, editor, false, cachedIntentions)
|
||||||
|
showPopupMethod.invoke(hintComponent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun showNoActionsAvailable(editor: Editor) {
|
||||||
|
HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,199 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensHoverMode
|
||||||
|
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||||
|
import com.intellij.codeInsight.daemon.impl.HintRenderer
|
||||||
|
import com.intellij.codeInsight.hints.presentation.InputHandler
|
||||||
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.editor.Inlay
|
||||||
|
import com.intellij.openapi.editor.ScrollType
|
||||||
|
import com.intellij.openapi.editor.colors.EditorFontType
|
||||||
|
import com.intellij.openapi.editor.ex.EditorEx
|
||||||
|
import com.intellij.openapi.editor.impl.EditorImpl
|
||||||
|
import com.intellij.openapi.editor.markup.TextAttributes
|
||||||
|
import com.intellij.openapi.util.text.StringUtil
|
||||||
|
import com.intellij.ui.paint.EffectPainter
|
||||||
|
import java.awt.Cursor
|
||||||
|
import java.awt.Graphics
|
||||||
|
import java.awt.Graphics2D
|
||||||
|
import java.awt.MouseInfo
|
||||||
|
import java.awt.Point
|
||||||
|
import java.awt.Rectangle
|
||||||
|
import java.awt.event.MouseEvent
|
||||||
|
import java.util.regex.Pattern
|
||||||
|
import javax.swing.SwingUtilities
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the text of an inspection lens.
|
||||||
|
*/
|
||||||
|
class LensRenderer(private var info: HighlightInfo, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
|
||||||
|
private lateinit var inlay: Inlay<*>
|
||||||
|
private lateinit var attributes: LensSeverityTextAttributes
|
||||||
|
private var extraRightPadding = 0
|
||||||
|
private var hovered = false
|
||||||
|
|
||||||
|
init {
|
||||||
|
setPropertiesFrom(info)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setInlay(inlay: Inlay<*>) {
|
||||||
|
check(!this::inlay.isInitialized) { "Inlay already set" }
|
||||||
|
this.inlay = inlay
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setPropertiesFrom(info: HighlightInfo) {
|
||||||
|
this.info = info
|
||||||
|
val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
|
||||||
|
|
||||||
|
text = description
|
||||||
|
attributes = LensSeverity.from(info.severity).textAttributes
|
||||||
|
extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun paint(inlay: Inlay<*>, g: Graphics, r: Rectangle, textAttributes: TextAttributes) {
|
||||||
|
fixBaselineForTextRendering(r)
|
||||||
|
super.paint(inlay, g, r, textAttributes)
|
||||||
|
|
||||||
|
if (hovered && isHoveringText()) {
|
||||||
|
paintHoverEffect(inlay, g, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun paintHoverEffect(inlay: Inlay<*>, g: Graphics, r: Rectangle) {
|
||||||
|
val editor = inlay.editor
|
||||||
|
if (editor !is EditorImpl) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val font = editor.colorsScheme.getFont(EditorFontType.PLAIN)
|
||||||
|
val x = r.x + TEXT_HORIZONTAL_PADDING
|
||||||
|
val y = r.y + editor.ascent
|
||||||
|
val w = inlay.widthInPixels - UNDERLINE_WIDTH_REDUCTION - extraRightPadding
|
||||||
|
val h = editor.descent
|
||||||
|
|
||||||
|
g.color = attributes.foregroundColor
|
||||||
|
EffectPainter.LINE_UNDERSCORE.paint(g as Graphics2D, x, y, w, h, font)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getTextAttributes(editor: Editor): TextAttributes {
|
||||||
|
return attributes
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun useEditorFont(): Boolean {
|
||||||
|
return settings.useEditorFont
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun mouseMoved(event: MouseEvent, translated: Point) {
|
||||||
|
setHovered(isHoveringText(translated))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun mouseExited() {
|
||||||
|
setHovered(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setHovered(hovered: Boolean) {
|
||||||
|
if (hovered && settings.lensHoverMode == LensHoverMode.DISABLED) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.hovered == hovered) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.hovered = hovered
|
||||||
|
|
||||||
|
val editor = inlay.editor
|
||||||
|
if (editor is EditorEx) {
|
||||||
|
val cursor = if (hovered) Cursor.getPredefinedCursor(Cursor.HAND_CURSOR) else null
|
||||||
|
editor.setCustomCursor(this::class.java, cursor)
|
||||||
|
}
|
||||||
|
|
||||||
|
inlay.repaint()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun mousePressed(event: MouseEvent, translated: Point) {
|
||||||
|
val hoverMode = settings.lensHoverMode
|
||||||
|
if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.button.let { it == MouseEvent.BUTTON1 || it == MouseEvent.BUTTON2 }) {
|
||||||
|
event.consume()
|
||||||
|
|
||||||
|
val editor = inlay.editor
|
||||||
|
moveToOffset(editor, info.actualStartOffset)
|
||||||
|
|
||||||
|
if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
|
||||||
|
IntentionsPopup.show(info, inlay)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isHoveringText(): Boolean {
|
||||||
|
val bounds = inlay.bounds ?: return false
|
||||||
|
val translatedPoint = MouseInfo.getPointerInfo().location.apply {
|
||||||
|
SwingUtilities.convertPointFromScreen(this, inlay.editor.contentComponent)
|
||||||
|
translate(-bounds.x, -bounds.y)
|
||||||
|
}
|
||||||
|
|
||||||
|
return isHoveringText(translatedPoint)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isHoveringText(point: Point): Boolean {
|
||||||
|
return point.x >= HOVER_HORIZONTAL_PADDING
|
||||||
|
&& point.y >= 4
|
||||||
|
&& point.x < inlay.widthInPixels - HOVER_HORIZONTAL_PADDING - extraRightPadding
|
||||||
|
&& point.y < inlay.heightInPixels - 1
|
||||||
|
}
|
||||||
|
|
||||||
|
private companion object {
|
||||||
|
/**
|
||||||
|
* [HintRenderer.paintHint] renders padding around text, but not around effects.
|
||||||
|
*/
|
||||||
|
private const val TEXT_HORIZONTAL_PADDING = 7
|
||||||
|
private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
|
||||||
|
private const val UNDERLINE_WIDTH_REDUCTION = (TEXT_HORIZONTAL_PADDING * 2) - 1
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Kotlin compiler inspections have an `[UPPERCASE_TAG]` at the beginning.
|
||||||
|
*/
|
||||||
|
private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
|
||||||
|
|
||||||
|
private fun getValidDescriptionText(text: String?, maxLength: Int): String {
|
||||||
|
return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun stripUppercaseTag(text: String): String {
|
||||||
|
if (text.startsWith('[')) {
|
||||||
|
val matcher = UPPERCASE_TAG_REGEX.matcher(text)
|
||||||
|
if (matcher.find()) {
|
||||||
|
return text.substring(matcher.end())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun unescapeHtmlEntities(text: String): String {
|
||||||
|
return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
|
||||||
|
return when {
|
||||||
|
text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
|
||||||
|
!text.endsWith('.') -> "$text."
|
||||||
|
else -> text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun fixBaselineForTextRendering(rect: Rectangle) {
|
||||||
|
rect.y += 1
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun moveToOffset(editor: Editor, offset: Int) {
|
||||||
|
editor.caretModel.moveToOffset(offset)
|
||||||
|
editor.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,9 +1,8 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||||
import com.chylex.intellij.inspectionlens.utils.DebouncingInvokeOnDispatchThread
|
import com.chylex.intellij.inspectionlens.compatibility.SpellCheckerSupport
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
|
|
||||||
import com.intellij.ui.ColorUtil
|
import com.intellij.ui.ColorUtil
|
||||||
import com.intellij.ui.ColorUtil.toAlpha
|
import com.intellij.ui.ColorUtil.toAlpha
|
||||||
import com.intellij.ui.JBColor
|
import com.intellij.ui.JBColor
|
||||||
@@ -44,17 +43,18 @@ enum class LensSeverity(baseColor: Color, lightThemeDarkening: Int, darkThemeBri
|
|||||||
HighlightSeverity.WARNING to WARNING,
|
HighlightSeverity.WARNING to WARNING,
|
||||||
HighlightSeverity.WEAK_WARNING to WEAK_WARNING,
|
HighlightSeverity.WEAK_WARNING to WEAK_WARNING,
|
||||||
HighlightSeverity.GENERIC_SERVER_ERROR_OR_WARNING to SERVER_PROBLEM,
|
HighlightSeverity.GENERIC_SERVER_ERROR_OR_WARNING to SERVER_PROBLEM,
|
||||||
SpellCheckerSeveritiesProvider.TYPO to TYPO,
|
|
||||||
))
|
))
|
||||||
|
|
||||||
private val refreshLater = DebouncingInvokeOnDispatchThread<Unit> { InspectionLens.refresh() }
|
init {
|
||||||
|
SpellCheckerSupport.load()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers a mapping from a [HighlightSeverity] to a [LensSeverity], and refreshes all open editors.
|
* Registers a mapping from a [HighlightSeverity] to a [LensSeverity], and refreshes all open editors.
|
||||||
*/
|
*/
|
||||||
internal fun registerMapping(severity: HighlightSeverity, lensSeverity: LensSeverity) {
|
internal fun registerMapping(severity: HighlightSeverity, lensSeverity: LensSeverity) {
|
||||||
if (mapping.put(severity, lensSeverity) != lensSeverity) {
|
if (mapping.put(severity, lensSeverity) != lensSeverity) {
|
||||||
refreshLater.enqueue(Unit)
|
InspectionLens.scheduleRefresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@@ -0,0 +1,31 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
|
import java.util.function.Predicate
|
||||||
|
|
||||||
|
class LensSeverityFilter(private val hiddenSeverityIds: Set<String>, private val showUnknownSeverities: Boolean) : Predicate<HighlightSeverity> {
|
||||||
|
private val knownSeverityIds = getSupportedSeverities().mapTo(HashSet(), HighlightSeverity::getName)
|
||||||
|
|
||||||
|
override fun test(severity: HighlightSeverity): Boolean {
|
||||||
|
if (!isSupported(severity)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return if (severity.name in knownSeverityIds)
|
||||||
|
severity.name !in hiddenSeverityIds
|
||||||
|
else
|
||||||
|
showUnknownSeverities
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
private fun isSupported(severity: HighlightSeverity): Boolean {
|
||||||
|
return severity > HighlightSeverity.TEXT_ATTRIBUTES && severity !== HighlightSeverity.INFO
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getSupportedSeverities(registrar: SeverityRegistrar = SeverityRegistrar.getSeverityRegistrar(null)): List<HighlightSeverity> {
|
||||||
|
return registrar.allSeverities.filter(::isSupported)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -1,4 +1,4 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.intellij.openapi.editor.markup.UnmodifiableTextAttributes
|
import com.intellij.openapi.editor.markup.UnmodifiableTextAttributes
|
||||||
import com.intellij.ui.JBColor
|
import com.intellij.ui.JBColor
|
@@ -0,0 +1,159 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.settings
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverityFilter
|
||||||
|
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
|
import com.intellij.openapi.components.service
|
||||||
|
import com.intellij.openapi.editor.event.SelectionEvent
|
||||||
|
import com.intellij.openapi.editor.event.SelectionListener
|
||||||
|
import com.intellij.openapi.editor.markup.TextAttributes
|
||||||
|
import com.intellij.openapi.options.BoundConfigurable
|
||||||
|
import com.intellij.openapi.options.ConfigurableWithId
|
||||||
|
import com.intellij.openapi.ui.DialogPanel
|
||||||
|
import com.intellij.openapi.ui.MessageDialogBuilder
|
||||||
|
import com.intellij.openapi.util.Disposer
|
||||||
|
import com.intellij.ui.DisabledTraversalPolicy
|
||||||
|
import com.intellij.ui.EditorTextFieldCellRenderer.SimpleRendererComponent
|
||||||
|
import com.intellij.ui.SimpleListCellRenderer
|
||||||
|
import com.intellij.ui.components.JBCheckBox
|
||||||
|
import com.intellij.ui.dsl.builder.Cell
|
||||||
|
import com.intellij.ui.dsl.builder.RightGap
|
||||||
|
import com.intellij.ui.dsl.builder.Row
|
||||||
|
import com.intellij.ui.dsl.builder.RowLayout
|
||||||
|
import com.intellij.ui.dsl.builder.bindIntText
|
||||||
|
import com.intellij.ui.dsl.builder.bindItem
|
||||||
|
import com.intellij.ui.dsl.builder.bindSelected
|
||||||
|
import com.intellij.ui.dsl.builder.panel
|
||||||
|
import java.awt.Cursor
|
||||||
|
|
||||||
|
class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
|
||||||
|
companion object {
|
||||||
|
const val ID = "InspectionLens"
|
||||||
|
}
|
||||||
|
|
||||||
|
private data class DisplayedSeverity(
|
||||||
|
val id: String,
|
||||||
|
val severity: StoredSeverity,
|
||||||
|
val textAttributes: TextAttributes? = null,
|
||||||
|
) {
|
||||||
|
constructor(
|
||||||
|
severity: HighlightSeverity,
|
||||||
|
registrar: SeverityRegistrar,
|
||||||
|
) : this(
|
||||||
|
id = severity.name,
|
||||||
|
severity = StoredSeverity(severity),
|
||||||
|
textAttributes = registrar.getHighlightInfoTypeBySeverity(severity).attributesKey.defaultAttributes
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val settingsService = service<LensSettingsState>()
|
||||||
|
|
||||||
|
private val allSeverities by lazy(LazyThreadSafetyMode.NONE) {
|
||||||
|
val settings = settingsService.state
|
||||||
|
val registrar = SeverityRegistrar.getSeverityRegistrar(null)
|
||||||
|
|
||||||
|
val knownSeverities = LensSeverityFilter.getSupportedSeverities(registrar).map { DisplayedSeverity(it, registrar) }
|
||||||
|
val knownSeverityIds = knownSeverities.mapTo(HashSet(), DisplayedSeverity::id)
|
||||||
|
|
||||||
|
// Update names and priorities of stored severities.
|
||||||
|
for ((id, knownSeverity, _) in knownSeverities) {
|
||||||
|
val storedSeverity = settings.hiddenSeverities[id]
|
||||||
|
if (storedSeverity != null && storedSeverity != knownSeverity) {
|
||||||
|
settings.hiddenSeverities[id] = knownSeverity
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val unknownSeverities = settings.hiddenSeverities.entries
|
||||||
|
.filterNot { it.key in knownSeverityIds }
|
||||||
|
.map { DisplayedSeverity(it.key, it.value) }
|
||||||
|
|
||||||
|
(knownSeverities + unknownSeverities).sortedByDescending { it.severity.priority }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getId(): String {
|
||||||
|
return ID
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun createPanel(): DialogPanel {
|
||||||
|
val settings = settingsService.state
|
||||||
|
|
||||||
|
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 {
|
||||||
|
checkBox(severity.name)
|
||||||
|
.bindSelectedToNotIn(settings.hiddenSeverities, id, severity)
|
||||||
|
.gap(RightGap.COLUMNS)
|
||||||
|
|
||||||
|
labelWithAttributes("Example", textAttributes)
|
||||||
|
}.layout(RowLayout.PARENT_GRID)
|
||||||
|
}
|
||||||
|
|
||||||
|
row {
|
||||||
|
checkBox("Other").bindSelected(settings::showUnknownSeverities)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
group("Actions") {
|
||||||
|
row {
|
||||||
|
button("Reset to Default") {
|
||||||
|
if (MessageDialogBuilder.yesNo("Reset to Default", "Are you sure you want to reset settings to default?").ask(panel)) {
|
||||||
|
settingsService.resetState()
|
||||||
|
reset()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return panel
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun <K, V> Cell<JBCheckBox>.bindSelectedToNotIn(collection: MutableMap<K, V>, key: K, value: V): Cell<JBCheckBox> {
|
||||||
|
return bindSelected({ key !in collection }, { if (it) collection.remove(key) else collection[key] = value })
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun Row.labelWithAttributes(text: String, textAttributes: TextAttributes?): Cell<SimpleRendererComponent> {
|
||||||
|
val label = SimpleRendererComponent(null, null, true)
|
||||||
|
label.setText(text, textAttributes, false)
|
||||||
|
label.focusTraversalPolicy = DisabledTraversalPolicy()
|
||||||
|
|
||||||
|
val editor = label.editor
|
||||||
|
editor.setCustomCursor(this, Cursor.getDefaultCursor())
|
||||||
|
editor.contentComponent.setOpaque(false)
|
||||||
|
editor.selectionModel.addSelectionListener(object : SelectionListener {
|
||||||
|
override fun selectionChanged(e: SelectionEvent) {
|
||||||
|
if (!e.newRange.isEmpty) {
|
||||||
|
editor.selectionModel.removeSelection(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
Disposer.register(disposable!!, label)
|
||||||
|
return cell(label)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun apply() {
|
||||||
|
super.apply()
|
||||||
|
settingsService.update()
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,7 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.settings
|
||||||
|
|
||||||
|
enum class LensHoverMode(val description: String) {
|
||||||
|
DISABLED("Disabled"),
|
||||||
|
DEFAULT("Left click shows intentions, middle click jumps to highlight"),
|
||||||
|
SWAPPED("Left click jumps to highlight, middle click shows intentions")
|
||||||
|
}
|
@@ -0,0 +1,73 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.settings
|
||||||
|
|
||||||
|
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||||
|
import com.chylex.intellij.inspectionlens.editor.lens.LensSeverityFilter
|
||||||
|
import com.intellij.openapi.components.BaseState
|
||||||
|
import com.intellij.openapi.components.SettingsCategory
|
||||||
|
import com.intellij.openapi.components.SimplePersistentStateComponent
|
||||||
|
import com.intellij.openapi.components.State
|
||||||
|
import com.intellij.openapi.components.Storage
|
||||||
|
import com.intellij.util.xmlb.annotations.XMap
|
||||||
|
|
||||||
|
@State(
|
||||||
|
name = LensApplicationConfigurable.ID,
|
||||||
|
storages = [ Storage("chylex.inspectionLens.xml") ],
|
||||||
|
category = SettingsCategory.UI
|
||||||
|
)
|
||||||
|
class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State>(State()) {
|
||||||
|
class State : BaseState() {
|
||||||
|
@get:XMap
|
||||||
|
val hiddenSeverities by map<String, StoredSeverity>()
|
||||||
|
|
||||||
|
var showUnknownSeverities by property(true)
|
||||||
|
var useEditorFont by property(true)
|
||||||
|
var maxDescriptionLength by property(120)
|
||||||
|
var lensHoverMode by enum(LensHoverMode.DEFAULT)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val MAX_DESCRIPTION_LENGTH_RANGE = 20..1000
|
||||||
|
}
|
||||||
|
|
||||||
|
@get:Synchronized
|
||||||
|
@set:Synchronized
|
||||||
|
var severityFilter = createSeverityFilter()
|
||||||
|
private set
|
||||||
|
|
||||||
|
val useEditorFont
|
||||||
|
get() = state.useEditorFont
|
||||||
|
|
||||||
|
val maxDescriptionLength
|
||||||
|
get() = state.maxDescriptionLength
|
||||||
|
|
||||||
|
val lensHoverMode
|
||||||
|
get() = state.lensHoverMode
|
||||||
|
|
||||||
|
override fun loadState(state: State) {
|
||||||
|
super.loadState(state)
|
||||||
|
state.maxDescriptionLength = state.maxDescriptionLength.coerceIn(MAX_DESCRIPTION_LENGTH_RANGE)
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun resetState() {
|
||||||
|
val default = State()
|
||||||
|
|
||||||
|
state.hiddenSeverities.apply { clear(); putAll(default.hiddenSeverities) }
|
||||||
|
state.showUnknownSeverities = default.showUnknownSeverities
|
||||||
|
state.useEditorFont = default.useEditorFont
|
||||||
|
state.maxDescriptionLength = default.maxDescriptionLength
|
||||||
|
state.lensHoverMode = default.lensHoverMode
|
||||||
|
|
||||||
|
update()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun update() {
|
||||||
|
severityFilter = createSeverityFilter()
|
||||||
|
InspectionLens.scheduleRefresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createSeverityFilter(): LensSeverityFilter {
|
||||||
|
val state = state
|
||||||
|
return LensSeverityFilter(state.hiddenSeverities.keys, state.showUnknownSeverities)
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,9 @@
|
|||||||
|
package com.chylex.intellij.inspectionlens.settings
|
||||||
|
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
|
import com.intellij.util.xmlb.annotations.Tag
|
||||||
|
|
||||||
|
@Tag("severity")
|
||||||
|
data class StoredSeverity(var name: String = "", var priority: Int = 0) {
|
||||||
|
constructor(severity: HighlightSeverity) : this(severity.displayCapitalizedName, severity.myVal)
|
||||||
|
}
|
@@ -1,32 +0,0 @@
|
|||||||
package com.chylex.intellij.inspectionlens.utils
|
|
||||||
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
|
||||||
|
|
||||||
class DebouncingInvokeOnDispatchThread<T>(private val action: (List<T>) -> Unit) {
|
|
||||||
private var queuedItems = mutableListOf<T>()
|
|
||||||
private var isEnqueued = false
|
|
||||||
|
|
||||||
fun enqueue(item: T) {
|
|
||||||
synchronized(this) {
|
|
||||||
queuedItems.add(item)
|
|
||||||
|
|
||||||
// Enqueue even if already on dispatch thread to debounce consecutive calls.
|
|
||||||
if (!isEnqueued) {
|
|
||||||
isEnqueued = true
|
|
||||||
ApplicationManager.getApplication().invokeLater(::process)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun process() {
|
|
||||||
var itemsToProcess: List<T>
|
|
||||||
|
|
||||||
synchronized(this) {
|
|
||||||
itemsToProcess = queuedItems
|
|
||||||
queuedItems = mutableListOf()
|
|
||||||
isEnqueued = false
|
|
||||||
}
|
|
||||||
|
|
||||||
action(itemsToProcess)
|
|
||||||
}
|
|
||||||
}
|
|
@@ -4,19 +4,61 @@
|
|||||||
<vendor url="https://chylex.com">chylex</vendor>
|
<vendor url="https://chylex.com">chylex</vendor>
|
||||||
|
|
||||||
<description><![CDATA[
|
<description><![CDATA[
|
||||||
Shows errors, warnings, and other inspection highlights inline.
|
Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
|
||||||
<br><br>
|
<br><br>
|
||||||
After installing the plugin, inspection descriptions will appear after the ends of lines, and the lines will be highlighted with a background color.
|
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.
|
||||||
Shown inspection severities are <b>Errors</b>, <b>Warnings</b>, <b>Weak Warnings</b>, <b>Server Problems</b>, <b>Grammar Errors</b>, <b>Typos</b>, and other inspections from plugins or future IntelliJ versions that have a high enough severity level.
|
|
||||||
Each severity has a different color, with support for both light and dark themes.
|
|
||||||
<br><br>
|
<br><br>
|
||||||
Note: The plugin is not customizable outside the ability to disable/enable the plugin without restarting the IDE.
|
Configure appearance, behavior of clicking on inspections, and visible severities in <b>Settings | Tools | Inspection Lens</b>.
|
||||||
If the defaults don't work for you, I recommend trying the <a href="https://plugins.jetbrains.com/plugin/17302-inlineerror">Inline Error</a> plugin which can be customized, building your own version of Inspection Lens, or proposing your change in the <a href="https://github.com/chylex/IntelliJ-Inspection-Lens/issues">issue tracker</a>.
|
|
||||||
<br><br>
|
<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.
|
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>
|
]]></description>
|
||||||
|
|
||||||
<change-notes><![CDATA[
|
<change-notes><![CDATA[
|
||||||
|
<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>
|
||||||
|
<b>Version 1.5.2</b>
|
||||||
|
<ul>
|
||||||
|
<li>Added option to change maximum description length.</li>
|
||||||
|
<li>Added button to <b>Settings | Tools | Inspection Lens</b> that resets all settings to default.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.5.1</b>
|
||||||
|
<ul>
|
||||||
|
<li>Added option to change the behavior of clicking on inspections.</li>
|
||||||
|
<li>Fixed broken quick fixes in Rider and CLion Nova.</li>
|
||||||
|
<li>Fixed hover underline not rendering correctly with some combinations of high DPI and line height settings.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.5</b>
|
||||||
|
<ul>
|
||||||
|
<li>Added possibility to left-click an inspection to show quick fixes.</li>
|
||||||
|
<li>Added possibility to middle-click an inspection to navigate to relevant code in the editor.</li>
|
||||||
|
<li>Added option to use UI font instead of editor font.</li>
|
||||||
|
<li>Long inspection descriptions are now truncated to 120 characters.</li>
|
||||||
|
<li>Improved descriptions of Kotlin compiler inspections.</li>
|
||||||
|
<li>Fixed visual artifacts in Rendered Doc comments.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.4.1</b>
|
||||||
|
<ul>
|
||||||
|
<li>Fixed warnings in usage of IntelliJ SDK.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.4</b>
|
||||||
|
<ul>
|
||||||
|
<li>Added configuration of visible severities to <b>Settings | Tools | Inspection Lens</b>.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.3.3</b>
|
||||||
|
<ul>
|
||||||
|
<li>Partially reverted fix for inspections that include HTML in their description due to breaking inspections with angled brackets.</li>
|
||||||
|
<li>Fixed plugin not working when installed on JetBrains Gateway Client.</li>
|
||||||
|
</ul>
|
||||||
|
<b>Version 1.3.2</b>
|
||||||
|
<ul>
|
||||||
|
<li>Fixed inspections randomly not disappearing.</li>
|
||||||
|
</ul>
|
||||||
<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>
|
||||||
@@ -54,11 +96,25 @@
|
|||||||
<depends>com.intellij.modules.platform</depends>
|
<depends>com.intellij.modules.platform</depends>
|
||||||
<depends optional="true" config-file="compatibility/InspectionLens-Grazie.xml">tanvd.grazi</depends>
|
<depends optional="true" config-file="compatibility/InspectionLens-Grazie.xml">tanvd.grazi</depends>
|
||||||
|
|
||||||
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
|
<applicationService serviceImplementation="com.chylex.intellij.inspectionlens.settings.LensSettingsState" />
|
||||||
|
<applicationConfigurable id="com.chylex.intellij.inspectionlens.settings.LensApplicationConfigurable"
|
||||||
|
instance="com.chylex.intellij.inspectionlens.settings.LensApplicationConfigurable"
|
||||||
|
displayName="Inspection Lens"
|
||||||
|
parentId="tools" />
|
||||||
|
</extensions>
|
||||||
|
|
||||||
|
<actions>
|
||||||
|
<action id="chylex.InspectionLens.ToggleLensVisibility" class="com.chylex.intellij.inspectionlens.actions.ToggleLensVisibilityAction" text="Show Inspection Lenses">
|
||||||
|
<add-to-group group-id="ViewMenu" anchor="after" relative-to-action="EditorResetFontSizeGlobal" />
|
||||||
|
</action>
|
||||||
|
</actions>
|
||||||
|
|
||||||
<applicationListeners>
|
<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.InspectionLensFileOpenedListener" topic="com.intellij.openapi.fileEditor.FileOpenedSyncListener" />
|
<listener class="com.chylex.intellij.inspectionlens.InspectionLensFileEditorManagerListener" topic="com.intellij.openapi.fileEditor.FileEditorManagerListener" />
|
||||||
</projectListeners>
|
</projectListeners>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
package com.chylex.intellij.inspectionlens
|
package com.chylex.intellij.inspectionlens.editor.lens
|
||||||
|
|
||||||
import com.chylex.intellij.inspectionlens.editor.EditorLensInlay
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
import org.junit.jupiter.api.Assertions.assertEquals
|
import org.junit.jupiter.api.Assertions.assertEquals
|
||||||
import org.junit.jupiter.api.Nested
|
import org.junit.jupiter.api.Nested
|
||||||
@@ -48,7 +47,7 @@ class EditorLensTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If any of these change, re-evaluate [EditorLensInlay.MAXIMUM_SEVERITY] and the priority calculations.
|
* If any of these changes, re-evaluate [EditorLensInlay.MAXIMUM_SEVERITY] and the priority calculations.
|
||||||
*/
|
*/
|
||||||
@Nested
|
@Nested
|
||||||
inner class IdeaHighlightSeverityAssumptions {
|
inner class IdeaHighlightSeverityAssumptions {
|
Reference in New Issue
Block a user