mirror of
https://github.com/chylex/IntelliJ-Inspection-Lens.git
synced 2026-10-16 23:33:58 +02:00
Compare commits
5
Commits
145b7edf6b
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08de8a1e5b
|
||
|
|
369f2138bc
|
||
|
|
b953a49ab1
|
||
|
|
d59eddf21f
|
||
|
|
7dd4184957
|
+8
-1
@@ -8,7 +8,14 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.chylex.intellij.inspectionlens"
|
||||
version = "1.6.1"
|
||||
version = "1.7.0"
|
||||
|
||||
idea {
|
||||
module {
|
||||
excludeDirs.add(file(".kotlin"))
|
||||
excludeDirs.add(file("build"))
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
||||
@@ -14,26 +14,26 @@ internal class EditorLensManager(private val editor: Editor) {
|
||||
private val lenses = IdentityHashMap<RangeHighlighter, EditorLens>()
|
||||
private val settings = service<LensSettingsState>()
|
||||
|
||||
private fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||
private fun show(inspection: Inspection) {
|
||||
if (editor.isDisposed) {
|
||||
return
|
||||
}
|
||||
|
||||
val (highlighter, info) = highlighterWithInfo
|
||||
val highlighter = inspection.highlighter
|
||||
if (!highlighter.isValid) {
|
||||
return
|
||||
}
|
||||
|
||||
val existingLens = lenses[highlighter]
|
||||
if (existingLens != null) {
|
||||
if (existingLens.update(info, settings)) {
|
||||
if (existingLens.update(inspection, settings)) {
|
||||
return
|
||||
}
|
||||
|
||||
existingLens.hide()
|
||||
}
|
||||
|
||||
val newLens = EditorLens.show(editor, info, settings)
|
||||
val newLens = EditorLens.show(editor, inspection, settings)
|
||||
if (newLens != null) {
|
||||
lenses[highlighter] = newLens
|
||||
}
|
||||
@@ -66,9 +66,9 @@ internal class EditorLensManager(private val editor: Editor) {
|
||||
sealed interface Command {
|
||||
fun apply(lensManager: EditorLensManager)
|
||||
|
||||
class Show(private val highlighter: HighlighterWithInfo) : Command {
|
||||
class Show(private val inspection: Inspection) : Command {
|
||||
override fun apply(lensManager: EditorLensManager) {
|
||||
lensManager.show(highlighter)
|
||||
lensManager.show(inspection)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ internal class EditorLensManagerDispatcher(private val lensManager: EditorLensMa
|
||||
private var queuedItems = mutableListOf<EditorLensManager.Command>()
|
||||
private var isEnqueued = false
|
||||
|
||||
fun show(highlighterWithInfo: HighlighterWithInfo) {
|
||||
enqueue(EditorLensManager.Command.Show(highlighterWithInfo))
|
||||
fun show(inspection: Inspection) {
|
||||
enqueue(EditorLensManager.Command.Show(inspection))
|
||||
}
|
||||
|
||||
fun hide(highlighter: RangeHighlighter) {
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.chylex.intellij.inspectionlens.editor
|
||||
|
||||
import com.intellij.codeInsight.daemon.impl.AsyncDescriptionSupplier
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||
import java.util.function.Consumer
|
||||
|
||||
open class HighlighterWithInfo private constructor(val highlighter: RangeHighlighter, private val info: HighlightInfo) {
|
||||
val hasDescription
|
||||
get() = info.description != null
|
||||
|
||||
operator fun component1() = highlighter
|
||||
operator fun component2() = info
|
||||
|
||||
class Async(highlighter: RangeHighlighter, info: HighlightInfo, private val provider: AsyncDescriptionSupplier) : HighlighterWithInfo(highlighter, info) {
|
||||
fun requestDescription(callback: Consumer<String?>) {
|
||||
provider.requestDescription().onSuccess(callback)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun from(highlighter: RangeHighlighter, info: HighlightInfo) =
|
||||
if (info is AsyncDescriptionSupplier)
|
||||
Async(highlighter, info, info)
|
||||
else
|
||||
HighlighterWithInfo(highlighter, info)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.chylex.intellij.inspectionlens.editor
|
||||
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.openapi.editor.markup.RangeHighlighter
|
||||
|
||||
data class Inspection(val highlighter: RangeHighlighter, val info: HighlightInfo)
|
||||
+14
-16
@@ -2,6 +2,7 @@ package com.chylex.intellij.inspectionlens.editor
|
||||
|
||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||
import com.intellij.codeInsight.daemon.impl.AsyncDescriptionSupplier
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.codeInsight.daemon.impl.UpdateHighlightersUtil.isFileLevelOrGutterAnnotation
|
||||
import com.intellij.openapi.components.service
|
||||
@@ -39,28 +40,25 @@ internal class LensMarkupModelListener(private val lensManagerDispatcher: Editor
|
||||
return
|
||||
}
|
||||
|
||||
val highlighterWithInfo = HighlighterWithInfo.from(highlighter, info)
|
||||
processHighlighterWithInfo(highlighterWithInfo, lensManagerDispatcher::show, ::showAsynchronously)
|
||||
if (info is AsyncDescriptionSupplier) {
|
||||
info.requestDescription().onSuccess {
|
||||
if (highlighter.isValid) {
|
||||
showInspection(highlighter, info)
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
showInspection(highlighter, info)
|
||||
}
|
||||
}
|
||||
|
||||
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
|
||||
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settings.severityFilter.test(it.severity) }
|
||||
}
|
||||
|
||||
private inline fun processHighlighterWithInfo(highlighterWithInfo: HighlighterWithInfo, actionForImmediate: (HighlighterWithInfo) -> Unit, actionForAsync: (HighlighterWithInfo.Async) -> Unit) {
|
||||
if (highlighterWithInfo is HighlighterWithInfo.Async) {
|
||||
actionForAsync(highlighterWithInfo)
|
||||
}
|
||||
else if (highlighterWithInfo.hasDescription) {
|
||||
actionForImmediate(highlighterWithInfo)
|
||||
}
|
||||
}
|
||||
|
||||
private fun showAsynchronously(highlighterWithInfo: HighlighterWithInfo.Async) {
|
||||
highlighterWithInfo.requestDescription {
|
||||
if (highlighterWithInfo.highlighter.isValid && highlighterWithInfo.hasDescription) {
|
||||
lensManagerDispatcher.show(highlighterWithInfo)
|
||||
}
|
||||
private fun showInspection(highlighter: RangeHighlighter, info: HighlightInfo) {
|
||||
if (info.description != null) {
|
||||
lensManagerDispatcher.show(Inspection(highlighter, info))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
package com.chylex.intellij.inspectionlens.editor.lens
|
||||
|
||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
||||
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 {
|
||||
fun update(inspection: Inspection, settings: LensSettingsState): Boolean {
|
||||
val editor = inlay.editor
|
||||
val oldSeverity = severity
|
||||
|
||||
severity = LensSeverity.from(info.severity)
|
||||
severity = LensSeverity.from(inspection.info.severity)
|
||||
|
||||
if (!inlay.tryUpdate(info)) {
|
||||
inlay = EditorLensInlay.show(editor, info, settings) ?: return false
|
||||
if (!inlay.tryUpdate(inspection)) {
|
||||
inlay = EditorLensInlay.show(editor, inspection, settings) ?: return false
|
||||
}
|
||||
|
||||
if (lineBackground.isInvalid || oldSeverity != severity) {
|
||||
lineBackground.hide(editor)
|
||||
lineBackground = EditorLensLineBackground.show(editor, info)
|
||||
lineBackground = EditorLensLineBackground.show(editor, inspection.info)
|
||||
}
|
||||
|
||||
return true
|
||||
@@ -33,8 +33,9 @@ internal class EditorLens private constructor(private var inlay: EditorLensInlay
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLens? {
|
||||
val inlay = EditorLensInlay.show(editor, info, settings) ?: return null
|
||||
fun show(editor: Editor, inspection: Inspection, settings: LensSettingsState): EditorLens? {
|
||||
val info = inspection.info
|
||||
val inlay = EditorLensInlay.show(editor, inspection, 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.lens
|
||||
|
||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
||||
import com.chylex.intellij.inspectionlens.settings.LensSettingsState
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.openapi.editor.Editor
|
||||
@@ -11,12 +12,12 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
||||
val editor
|
||||
get() = inlay.editor
|
||||
|
||||
fun tryUpdate(info: HighlightInfo): Boolean {
|
||||
fun tryUpdate(inspection: Inspection): Boolean {
|
||||
if (!inlay.isValid) {
|
||||
return false
|
||||
}
|
||||
|
||||
inlay.renderer.setPropertiesFrom(info)
|
||||
inlay.renderer.setPropertiesFrom(inspection)
|
||||
inlay.update()
|
||||
return true
|
||||
}
|
||||
@@ -26,10 +27,10 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun show(editor: Editor, info: HighlightInfo, settings: LensSettingsState): EditorLensInlay? {
|
||||
val offset = getInlayHintOffset(info)
|
||||
val priority = getInlayHintPriority(editor, info)
|
||||
val renderer = LensRenderer(info, settings)
|
||||
fun show(editor: Editor, inspection: Inspection, settings: LensSettingsState): EditorLensInlay? {
|
||||
val offset = getInlayHintOffset(inspection.info)
|
||||
val priority = getInlayHintPriority(editor, inspection.info)
|
||||
val renderer = LensRenderer(inspection, settings)
|
||||
|
||||
val properties = InlayProperties()
|
||||
.relatesToPrecedingText(true)
|
||||
@@ -71,6 +72,6 @@ internal value class EditorLensInlay(private val inlay: Inlay<LensRenderer>) {
|
||||
private fun getLineStartOffset(editor: Editor, offset: Int): Int {
|
||||
val position = editor.offsetToLogicalPosition(offset)
|
||||
return editor.document.getLineStartOffset(position.line)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,33 +1,31 @@
|
||||
package com.chylex.intellij.inspectionlens.editor.lens
|
||||
|
||||
import com.chylex.intellij.inspectionlens.InspectionLens
|
||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo
|
||||
import com.intellij.codeInsight.daemon.impl.HighlightInfo.IntentionActionDescriptor
|
||||
import com.intellij.codeInsight.daemon.impl.IntentionsUI
|
||||
import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass
|
||||
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.ide.DataManager
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
import com.intellij.openapi.actionSystem.ActionManager
|
||||
import com.intellij.openapi.actionSystem.ActionPlaces
|
||||
import com.intellij.openapi.actionSystem.ActionUiKind
|
||||
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||
import com.intellij.openapi.actionSystem.IdeActions
|
||||
import com.intellij.openapi.actionSystem.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.editor.markup.RangeHighlighter
|
||||
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 {
|
||||
@@ -38,38 +36,39 @@ internal object IntentionsPopup {
|
||||
val parameterTypes = method.parameterTypes
|
||||
|
||||
method.name == "showPopup" &&
|
||||
parameterTypes.size in 1..2 &&
|
||||
parameterTypes.size == 2 &&
|
||||
parameterTypes[0] === RelativePoint::class.java &&
|
||||
parameterTypes.getOrNull(1).let { p -> p == null || p.name == INTENTION_SOURCE_CLASS_NAME }
|
||||
parameterTypes[1].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" })
|
||||
val intentionSourceEnum = Class.forName(INTENTION_SOURCE_CLASS_NAME) as Class<Enum<*>>
|
||||
val intentionSource = intentionSourceEnum.enumConstants.first { it.name == "OTHER" }
|
||||
|
||||
ShowPopupMethod(method, args)
|
||||
ShowPopupMethod(method, arrayOf(null, intentionSource))
|
||||
} catch (t: Throwable) {
|
||||
InspectionLens.LOG.warn("Could not initialize intention popup", t)
|
||||
null
|
||||
}
|
||||
|
||||
val hasShowPopupMethod
|
||||
get() = showPopupMethod != null
|
||||
|
||||
private class ShowPopupMethod(private val method: Method, private val args: Array<Any?>) {
|
||||
operator fun invoke(component: IntentionHintComponent) {
|
||||
method.invoke(component, *args)
|
||||
}
|
||||
}
|
||||
|
||||
fun show(highlightInfo: HighlightInfo, inlay: Inlay<*>) {
|
||||
if (!tryShow(highlightInfo, inlay)) {
|
||||
showNoActionsAvailable(inlay.editor)
|
||||
fun show(inspection: Inspection, inlay: Inlay<*>) {
|
||||
if (!tryShow(inspection, inlay)) {
|
||||
HintManager.getInstance().showInformationHint(inlay.editor, "No context actions available at this location")
|
||||
}
|
||||
}
|
||||
|
||||
private fun tryShow(highlightInfo: HighlightInfo, inlay: Inlay<*>): Boolean {
|
||||
private fun tryShow(inspection: Inspection, inlay: Inlay<*>): Boolean {
|
||||
val editor = inlay.editor
|
||||
val project = editor.project ?: return false
|
||||
val file = PsiUtilBase.getPsiFileInEditor(editor, project) ?: return false
|
||||
@@ -77,46 +76,42 @@ internal object IntentionsPopup {
|
||||
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())
|
||||
val intentions = collectIntentions(editor, file, inspection.highlighter, inlay.offset)
|
||||
if (intentions == null) {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
try {
|
||||
showIntentionsPopup(project, file, editor, intentions)
|
||||
return true
|
||||
} catch (t: Throwable) {
|
||||
InspectionLens.LOG.error("Could not show intention popup", t)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
private fun collectIntentions(editor: Editor, project: Project, file: PsiFile, info: HighlightInfo, offset: Int): IntentionsInfo {
|
||||
val intentions = mutableListOf<IntentionActionDescriptor>()
|
||||
private fun collectIntentions(editor: Editor, file: PsiFile, highlighter: RangeHighlighter, offset: Int): IntentionsInfo? {
|
||||
val resolvedInfo = HighlightInfo.fromRangeHighlighter(highlighter)
|
||||
if (resolvedInfo == null) {
|
||||
return null
|
||||
}
|
||||
|
||||
info.findRegisteredQuickFix { descriptor, _ ->
|
||||
if (DumbService.getInstance(project).isUsableInCurrentContext(descriptor.action) && ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
|
||||
intentions.add(descriptor)
|
||||
val intentionActions = mutableListOf<IntentionActionDescriptor>()
|
||||
|
||||
resolvedInfo.findRegisteredQuickFix { descriptor, _ ->
|
||||
if (ShowIntentionActionsHandler.availableFor(file, editor, offset, descriptor.action)) {
|
||||
intentionActions.add(descriptor)
|
||||
}
|
||||
null
|
||||
}
|
||||
|
||||
return IntentionsInfo().also {
|
||||
it.offset = offset
|
||||
|
||||
if (info.severity === HighlightSeverity.ERROR) {
|
||||
it.errorFixesToShow.addAll(intentions)
|
||||
}
|
||||
else {
|
||||
it.inspectionFixesToShow.addAll(intentions)
|
||||
}
|
||||
ShowIntentionsPass.fillIntentionsInfoForHighlightInfo(resolvedInfo, it, intentionActions)
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
private fun showIntentionsPopup(project: Project, file: PsiFile, editor: Editor, intentions: IntentionsInfo) {
|
||||
if (intentions.isEmpty || showPopupMethod == null) {
|
||||
val showIntentionsAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
|
||||
val dataContext = DataManager.getInstance().getDataContext(editor.component)
|
||||
@@ -130,7 +125,4 @@ internal object IntentionsPopup {
|
||||
}
|
||||
}
|
||||
|
||||
private fun showNoActionsAvailable(editor: Editor) {
|
||||
HintManager.getInstance().showInformationHint(editor, "No context actions available at this location")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.chylex.intellij.inspectionlens.editor.lens
|
||||
|
||||
import com.chylex.intellij.inspectionlens.editor.Inspection
|
||||
import com.chylex.intellij.inspectionlens.settings.LensHoverMode
|
||||
import com.chylex.intellij.inspectionlens.settings.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
|
||||
@@ -27,14 +27,14 @@ import javax.swing.SwingUtilities
|
||||
/**
|
||||
* Renders the text of an inspection lens.
|
||||
*/
|
||||
class LensRenderer(private var info: HighlightInfo, private val settings: LensSettingsState) : HintRenderer(null), InputHandler {
|
||||
class LensRenderer(private var inspection: Inspection, 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)
|
||||
setPropertiesFrom(inspection)
|
||||
}
|
||||
|
||||
fun setInlay(inlay: Inlay<*>) {
|
||||
@@ -42,12 +42,12 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
||||
this.inlay = inlay
|
||||
}
|
||||
|
||||
fun setPropertiesFrom(info: HighlightInfo) {
|
||||
this.info = info
|
||||
val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
|
||||
fun setPropertiesFrom(inspection: Inspection) {
|
||||
this.inspection = inspection
|
||||
val description = getValidDescriptionText(inspection.info.description, settings.maxDescriptionLength)
|
||||
|
||||
text = description
|
||||
attributes = LensSeverity.from(info.severity).textAttributes
|
||||
attributes = LensSeverity.from(inspection.info.severity).textAttributes
|
||||
extraRightPadding = if (description.lastOrNull() == '.') 2 else 0
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
||||
fixBaselineForTextRendering(r)
|
||||
super.paint(inlay, g, r, textAttributes)
|
||||
|
||||
if (hovered && isHoveringText()) {
|
||||
if (hovered) {
|
||||
paintHoverEffect(inlay, g, r)
|
||||
}
|
||||
}
|
||||
@@ -85,7 +85,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
||||
}
|
||||
|
||||
override fun mouseMoved(event: MouseEvent, translated: Point) {
|
||||
setHovered(isHoveringText(translated))
|
||||
setHovered(isHoveringText())
|
||||
}
|
||||
|
||||
override fun mouseExited() {
|
||||
@@ -114,7 +114,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
||||
|
||||
override fun mousePressed(event: MouseEvent, translated: Point) {
|
||||
val hoverMode = settings.lensHoverMode
|
||||
if (hoverMode == LensHoverMode.DISABLED || !isHoveringText(translated)) {
|
||||
if (hoverMode == LensHoverMode.DISABLED || !isHoveringText()) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -122,25 +122,21 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
|
||||
event.consume()
|
||||
|
||||
val editor = inlay.editor
|
||||
moveToOffset(editor, info.actualStartOffset)
|
||||
moveToOffset(editor, inspection.info.actualStartOffset)
|
||||
|
||||
if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
|
||||
IntentionsPopup.show(info, inlay)
|
||||
IntentionsPopup.show(inspection, inlay)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun isHoveringText(): Boolean {
|
||||
val bounds = inlay.bounds ?: return false
|
||||
val translatedPoint = MouseInfo.getPointerInfo().location.apply {
|
||||
val point = 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
|
||||
|
||||
@@ -14,6 +14,12 @@
|
||||
]]></description>
|
||||
|
||||
<change-notes><![CDATA[
|
||||
<b>Version 1.7.0</b>
|
||||
<ul>
|
||||
<li>Updated minimum version to IntelliJ 2025.3 to address API deprecations.</li>
|
||||
<li>Improved reliability of only showing relevant quick fixes when clicking an inspection.</li>
|
||||
<li>Fixed lenses not always rendering an underline when hovered.</li>
|
||||
</ul>
|
||||
<b>Version 1.6.1</b>
|
||||
<ul>
|
||||
<li>Fixed exception caused by accessing disposed editors.</li>
|
||||
@@ -122,6 +128,7 @@
|
||||
instance="com.chylex.intellij.inspectionlens.settings.LensApplicationConfigurable"
|
||||
displayName="Inspection Lens"
|
||||
parentId="tools" />
|
||||
<errorHandler implementation="com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter"/>
|
||||
</extensions>
|
||||
|
||||
<actions>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.chylex.intellij.inspectionlens.editor.lens
|
||||
|
||||
import org.junit.jupiter.api.Assertions.assertTrue
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class IntentionsPopupTest {
|
||||
@Test
|
||||
fun hasShowPopupMethod() {
|
||||
assertTrue(IntentionsPopup.hasShowPopupMethod)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user