diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt index d876345d9bf..23ef8153894 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantGetterInspection.kt @@ -10,15 +10,18 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.startOffset class RedundantGetterInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { return propertyAccessorVisitor { accessor -> + val rangeInElement = accessor.namePlaceholder.textRange?.shiftRight(-accessor.startOffset) ?: return@propertyAccessorVisitor if (accessor.isRedundantGetter()) { holder.registerProblem( accessor, "Redundant getter", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, + rangeInElement, RemoveRedundantGetterFix() ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt index e502052e946..d993c29e68c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantSetterInspection.kt @@ -11,15 +11,18 @@ import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.startOffset class RedundantSetterInspection : AbstractKotlinInspection(), CleanupLocalInspectionTool { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean, session: LocalInspectionToolSession): PsiElementVisitor { return propertyAccessorVisitor { accessor -> + val rangeInElement = accessor.namePlaceholder.textRange?.shiftRight(-accessor.startOffset) ?: return@propertyAccessorVisitor if (accessor.isRedundantSetter()) { holder.registerProblem( accessor, "Redundant setter", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, + rangeInElement, RemoveRedundantSetterFix() ) } diff --git a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility1.kt b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility1.kt index a1e7ba80893..dbeec6df16b 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility1.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility1.kt @@ -1,5 +1,5 @@ // PROBLEM: none class Test { var x = 1 - private set + private set } \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility2.kt b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility2.kt index cd0688500ae..0b788ed1d88 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility2.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility2.kt @@ -1,5 +1,5 @@ // PROBLEM: none class Test { internal var x = 1 - private set + private set } \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility3.kt b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility3.kt index 5e50785eb5b..c1eb008f3dd 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility3.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/lowerVisibility3.kt @@ -1,5 +1,5 @@ // PROBLEM: none class Test { protected var x = 1 - private set + private set } \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility1.kt b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility1.kt index d9e932cdeed..1d39376e547 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility1.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility1.kt @@ -1,4 +1,4 @@ class Test { internal var x = 1 - internal set + internal set } \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility2.kt b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility2.kt index d2f0534843a..b36fabb7e3a 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility2.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility2.kt @@ -1,4 +1,4 @@ class Test { protected var x = 1 - protected set + protected set } \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility3.kt b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility3.kt index 94bc36d6fd5..dfb02a4ff01 100644 --- a/idea/testData/inspectionsLocal/redundantSetter/sameVisibility3.kt +++ b/idea/testData/inspectionsLocal/redundantSetter/sameVisibility3.kt @@ -1,4 +1,4 @@ class Test { private var x = 1 - private set + private set }