Release 1.5.2

Closes #34

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.chylex.intellij.inspectionlens"
-version = "1.5.1"
+version = "1.5.2"
 
 repositories {
 	mavenCentral()
@@ -39,7 +39,8 @@ kotlin {
 	
 	compilerOptions {
 		freeCompilerArgs = listOf(
-			"-X" + "jvm-default=all"
+			"-X" + "jvm-default=all",
+			"-X" + "lambdas=indy"
 		)
 	}
 }

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

@@ -2,7 +2,6 @@ package com.chylex.intellij.inspectionlens.editor.lens
 
 import com.intellij.codeInsight.daemon.impl.IntentionsUI
 import com.intellij.codeInsight.hint.HintManager
-import com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction
 import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler
 import com.intellij.lang.LangBundle
 import com.intellij.openapi.actionSystem.ActionManager
@@ -26,7 +25,7 @@ internal object IntentionsPopup {
 		// If the IDE uses the default Show Intentions action and handler,
 		// use the handler directly to bypass additional logic from the action.
 		val action = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)
-		if (action.javaClass === ShowIntentionActionsAction::class.java) {
+		if (action.javaClass.name === DEFAULT_ACTION_CLASS) {
 			return tryShowWithDefaultHandler(editor)
 		}
 		else {
@@ -46,6 +45,11 @@ internal object IntentionsPopup {
 		return true
 	}
 	
+	/**
+	 * New IDEA versions mark this class as internal, so the plugin verifier flags references to it as errors.
+	 */
+	const val DEFAULT_ACTION_CLASS = "com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction"
+	
 	private val HANDLER = object : ShowIntentionActionsHandler() {
 		public override fun showIntentionHint(project: Project, editor: Editor, file: PsiFile, showFeedbackOnEmptyMenu: Boolean) {
 			super.showIntentionHint(project, editor, file, showFeedbackOnEmptyMenu)

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

@@ -44,7 +44,7 @@ class LensRenderer(private var info: HighlightInfo, private val settings: LensSe
 	
 	fun setPropertiesFrom(info: HighlightInfo) {
 		this.info = info
-		val description = getValidDescriptionText(info.description)
+		val description = getValidDescriptionText(info.description, settings.maxDescriptionLength)
 		
 		text = description
 		attributes = LensSeverity.from(info.severity).textAttributes
@@ -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 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.
 		 */
 		private val UPPERCASE_TAG_REGEX = Pattern.compile("^\\[[A-Z_]+] ")
 		
-		private fun getValidDescriptionText(text: String?): String {
-			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)))
+		private fun getValidDescriptionText(text: String?, maxLength: Int): String {
+			return if (text.isNullOrBlank()) " " else addEllipsisOrMissingPeriod(unescapeHtmlEntities(stripUppercaseTag(text)), maxLength)
 		}
 		
 		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
 		}
 		
-		private fun addEllipsisOrMissingPeriod(text: String): String {
+		private fun addEllipsisOrMissingPeriod(text: String, maxLength: Int): String {
 			return when {
-				text.length > MAX_DESCRIPTION_LENGTH -> text.take(MAX_DESCRIPTION_LENGTH).trimEnd { it.isWhitespace() || it == '.' } + "…"
-				!text.endsWith('.')                  -> "$text."
-				else                                 -> text
+				text.length > maxLength -> text.take(maxLength).trimEnd { it.isWhitespace() || it == '.' } + "…"
+				!text.endsWith('.')     -> "$text."
+				else                    -> text
 			}
 		}
 		

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

@@ -10,6 +10,7 @@ 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
@@ -19,6 +20,7 @@ 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
@@ -75,16 +77,21 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
 	override fun createPanel(): DialogPanel {
 		val settings = settingsService.state
 		
-		return panel {
+		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.values().toList()
+					val items = LensHoverMode.entries
 					val renderer = SimpleListCellRenderer.create("", LensHoverMode::description)
 					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)
 				}
 			}
+			
+			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> {

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

@@ -21,9 +21,14 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 		
 		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()
@@ -32,11 +37,27 @@ class LensSettingsState : SimplePersistentStateComponent<LensSettingsState.State
 	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()
 	}
 	

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

@@ -14,6 +14,11 @@
   ]]></description>
   
   <change-notes><![CDATA[
+    <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>

src/test/kotlin/com/chylex/intellij/inspectionlens/editor/lens/IntentionsPopupTest.kt

@@ -0,0 +1,12 @@
+package com.chylex.intellij.inspectionlens.editor.lens
+
+import com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class IntentionsPopupTest {
+	@Test
+	fun showIntentionActionsActionClassHasNotChanged() {
+		assertEquals(IntentionsPopup.DEFAULT_ACTION_CLASS, ShowIntentionActionsAction::class.java.name)
+	}
+}