.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: chylex
+patreon: chylex
 ko_fi: chylex

README.md

@@ -2,9 +2,9 @@
 
 Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
 
-By default, the plugin shows **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections with a high enough severity level. Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
+By default, the plugin shows **Errors**, **Warnings**, **Weak Warnings**, **Server Problems**, **Grammar Errors**, **Typos**, and other inspections with a high enough severity level. Configure visible severities in **Settings | Tools | Inspection Lens**.
 
-Configure appearance, behavior of clicking on inspections, and visible severities in **Settings | Tools | Inspection Lens**.
+Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
 
 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.
 

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.chylex.intellij.inspectionlens"
-version = "1.5.1"
+version = "1.5"
 
 repositories {
 	mavenCentral()

src/main/kotlin/com/chylex/intellij/inspectionlens/editor/lens/LensRenderer.kt

@@ -1,6 +1,5 @@
 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
@@ -17,7 +16,6 @@ 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
@@ -27,7 +25,8 @@ 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 info: HighlightInfo, settings: LensSettingsState) : HintRenderer(null), InputHandler {
+	private val useEditorFont = settings.useEditorFont
 	private lateinit var inlay: Inlay<*>
 	private lateinit var attributes: LensSeverityTextAttributes
 	private var extraRightPadding = 0
@@ -55,7 +54,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)
 		}
 	}
@@ -81,7 +80,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 	}
 	
 	override fun useEditorFont(): Boolean {
-		return settings.useEditorFont
+		return useEditorFont
 	}
 	
 	override fun mouseMoved(event: MouseEvent, translated: Point) {
@@ -93,10 +92,6 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 	}
 	
 	private fun setHovered(hovered: Boolean) {
-		if (hovered && settings.lensHoverMode == LensHoverMode.DISABLED) {
-			return
-		}
-		
 		if (this.hovered == hovered) {
 			return
 		}
@@ -113,33 +108,22 @@ 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 (!isHoveringText(translated)) {
 			return
 		}
 		
-		if (event.button.let { it == MouseEvent.BUTTON1 || it == MouseEvent.BUTTON2 }) {
+		if (SwingUtilities.isLeftMouseButton(event) || SwingUtilities.isMiddleMouseButton(event)) {
 			event.consume()
 			
 			val editor = inlay.editor
 			moveToOffset(editor, info.actualStartOffset)
 			
-			if ((event.button == MouseEvent.BUTTON1) xor (hoverMode != LensHoverMode.DEFAULT)) {
+			if (SwingUtilities.isLeftMouseButton(event)) {
 				IntentionsPopup.show(editor)
 			}
 		}
 	}
 	
-	private fun isHoveringText(): Boolean {
-		val bounds = inlay.bounds ?: return false
-		val translatedPoint = MouseInfo.getPointerInfo().location.apply {
-			SwingUtilities.convertPointFromScreen(this, inlay.editor.contentComponent)
-			translate(-bounds.x, -bounds.y)
-		}
-		
-		return isHoveringText(translatedPoint)
-	}
-	
 	private fun isHoveringText(point: Point): Boolean {
 		return point.x >= HOVER_HORIZONTAL_PADDING
 			&& point.y >= 4

src/main/kotlin/com/chylex/intellij/inspectionlens/settings/LensApplicationConfigurable.kt

@@ -13,13 +13,11 @@ import com.intellij.openapi.ui.DialogPanel
 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.bindItem
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 import java.awt.Cursor
@@ -76,20 +74,6 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 		val settings = settingsService.state
 		
 		return panel {
-			group("Appearance") {
-				row {
-					checkBox("Use editor font").bindSelected(settings::useEditorFont)
-				}
-			}
-			
-			group("Behavior") {
-				row("Hover mode:") {
-					val items = LensHoverMode.values().toList()
-					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 {
@@ -105,6 +89,12 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 					checkBox("Other").bindSelected(settings::showUnknownSeverities)
 				}
 			}
+			
+			group("Appearance") {
+				row {
+					checkBox("Use editor font").bindSelected(settings::useEditorFont)
+				}
+			}
 		}
 	}
 	

src/main/kotlin/com/chylex/intellij/inspectionlens/settings/LensHoverMode.kt

@@ -1,7 +0,0 @@
-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")
-}

src/main/kotlin/com/chylex/intellij/inspectionlens/settings/LensSettingsState.kt

@@ -21,7 +21,6 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 		
 		var showUnknownSeverities by property(true)
 		var useEditorFont by property(true)
-		var lensHoverMode by enum(LensHoverMode.DEFAULT)
 	}
 	
 	@get:Synchronized
@@ -32,9 +31,6 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 	val useEditorFont
 		get() = state.useEditorFont
 	
-	val lensHoverMode
-		get() = state.lensHoverMode
-	
 	override fun loadState(state: State) {
 		super.loadState(state)
 		update()

src/main/resources/META-INF/plugin.xml

@@ -6,20 +6,14 @@
   <description><![CDATA[
     Displays errors, warnings, and other inspections inline. Highlights the background of lines with inspections. Supports light and dark themes out of the box.
     <br><br>
-    By default, the plugin shows <b>Errors</b>, <b>Warnings</b>, <b>Weak Warnings</b>, <b>Server Problems</b>, <b>Grammar Errors</b>, <b>Typos</b>, and other inspections with a high enough severity level. Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor.
+    By default, the plugin shows <b>Errors</b>, <b>Warnings</b>, <b>Weak Warnings</b>, <b>Server Problems</b>, <b>Grammar Errors</b>, <b>Typos</b>, and other inspections with a high enough severity level. Configure visible severities in <b>Settings | Tools | Inspection Lens</a>.
     <br><br>
-    Configure appearance, behavior of clicking on inspections, and visible severities in <b>Settings | Tools | Inspection Lens</b>.
+    Left-click an inspection to show quick fixes. Middle-click an inspection to navigate to the relevant code in the editor. 
     <br><br>
     Inspired by <a href="https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens">Error Lens</a> for VS Code, and <a href="https://plugins.jetbrains.com/plugin/17302-inlineerror">Inline Error</a> for IntelliJ Platform.
   ]]></description>
   
   <change-notes><![CDATA[
-    <b>Version 1.5.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>