diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index 047fdd67103..8100face1e2 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -1454,11 +1454,6 @@ Kotlin - - org.jetbrains.kotlin.idea.intentions.ConvertTwoComparisonsToRangeCheckIntention - Kotlin - - org.jetbrains.kotlin.idea.intentions.ConvertRangeCheckToTwoComparisonsIntention Kotlin @@ -2370,8 +2365,8 @@ language="kotlin" /> - - -This intention converts two consecutive comparisons to a range check (in). - - \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertTwoComparisonsToRangeCheckIntention.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ConvertTwoComparisonsToRangeCheckInspection.kt similarity index 85% rename from idea/src/org/jetbrains/kotlin/idea/intentions/ConvertTwoComparisonsToRangeCheckIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/inspections/ConvertTwoComparisonsToRangeCheckInspection.kt index f82356bb3ea..eff3c4fa62d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertTwoComparisonsToRangeCheckIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ConvertTwoComparisonsToRangeCheckInspection.kt @@ -1,27 +1,15 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.intentions +package org.jetbrains.kotlin.idea.inspections import com.intellij.openapi.editor.Editor +import com.intellij.openapi.project.Project import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection -import org.jetbrains.kotlin.idea.inspections.ReplaceRangeToWithUntilInspection import org.jetbrains.kotlin.idea.intentions.branchedTransformations.evaluatesTo import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* @@ -33,21 +21,15 @@ import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.typeUtil.builtIns import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType -@Suppress("DEPRECATION") -class ConvertTwoComparisonsToRangeCheckInspection : IntentionBasedInspection( - ConvertTwoComparisonsToRangeCheckIntention::class -) +class ConvertTwoComparisonsToRangeCheckInspection : + AbstractApplicabilityBasedInspection(KtBinaryExpression::class.java) { + override fun inspectionText(element: KtBinaryExpression) = "Two comparisons should be converted to a range check" -class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependentIntention( - KtBinaryExpression::class.java, - "Convert to range check" -) { + override val defaultFixText = "Convert to a range check" - private data class RangeExpressionData(val value: KtExpression, val min: String, val max: String) + override fun isApplicable(element: KtBinaryExpression) = generateRangeExpressionData(element) != null - override fun isApplicableTo(element: KtBinaryExpression) = generateRangeExpressionData(element) != null - - override fun applyTo(element: KtBinaryExpression, editor: Editor?) { + override fun applyTo(element: KtBinaryExpression, project: Project, editor: Editor?) { val rangeData = generateRangeExpressionData(element) ?: return val factory = KtPsiFactory(element) val replaced = element.replace( @@ -62,6 +44,8 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen } } + private data class RangeExpressionData(val value: KtExpression, val min: String, val max: String) + private fun generateRangeExpressionData(condition: KtBinaryExpression): RangeExpressionData? { if (condition.operationToken != KtTokens.ANDAND) return null val firstCondition = condition.left as? KtBinaryExpression ?: return null @@ -200,4 +184,4 @@ class ConvertTwoComparisonsToRangeCheckIntention : SelfTargetingOffsetIndependen this ?: return false return this.isInteger() || KotlinBuiltIns.isChar(this) } -} +} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/.inspection b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/.inspection new file mode 100644 index 00000000000..079edf943cf --- /dev/null +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/.inspection @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.inspections.ConvertTwoComparisonsToRangeCheckInspection \ No newline at end of file diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/char.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/char.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/char.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/char.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInclusive.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInclusive.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInclusive.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInclusive.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInt.kt similarity index 74% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInt.kt index c369cd18ebd..f3453e5f652 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInt.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInt.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none // DISABLE-ERRORS fun foo(bar: Char) { bar > 1 && 2 > bar diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt similarity index 87% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt index 3d890fe82a7..e76ba16d4eb 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none // WITH_RUNTIME class A(val _value: Int) { operator fun compareTo(other: Int) = _value.compareTo(other) diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToSameType.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToSameType.kt similarity index 90% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToSameType.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToSameType.kt index 7eab3cbeb52..23634e66727 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToSameType.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToSameType.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none // WITH_RUNTIME class A(val _value: Int) { operator fun compareTo(other: A) = _value.compareTo(other._value) diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/double.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/double.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/double.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/double.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt1.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt1.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt1.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt1.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt2.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt2.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt2.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt2.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/flipped.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/flipped.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/flipped.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/flipped.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt similarity index 87% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt index ed487c2ac6f..db404522083 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none var x = 42 diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble.kt similarity index 75% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble.kt index 0dbff9e98a8..7746d0675f7 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none // WITH_RUNTIME fun foo(bar: Int) { bar > 0.0 && 10.0 >= bar diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble2.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble2.kt similarity index 75% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble2.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble2.kt index 2b260f3fb3d..ad774e901b1 100644 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble2.kt +++ b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble2.kt @@ -1,4 +1,4 @@ -// IS_APPLICABLE: false +// PROBLEM: none // WITH_RUNTIME fun foo(bar: Double) { bar > 0 && 10 >= bar diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlt.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlt.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlt.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlt.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlteq.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlteq.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlteq.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlteq.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/nonConstants.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/nonConstants.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/nonConstants.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/nonConstants.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/until.kt b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/until.kt rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/until.kt.after b/idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt.after similarity index 100% rename from idea/testData/intentions/convertTwoComparisonsToRangeCheck/until.kt.after rename to idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt.after diff --git a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/.intention b/idea/testData/intentions/convertTwoComparisonsToRangeCheck/.intention deleted file mode 100644 index 38e9bef8e40..00000000000 --- a/idea/testData/intentions/convertTwoComparisonsToRangeCheck/.intention +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.intentions.ConvertTwoComparisonsToRangeCheckIntention \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 3dbb79e3634..669ab37a695 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -3406,6 +3406,174 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { } } + @TestMetadata("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ConvertTwoComparisonsToRangeCheck extends AbstractLocalInspectionTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInConvertTwoComparisonsToRangeCheck() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), true); + } + + @TestMetadata("char.kt") + public void testChar() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/char.kt"); + } + + @TestMetadata("charInclusive.kt") + public void testCharInclusive() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInclusive.kt"); + } + + @TestMetadata("charInt.kt") + public void testCharInt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/charInt.kt"); + } + + @TestMetadata("compareToComparableSameType.kt") + public void testCompareToComparableSameType() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt"); + } + + @TestMetadata("compareToDifferentTypes.kt") + public void testCompareToDifferentTypes() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt"); + } + + @TestMetadata("compareToSameType.kt") + public void testCompareToSameType() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/compareToSameType.kt"); + } + + @TestMetadata("double.kt") + public void testDouble() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/double.kt"); + } + + @TestMetadata("doubleToInt1.kt") + public void testDoubleToInt1() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt1.kt"); + } + + @TestMetadata("doubleToInt2.kt") + public void testDoubleToInt2() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/doubleToInt2.kt"); + } + + @TestMetadata("flipped.kt") + public void testFlipped() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flipped.kt"); + } + + @TestMetadata("flippedSideEffect.kt") + public void testFlippedSideEffect() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt"); + } + + @TestMetadata("gtDouble.kt") + public void testGtDouble() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble.kt"); + } + + @TestMetadata("gtDouble2.kt") + public void testGtDouble2() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtDouble2.kt"); + } + + @TestMetadata("gteqgt.kt") + public void testGteqgt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgt.kt"); + } + + @TestMetadata("gteqgteq.kt") + public void testGteqgteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqgteq.kt"); + } + + @TestMetadata("gteqlt.kt") + public void testGteqlt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlt.kt"); + } + + @TestMetadata("gteqlteq.kt") + public void testGteqlteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gteqlteq.kt"); + } + + @TestMetadata("gtgt.kt") + public void testGtgt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgt.kt"); + } + + @TestMetadata("gtgteq.kt") + public void testGtgteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtgteq.kt"); + } + + @TestMetadata("gtlt.kt") + public void testGtlt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlt.kt"); + } + + @TestMetadata("gtlteq.kt") + public void testGtlteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/gtlteq.kt"); + } + + @TestMetadata("lteqgt.kt") + public void testLteqgt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgt.kt"); + } + + @TestMetadata("lteqgteq.kt") + public void testLteqgteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqgteq.kt"); + } + + @TestMetadata("lteqlt.kt") + public void testLteqlt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlt.kt"); + } + + @TestMetadata("lteqlteq.kt") + public void testLteqlteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/lteqlteq.kt"); + } + + @TestMetadata("ltgt.kt") + public void testLtgt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgt.kt"); + } + + @TestMetadata("ltgteq.kt") + public void testLtgteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltgteq.kt"); + } + + @TestMetadata("ltlt.kt") + public void testLtlt() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlt.kt"); + } + + @TestMetadata("ltlteq.kt") + public void testLtlteq() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/ltlteq.kt"); + } + + @TestMetadata("nonConstants.kt") + public void testNonConstants() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/nonConstants.kt"); + } + + @TestMetadata("until.kt") + public void testUntil() throws Exception { + runTest("idea/testData/inspectionsLocal/convertTwoComparisonsToRangeCheck/until.kt"); + } + } + @TestMetadata("idea/testData/inspectionsLocal/copyWithoutNamedArguments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 4eea32c8969..1990ea85498 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -7652,174 +7652,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/convertTwoComparisonsToRangeCheck") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertTwoComparisonsToRangeCheck extends AbstractIntentionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInConvertTwoComparisonsToRangeCheck() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertTwoComparisonsToRangeCheck"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), true); - } - - @TestMetadata("char.kt") - public void testChar() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/char.kt"); - } - - @TestMetadata("charInclusive.kt") - public void testCharInclusive() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInclusive.kt"); - } - - @TestMetadata("charInt.kt") - public void testCharInt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/charInt.kt"); - } - - @TestMetadata("compareToComparableSameType.kt") - public void testCompareToComparableSameType() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToComparableSameType.kt"); - } - - @TestMetadata("compareToDifferentTypes.kt") - public void testCompareToDifferentTypes() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToDifferentTypes.kt"); - } - - @TestMetadata("compareToSameType.kt") - public void testCompareToSameType() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/compareToSameType.kt"); - } - - @TestMetadata("double.kt") - public void testDouble() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/double.kt"); - } - - @TestMetadata("doubleToInt1.kt") - public void testDoubleToInt1() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt1.kt"); - } - - @TestMetadata("doubleToInt2.kt") - public void testDoubleToInt2() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/doubleToInt2.kt"); - } - - @TestMetadata("flipped.kt") - public void testFlipped() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/flipped.kt"); - } - - @TestMetadata("flippedSideEffect.kt") - public void testFlippedSideEffect() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/flippedSideEffect.kt"); - } - - @TestMetadata("gtDouble.kt") - public void testGtDouble() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble.kt"); - } - - @TestMetadata("gtDouble2.kt") - public void testGtDouble2() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtDouble2.kt"); - } - - @TestMetadata("gteqgt.kt") - public void testGteqgt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgt.kt"); - } - - @TestMetadata("gteqgteq.kt") - public void testGteqgteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqgteq.kt"); - } - - @TestMetadata("gteqlt.kt") - public void testGteqlt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlt.kt"); - } - - @TestMetadata("gteqlteq.kt") - public void testGteqlteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gteqlteq.kt"); - } - - @TestMetadata("gtgt.kt") - public void testGtgt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgt.kt"); - } - - @TestMetadata("gtgteq.kt") - public void testGtgteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtgteq.kt"); - } - - @TestMetadata("gtlt.kt") - public void testGtlt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlt.kt"); - } - - @TestMetadata("gtlteq.kt") - public void testGtlteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/gtlteq.kt"); - } - - @TestMetadata("lteqgt.kt") - public void testLteqgt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgt.kt"); - } - - @TestMetadata("lteqgteq.kt") - public void testLteqgteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqgteq.kt"); - } - - @TestMetadata("lteqlt.kt") - public void testLteqlt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlt.kt"); - } - - @TestMetadata("lteqlteq.kt") - public void testLteqlteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/lteqlteq.kt"); - } - - @TestMetadata("ltgt.kt") - public void testLtgt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgt.kt"); - } - - @TestMetadata("ltgteq.kt") - public void testLtgteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltgteq.kt"); - } - - @TestMetadata("ltlt.kt") - public void testLtlt() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlt.kt"); - } - - @TestMetadata("ltlteq.kt") - public void testLtlteq() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/ltlteq.kt"); - } - - @TestMetadata("nonConstants.kt") - public void testNonConstants() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/nonConstants.kt"); - } - - @TestMetadata("until.kt") - public void testUntil() throws Exception { - runTest("idea/testData/intentions/convertTwoComparisonsToRangeCheck/until.kt"); - } - } - @TestMetadata("idea/testData/intentions/convertUnsafeCastCallToUnsafeCast") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)