mirror of
https://github.com/chylex/IntelliJ-Inspection-Lens.git
synced 2025-09-15 08:32:10 +02:00
Compare commits
11 Commits
test-snaps
...
main
Author | SHA1 | Date | |
---|---|---|---|
08d0f5fe34
|
|||
4cd76a8a8c
|
|||
05ced823a6
|
|||
766ba4c74c
|
|||
4e9fdf8fa3
|
|||
a754276a6c
|
|||
fbe67d6068
|
|||
98d3e5db01
|
|||
102352a2eb
|
|||
3aeeb32bef
|
|||
0bc85fd69b
|
@@ -6,7 +6,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.chylex.intellij.inspectionlens"
|
group = "com.chylex.intellij.inspectionlens"
|
||||||
version = "1.5.1"
|
version = "1.6.0"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
@@ -18,11 +18,8 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
intellijIdeaUltimate("2023.3.3")
|
intellijIdeaUltimate("2024.2")
|
||||||
bundledPlugin("tanvd.grazi")
|
bundledPlugin("tanvd.grazi")
|
||||||
|
|
||||||
// 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")
|
||||||
@@ -31,10 +28,19 @@ dependencies {
|
|||||||
intellijPlatform {
|
intellijPlatform {
|
||||||
pluginConfiguration {
|
pluginConfiguration {
|
||||||
ideaVersion {
|
ideaVersion {
|
||||||
sinceBuild.set("233.11361.10")
|
sinceBuild.set("242")
|
||||||
untilBuild.set(provider { null })
|
untilBuild.set(provider { null })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pluginVerification {
|
||||||
|
freeArgs.add("-mute")
|
||||||
|
freeArgs.add("TemplateWordInPluginId")
|
||||||
|
|
||||||
|
ides {
|
||||||
|
recommended()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
@@ -42,16 +48,12 @@ kotlin {
|
|||||||
|
|
||||||
compilerOptions {
|
compilerOptions {
|
||||||
freeCompilerArgs = listOf(
|
freeCompilerArgs = listOf(
|
||||||
"-X" + "jvm-default=all"
|
"-X" + "jvm-default=all",
|
||||||
|
"-X" + "lambdas=indy"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Test>().configureEach {
|
tasks.test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
val testSnapshot by intellijPlatformTesting.testIde.registering {
|
|
||||||
version = "LATEST-EAP-SNAPSHOT"
|
|
||||||
useInstaller = false
|
|
||||||
}
|
|
||||||
|
@@ -2,7 +2,7 @@ rootProject.name = "InspectionLens"
|
|||||||
|
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.9.21"
|
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.2.1"
|
id("org.jetbrains.intellij.platform") version "2.6.0" // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,10 +2,11 @@ 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.components.service
|
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 java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles installation and uninstallation of plugin features in editors.
|
* Handles installation and uninstallation of plugin features in editors.
|
||||||
@@ -13,27 +14,33 @@ import com.intellij.openapi.project.ProjectManager
|
|||||||
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.editor, service<InspectionLensPluginDisposableService>().intersect(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)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refreshes lenses in all open editors.
|
* Refreshes lenses in all open editors.
|
||||||
*/
|
*/
|
||||||
private fun refresh() {
|
private fun refresh() {
|
||||||
forEachOpenEditor {
|
forEachOpenEditor(EditorLensFeatures::refresh)
|
||||||
EditorLensFeatures.refresh(it.editor)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -49,31 +56,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.filterNot { it.isDisposed }) {
|
for (project in projectManager.openProjects) {
|
||||||
for (editor in FileEditorManager.getInstance(project).allEditors.filterIsInstance<TextEditor>()) {
|
if (project.isDisposed) {
|
||||||
action(editor)
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for (editor in FileEditorManager.getInstance(project).allEditors) {
|
||||||
|
if (editor is TextEditor) {
|
||||||
|
action(editor)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private object Refresh {
|
private object Refresh : Runnable {
|
||||||
private var needsRefresh = false
|
private val needsRefresh = AtomicBoolean(false)
|
||||||
|
|
||||||
fun schedule() {
|
fun schedule() {
|
||||||
synchronized(this) {
|
if (needsRefresh.compareAndSet(false, true)) {
|
||||||
if (!needsRefresh) {
|
ApplicationManager.getApplication().invokeLater(this)
|
||||||
needsRefresh = true
|
|
||||||
ApplicationManager.getApplication().invokeLater(this::run)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun run() {
|
override fun run() {
|
||||||
synchronized(this) {
|
if (needsRefresh.compareAndSet(true, false)) {
|
||||||
if (needsRefresh) {
|
refresh()
|
||||||
needsRefresh = 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -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,10 +1,13 @@
|
|||||||
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
|
||||||
|
|
||||||
@@ -36,21 +39,24 @@ 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(editor: Editor, disposable: Disposable) {
|
fun install(owner: TextEditor) {
|
||||||
|
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(editor: Editor) {
|
fun refresh(owner: TextEditor) {
|
||||||
editor.getUserData(EDITOR_KEY)?.refresh()
|
owner.editor.getUserData(EDITOR_KEY)?.refresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
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.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
|
||||||
@@ -21,43 +23,30 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
|
|||||||
showIfValid(highlighter)
|
showIfValid(highlighter)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
||||||
if (getFilteredHighlightInfo(highlighter) != null) {
|
if (InspectionLens.SHOW_LENSES) {
|
||||||
lensManagerDispatcher.hide(highlighter)
|
highlighters.forEach(::showIfValid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showIfValid(highlighter: RangeHighlighter) {
|
private fun showIfValid(highlighter: RangeHighlighter) {
|
||||||
runWithHighlighterIfValid(highlighter, lensManagerDispatcher::show, ::showAsynchronously)
|
if (!InspectionLens.SHOW_LENSES) {
|
||||||
}
|
return
|
||||||
|
|
||||||
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
|
||||||
highlighterWithInfo.requestDescription {
|
|
||||||
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
|
||||||
lensManagerDispatcher.show(highlighterWithInfo)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
val info = highlighter.takeIf { it.isValid }?.let(::getFilteredHighlightInfo)
|
||||||
fun showAllValid(highlighters: Array<RangeHighlighter>) {
|
if (info == null || isFileLevelOrGutterAnnotation(info)) {
|
||||||
highlighters.forEach(::showIfValid)
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fun hideAll() {
|
val highlighterWithInfo = HighlighterWithInfo.from(highlighter, info)
|
||||||
lensManagerDispatcher.hideAll()
|
processHighlighterWithInfo(highlighterWithInfo, lensManagerDispatcher::show, ::showAsynchronously)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
||||||
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
||||||
}
|
}
|
||||||
|
|
||||||
private inline fun runWithHighlighterIfValid(highlighter: RangeHighlighter, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
|
||||||
val info = 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) {
|
||||||
if (highlighterWithInfo is HighlighterWithInfo.Async) {
|
if (highlighterWithInfo is HighlighterWithInfo.Async) {
|
||||||
actionForAsync(highlighterWithInfo)
|
actionForAsync(highlighterWithInfo)
|
||||||
@@ -66,4 +55,22 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
|
|||||||
actionForImmediate(highlighterWithInfo)
|
actionForImmediate(highlighterWithInfo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
||||||
|
highlighterWithInfo.requestDescription {
|
||||||
|
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
||||||
|
lensManagerDispatcher.show(highlighterWithInfo)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun beforeRemoved(highlighter: RangeHighlighterEx) {
|
||||||
|
if (getFilteredHighlightInfo(highlighter) != null) {
|
||||||
|
lensManagerDispatcher.hide(highlighter)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hideAll() {
|
||||||
|
lensManagerDispatcher.hideAll()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,54 +1,132 @@
|
|||||||
package com.chylex.intellij.inspectionlens.editor.lens
|
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.IntentionsUI
|
||||||
|
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.actions.ShowIntentionActionsAction
|
import com.intellij.codeInsight.intention.impl.CachedIntentions
|
||||||
|
import com.intellij.codeInsight.intention.impl.IntentionHintComponent
|
||||||
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
|
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
|
||||||
import com.intellij.lang.LangBundle
|
import com.intellij.lang.LangBundle
|
||||||
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
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.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.application.ModalityState
|
||||||
|
import com.intellij.openapi.application.ReadAction
|
||||||
import com.intellij.openapi.editor.Editor
|
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.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 com.intellij.util.concurrency.AppExecutorUtil
|
||||||
|
import java.lang.reflect.Method
|
||||||
|
|
||||||
internal object IntentionsPopup {
|
internal object IntentionsPopup {
|
||||||
fun show(editor: Editor) {
|
private const val INTENTION_SOURCE_CLASS_NAME = "com.intellij.codeInsight.intention.IntentionSource"
|
||||||
if (!tryShow(editor)) {
|
|
||||||
HintManager.getInstance().showInformationHint(editor, LangBundle.message("hint.text.no.context.actions.available.at.this.location"))
|
private val showPopupMethod: ShowPopupMethod? = try {
|
||||||
|
val method = IntentionHintComponent::class.java.declaredMethods.first { method ->
|
||||||
|
val parameterTypes = method.parameterTypes
|
||||||
|
|
||||||
|
method.name == "showPopup" &&
|
||||||
|
parameterTypes.size in 1..2 &&
|
||||||
|
parameterTypes[0] === RelativePoint::class.java &&
|
||||||
|
parameterTypes.getOrNull(1).let { p -> p == null || p.name == INTENTION_SOURCE_CLASS_NAME }
|
||||||
|
}
|
||||||
|
|
||||||
|
method.isAccessible = true
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
val args: Array<Any?> = if (method.parameterCount == 1)
|
||||||
|
arrayOf(null)
|
||||||
|
else
|
||||||
|
arrayOf(null, (Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>).enumConstants.first { it.name == "OTHER" })
|
||||||
|
|
||||||
|
ShowPopupMethod(method, args)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
InspectionLens.LOG.warn("Could not initialize intention popup", t)
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
|
||||||
|
operator fun invoke(component: IntentionHintComponent) {
|
||||||
|
method.invoke(component, *args)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryShow(editor: Editor): Boolean {
|
fun show(highlightInfo: HighlightInfo, inlay: Inlay<*>) {
|
||||||
// If the IDE uses the default Show Intentions action and handler,
|
if (!tryShow(highlightInfo, inlay)) {
|
||||||
// use the handler directly to bypass additional logic from the action.
|
showNoActionsAvailable(inlay.editor)
|
||||||
val action = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
|
||||||
if (action.javaClass === ShowIntentionActionsAction::class.java) {
|
|
||||||
return tryShowWithDefaultHandler(editor)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ActionUtil.invokeAction(action, editor.component, ActionPlaces.EDITOR_INLAY, null, null)
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryShowWithDefaultHandler(editor: Editor): Boolean {
|
private fun tryShow(highlightInfo: HighlightInfo, inlay: Inlay<*>): Boolean {
|
||||||
|
val editor = inlay.editor
|
||||||
val project = editor.project ?: return false
|
val 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()
|
||||||
|
|
||||||
HANDLER.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu = true)
|
ReadAction
|
||||||
|
.nonBlocking<IntentionsInfo> { collectIntentions(editor, project, file, highlightInfo, inlay.offset) }
|
||||||
|
.finishOnUiThread(ModalityState.current()) { tryShowPopup(project, file, editor, it) }
|
||||||
|
.submit(AppExecutorUtil.getAppExecutorService())
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
private val HANDLER = object : ShowIntentionActionsHandler() {
|
private fun collectIntentions(editor: Editor, project: Project, file: PsiFile, info: HighlightInfo, offset: Int): IntentionsInfo {
|
||||||
public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
|
val intentions = mutableListOf<IntentionActionDescriptor>()
|
||||||
super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)
|
|
||||||
|
info.findRegisteredQuickFix { descriptor, _ ->
|
||||||
|
if (DumbService.getInstance(project).isUsableInCurrentContext(descriptor.action) && ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
|
||||||
|
intentions.add(descriptor)
|
||||||
|
}
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
return IntentionsInfo().also {
|
||||||
|
it.offset = offset
|
||||||
|
|
||||||
|
if (info.severity === HighlightSeverity.ERROR) {
|
||||||
|
it.errorFixesToShow.addAll(intentions)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
it.inspectionFixesToShow.addAll(intentions)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun tryShowPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
||||||
|
try {
|
||||||
|
showPopup(project, file, editor, intentions)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
InspectionLens.LOG.error("Could not show intention popup", t)
|
||||||
|
showNoActionsAvailable(editor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun showPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
||||||
|
if (intentions.isEmpty || showPopupMethod == null) {
|
||||||
|
val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
||||||
|
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"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -44,7 +44,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
|||||||
|
|
||||||
fun setPropertiesFrom(info: HighlightInfo) {
|
fun setPropertiesFrom(info: HighlightInfo) {
|
||||||
this.info = info
|
this.info = info
|
||||||
val description = getValidDescriptionText(info.description)
|
val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
|
||||||
|
|
||||||
text = description
|
text = description
|
||||||
attributes = LensSeverity.from(info.severity).textAttributes
|
attributes = LensSeverity.from(info.severity).textAttributes
|
||||||
@@ -125,7 +125,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
|||||||
moveToOffset(editor, 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(editor)
|
IntentionsPopup.show(info, inlay)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -155,15 +155,13 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
|||||||
private const val HOVER_HORIZONTAL_PADDING = TEXT_HORIZONTAL_PADDING - 2
|
private const val 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?): String {
|
private fun getValidDescriptionText(text: String?, maxLength: Int): String {
|
||||||
return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)))
|
return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun stripUppercaseTag(text: String): String {
|
private fun stripUppercaseTag(text: String): String {
|
||||||
@@ -181,11 +179,11 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
|||||||
return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
|
return if (text.contains('&')) StringUtil.unescapeXmlEntities(text) else text
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun addEllipsisOrMissingPeriod(text: String): String {
|
private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
|
||||||
return when {
|
return when {
|
||||||
text.length > MAX_DESCRIPTION_LENGTH -> text.take(MAX_DESCRIPTION_LENGTH).trimEnd { it.isWhitespace() || it == '.' } + "…"
|
text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
|
||||||
!text.endsWith('.') -> "$text."
|
!text.endsWith('.') -> "$text."
|
||||||
else -> text
|
else -> text
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -10,6 +10,7 @@ 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
|
||||||
@@ -19,6 +20,7 @@ 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
|
||||||
@@ -75,16 +77,21 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
|
|||||||
override fun createPanel(): DialogPanel {
|
override fun createPanel(): DialogPanel {
|
||||||
val settings = settingsService.state
|
val settings = settingsService.state
|
||||||
|
|
||||||
return panel {
|
lateinit var panel: DialogPanel
|
||||||
|
|
||||||
|
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.values().toList()
|
val items = LensHoverMode.entries
|
||||||
val renderer = SimpleListCellRenderer.create("", LensHoverMode::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 }
|
||||||
}
|
}
|
||||||
@@ -105,7 +112,20 @@ 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,9 +21,14 @@ 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()
|
||||||
@@ -32,11 +37,27 @@ 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,6 +14,19 @@
|
|||||||
]]></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>
|
<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>
|
||||||
@@ -91,11 +104,17 @@
|
|||||||
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.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>
|
||||||
|
Reference in New Issue
Block a user