chylex/IntelliJ-Inspection-Lens
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Inspection-Lens.git synced 2025-04-30 14:34:07 +02:00
Code

Address Plugin DevKit inspections

Browse Source 
Closes
This commit is contained in:
chylex 2024-08-11 22:10:26 +02:00
parent e28804ad5d
commit a84bc72fd4
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
2 changed files with 13 additions and 17 deletions
src/main/kotlin/com/chylex/intellij/inspectionlens
editor
LensMarkupModelListener.kt
settings
LensApplicationConfigurable.kt

24
src/main/kotlin/com/chylex/intellij/inspectionlens/editor/LensMarkupModelListener.kt
View File

@ -17,6 +17,7 @@ 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 constructor(editor: Editor) : MarkupModelListener {
private val settingsService = service<LensSettingsState>()
private val lensManagerDispatcher = EditorLensManagerDispatcher(EditorLensManager.getOrCreate(editor)) private val lensManagerDispatcher = EditorLensManagerDispatcher(EditorLensManager.getOrCreate(editor))
override fun afterAdded(highlighter: RangeHighlighterEx) { override fun afterAdded(highlighter: RangeHighlighterEx) {
@ -53,20 +54,19 @@ internal class LensMarkupModelListener private constructor(editor: Editor) : Mar
lensManagerDispatcher.hideAll() lensManagerDispatcher.hideAll()
} }
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { settingsService.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)
}
}
companion object { companion object {
private val EDITOR_KEY = Key<LensMarkupModelListener>(LensMarkupModelListener::class.java.name) private val EDITOR_KEY = Key<LensMarkupModelListener>(LensMarkupModelListener::class.java.name)
private val SETTINGS_SERVICE = service<LensSettingsState>()
private fun getFilteredHighlightInfo(highlighter: RangeHighlighter): HighlightInfo? {
return HighlightInfo.fromRangeHighlighter(highlighter)?.takeIf { SETTINGS_SERVICE.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) {

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

@ -25,10 +25,6 @@ import java.awt.Cursor
class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId { class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), ConfigurableWithId {
companion object { companion object {
const val ID = "InspectionLens" const val ID = "InspectionLens"
private fun getTextAttributes(registrar: SeverityRegistrar, severity: HighlightSeverity): TextAttributes? {
return registrar.getHighlightInfoTypeBySeverity(severity).attributesKey.defaultAttributes
}
} }
private data class DisplayedSeverity( private data class DisplayedSeverity(
@ -42,7 +38,7 @@ class LensApplicationConfigurable : BoundConfigurable("Inspection Lens"), Config
) : this( ) : this(
id = severity.name, id = severity.name,
severity = StoredSeverity(severity), severity = StoredSeverity(severity),
textAttributes = getTextAttributes(registrar, severity) textAttributes = registrar.getHighlightInfoTypeBySeverity(severity).attributesKey.defaultAttributes
) )
} }