azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce additional fixes & configurable problem range for intention-based inspection

Browse Source 
(cherry picked from commit ed23aa9)
This commit is contained in:
Mikhail Glukhikh
2016-06-20 17:27:44 +03:00
committed by Mikhail Glukhikh
parent 2b2b937263
commit a68e8e0db5
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
+15 -8
View File
@@ -17,10 +17,7 @@
package org.jetbrains.kotlin.idea.inspections
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.codeInspection.LocalInspectionToolSession
import com.intellij.codeInspection.LocalQuickFixOnPsiElement
import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.codeInspection.ProblemsHolder
import com.intellij.codeInspection.*
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.EditorFactory
import com.intellij.openapi.fileEditor.FileDocumentManager
@@ -47,6 +44,10 @@ abstract class IntentionBasedInspection<TElement : PsiElement>(
val additionalChecker: (TElement) -> Boolean = { true }
)
open fun additionalFixes(element: TElement): List<LocalQuickFix>? = null
open fun inspectionRange(element: TElement): TextRange? = null
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor {
return object : PsiElementVisitor() {
override fun visitElement(element: PsiElement) {
@@ -56,7 +57,7 @@ abstract class IntentionBasedInspection<TElement : PsiElement>(
val targetElement = element as TElement
var problemRange: TextRange? = null
var fixes: SmartList<IntentionBasedQuickFix<*>>? = null
var fixes: SmartList<LocalQuickFix>? = null
for ((intention, additionalChecker) in intentions) {
synchronized(intention) {
@@ -69,15 +70,21 @@ abstract class IntentionBasedInspection<TElement : PsiElement>(
if (range != null && additionalChecker(targetElement)) {
problemRange = problemRange?.union(range) ?: range
if (fixes == null) {
fixes = SmartList<IntentionBasedQuickFix<*>>()
fixes = SmartList<LocalQuickFix>()
}
fixes!!.add(IntentionBasedQuickFix(intention, intention.text, additionalChecker, targetElement))
}
}
}
if (problemRange != null) {
holder.registerProblem(targetElement, problemText ?: fixes!!.first().name, problemHighlightType, problemRange, *fixes!!.toTypedArray())
val range = inspectionRange(targetElement) ?: problemRange
if (range != null) {
val allFixes = fixes ?: SmartList<LocalQuickFix>()
additionalFixes(targetElement)?.let { allFixes.addAll(it) }
if (!allFixes.isEmpty()) {
holder.registerProblem(targetElement, problemText ?: allFixes.first().name,
problemHighlightType, range, *allFixes.toTypedArray())
}
}
}
}