From 97010c7d7f2878e76e5ead8761022e3d3f19e4b3 Mon Sep 17 00:00:00 2001 From: Ross Hanson Date: Fri, 11 Apr 2014 13:07:26 -0400 Subject: [PATCH 1/3] KT-4820: Intention to introduce an index variable to a for loop over an ordered collection via "withIndices()." --- .../jet/generators/tests/GenerateTests.kt | 1 + .../after.kt.template | 3 + .../before.kt.template | 3 + .../description.html | 5 ++ idea/src/META-INF/plugin.xml | 5 ++ .../jetbrains/jet/plugin/JetBundle.properties | 2 + .../intentions/AddForLoopIndicesIntention.kt | 87 +++++++++++++++++++ .../inapplicableExistingIndices.kt | 7 ++ .../inapplicableUnorderedCollection.kt | 7 ++ .../listWithType.kt | 7 ++ .../listWithType.kt.after | 7 ++ .../simpleIntList.kt | 7 ++ .../simpleIntList.kt.after | 7 ++ .../simpleSortedMap.kt | 6 ++ .../simpleSortedMap.kt.after | 6 ++ .../AbstractCodeTransformationTest.java | 4 + .../CodeTransformationTestGenerated.java | 36 +++++++- 17 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 idea/resources/intentionDescriptions/AddForLoopIndicesIntention/after.kt.template create mode 100644 idea/resources/intentionDescriptions/AddForLoopIndicesIntention/before.kt.template create mode 100644 idea/resources/intentionDescriptions/AddForLoopIndicesIntention/description.html create mode 100644 idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index b7cda2aeb85..e017cb32dca 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -414,6 +414,7 @@ fun main(args: Array) { model("intentions/makeTypeImplicitInLambda", testMethod = "doTestMakeTypeImplicitInLambda") model("intentions/convertToForEachLoop", testMethod = "doTestConvertToForEachLoop") model("intentions/convertToForEachFunctionCall", testMethod = "doTestConvertToForEachFunctionCall") + model("intentions/addForLoopIndicesIntention", testMethod = "doTestAddForLoopIndicesIntention") } testClass(javaClass()) { diff --git a/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/after.kt.template b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/after.kt.template new file mode 100644 index 00000000000..6c743b16877 --- /dev/null +++ b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/after.kt.template @@ -0,0 +1,3 @@ +for ((i, x) in foo.withIndices()) { + +} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/before.kt.template b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/before.kt.template new file mode 100644 index 00000000000..8b1fae6e977 --- /dev/null +++ b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/before.kt.template @@ -0,0 +1,3 @@ +for (x in foo) { + +} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/description.html b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/description.html new file mode 100644 index 00000000000..2017c1d8723 --- /dev/null +++ b/idea/resources/intentionDescriptions/AddForLoopIndicesIntention/description.html @@ -0,0 +1,5 @@ + + +This intention adds an index variable to a for loop iterating over a collection. + + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 4aec75214d2..5ec97031ea1 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -656,6 +656,11 @@ Kotlin + + org.jetbrains.jet.plugin.intentions.AddForLoopIndicesIntention + Kotlin + + org.jetbrains.jet.plugin.intentions.SwapBinaryExpression Kotlin diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index 49c3e205664..e1b8ecbd9aa 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -292,6 +292,8 @@ convert.negated.boolean.sequence=Replace negated sequence with DeMorgan equivale convert.negated.boolean.sequence.family=Replace negated sequence with DeMorgan equivalent convert.negated.expression.with.demorgans.law=Convert negated expression to DeMorgan's equivalent convert.negated.expression.with.demorgans.law.family=Convert negated expression to DeMorgan's equivalent +add.for.loop.indices=Add indices to for loop +add.for.loop.indices.family=Add indices to for loop split.if=Split into 2 if's split.if.family=Split If replace.with.operator.assign.intention=Replace with an Operator-Assign Expression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt new file mode 100644 index 00000000000..e35eac6c5d8 --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt @@ -0,0 +1,87 @@ +/* + * Copyright 2010-2014 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. + */ + +package org.jetbrains.jet.plugin.intentions + +import com.intellij.openapi.editor.Editor +import org.jetbrains.jet.lang.psi.JetForExpression +import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import com.intellij.psi.util.PsiTreeUtil +import com.intellij.psi.PsiDocumentManager +import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache +import org.jetbrains.jet.di.InjectorForMacros +import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.jet.lang.resolve.ObservableBindingTrace +import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo +import org.jetbrains.jet.lang.psi.JetParenthesizedExpression +import com.intellij.codeInsight.template.TemplateBuilderImpl +import com.intellij.codeInsight.template.impl.TemplateManagerImpl +import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.jet.lang.descriptors.ModuleDescriptor + + +public class AddForLoopIndicesIntention : JetSelfTargetingIntention( + "add.for.loop.indices", javaClass()) { + override fun applyTo(element: JetForExpression, editor: Editor) { + val loopRange = element.getLoopRange()!! + val newRangeText = "${loopRange.getText()}.withIndices()" + val newRange = JetPsiFactory.createExpression(editor.getProject(), newRangeText) + + //Roundabout way to create new multiparameter element so as not to incorrectly trigger syntax error highlighting + val loopParameter = element.getLoopParameter()!! + val parenthesizedParam = JetPsiFactory.createExpression(editor.getProject(), "(index)") as JetParenthesizedExpression + val indexElement = parenthesizedParam.getExpression()!! + val comma = JetPsiFactory.createComma(editor.getProject()) + val newParamElement = JetPsiFactory.createExpression(editor.getProject(), " ${loopParameter.getText()}") + parenthesizedParam.addAfter(newParamElement, indexElement) + parenthesizedParam.addAfter(comma, indexElement) + + loopParameter.replace(parenthesizedParam) + loopRange.replace(newRange) + + val multiParameter = PsiTreeUtil.findChildOfType(element, indexElement.javaClass)!! + + editor.getCaretModel().moveToOffset(multiParameter.getTextOffset()) + val templateBuilder = TemplateBuilderImpl(multiParameter) + templateBuilder.replaceElement(multiParameter, "index") + val manager = TemplateManagerImpl(editor.getProject()) + PsiDocumentManager.getInstance(editor.getProject()!!).doPostponedOperationsAndUnblockDocument(editor.getDocument()) + manager.startTemplate(editor, templateBuilder.buildInlineTemplate()!!) + } + + override fun isApplicableTo(element: JetForExpression): Boolean { + if (element.getLoopParameter() == null) return false + val range = element.getLoopRange() ?: return false + if (range is JetDotQualifiedExpression) { + val selector = (range as JetDotQualifiedExpression).getSelectorExpression() ?: return true + if (selector.getText().equals("withIndices()")) return false + } + + val potentialExpression = JetPsiFactory.createExpression(element.getProject(), "${range.getText()}.withIndices()") + val bindingContext = AnalyzerFacadeWithCache.getContextForElement(element) + val scope = bindingContext[BindingContext.RESOLUTION_SCOPE, element] ?: return false + val module = DescriptorUtils.getParentOfType(scope.getContainingDeclaration(), javaClass())!! + val components = InjectorForMacros(element.getProject(), module) + val dataFlowInfo = bindingContext[BindingContext.NON_DEFAULT_EXPRESSION_DATA_FLOW, element] ?: DataFlowInfo.EMPTY + val bindingTrace = ObservableBindingTrace(BindingTraceContext()) + val expressionType = components.getExpressionTypingServices()!!.getTypeInfo(scope, potentialExpression, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo, bindingTrace) + return expressionType.getType() != null + } + +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt new file mode 100644 index 00000000000..486762bc85c --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt @@ -0,0 +1,7 @@ +//IS_APPLICABLE: FALSE +//ERROR: Unresolved reference: withIndices +fun b(c: List) { + for ((indexVariable, d) in c.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt new file mode 100644 index 00000000000..7a8f65b05a4 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt @@ -0,0 +1,7 @@ +// IS_APPLICABLE: FALSE +// ERROR: For-loop range must have an iterator() method +fun foo(bar: Map) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt new file mode 100644 index 00000000000..87e8b8a6e66 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt @@ -0,0 +1,7 @@ +// ERROR: Unresolved reference: listOf +fun a() { + val b = listOf(1,2,3,4,5) + for (c : Int in b) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after new file mode 100644 index 00000000000..652142c4963 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after @@ -0,0 +1,7 @@ +// ERROR: Unresolved reference: listOf +fun a() { + val b = listOf(1,2,3,4,5) + for ((index, c : Int) in b.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt new file mode 100644 index 00000000000..b3a5c63ecf1 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt @@ -0,0 +1,7 @@ +// ERROR: Unresolved reference: listOf +fun a() { + val b = listOf(1,2,3,4,5) + for (c in b) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after new file mode 100644 index 00000000000..51d6a853ab6 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after @@ -0,0 +1,7 @@ +// ERROR: Unresolved reference: listOf +fun a() { + val b = listOf(1,2,3,4,5) + for ((index, c) in b.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt new file mode 100644 index 00000000000..dea2fc57b32 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: SortedMap +fun a(b: SortedMap) { + for (c in b) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after new file mode 100644 index 00000000000..dffa48df2f5 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: SortedMap +fun a(b: SortedMap) { + for ((index, c) in b.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java index 3c807bcdf24..1bc7e13a38b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java @@ -266,6 +266,10 @@ public abstract class AbstractCodeTransformationTest extends LightCodeInsightTes doTestIntention(path, new MakeTypeImplicitInLambdaIntention()); } + public void doTestAddForLoopIndicesIntention(@NotNull String path) throws Exception { + doTestIntention(path, new AddForLoopIndicesIntention()); + } + public void doTestConvertToForEachLoop(@NotNull String path) throws Exception { doTestIntention(path, new ConvertToForEachLoopIntention()); } diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java index f1fdf1a6ed1..cfac143f5e0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({CodeTransformationTestGenerated.DoubleBangToIfThen.class, CodeTransformationTestGenerated.IfThenToDoubleBang.class, CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class, CodeTransformationTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, CodeTransformationTestGenerated.ConvertNegatedBooleanSequence.class, CodeTransformationTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, CodeTransformationTestGenerated.SwapBinaryExpression.class, CodeTransformationTestGenerated.SplitIf.class, CodeTransformationTestGenerated.ReplaceWithOperatorAssign.class, CodeTransformationTestGenerated.ReplaceWithTraditionalAssignment.class, CodeTransformationTestGenerated.SimplifyBooleanWithConstants.class, CodeTransformationTestGenerated.InsertExplicitTypeArguments.class, CodeTransformationTestGenerated.RemoveExplicitTypeArguments.class, CodeTransformationTestGenerated.ConvertAssertToIf.class, CodeTransformationTestGenerated.ConvertIfToAssert.class, CodeTransformationTestGenerated.MakeTypeExplicitInLambda.class, CodeTransformationTestGenerated.MakeTypeImplicitInLambda.class, CodeTransformationTestGenerated.ConvertToForEachLoop.class, CodeTransformationTestGenerated.ConvertToForEachFunctionCall.class}) +@InnerTestClasses({CodeTransformationTestGenerated.DoubleBangToIfThen.class, CodeTransformationTestGenerated.IfThenToDoubleBang.class, CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class, CodeTransformationTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, CodeTransformationTestGenerated.ConvertNegatedBooleanSequence.class, CodeTransformationTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, CodeTransformationTestGenerated.SwapBinaryExpression.class, CodeTransformationTestGenerated.SplitIf.class, CodeTransformationTestGenerated.ReplaceWithOperatorAssign.class, CodeTransformationTestGenerated.ReplaceWithTraditionalAssignment.class, CodeTransformationTestGenerated.SimplifyBooleanWithConstants.class, CodeTransformationTestGenerated.InsertExplicitTypeArguments.class, CodeTransformationTestGenerated.RemoveExplicitTypeArguments.class, CodeTransformationTestGenerated.ConvertAssertToIf.class, CodeTransformationTestGenerated.ConvertIfToAssert.class, CodeTransformationTestGenerated.MakeTypeExplicitInLambda.class, CodeTransformationTestGenerated.MakeTypeImplicitInLambda.class, CodeTransformationTestGenerated.ConvertToForEachLoop.class, CodeTransformationTestGenerated.ConvertToForEachFunctionCall.class, CodeTransformationTestGenerated.AddForLoopIndicesIntention.class}) public class CodeTransformationTestGenerated extends AbstractCodeTransformationTest { @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen") public static class DoubleBangToIfThen extends AbstractCodeTransformationTest { @@ -4239,6 +4239,39 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT doTestConvertToForEachFunctionCall("idea/testData/intentions/convertToForEachFunctionCall/typeAnnotatedWithNonBlockBody.kt"); } + } + + @TestMetadata("idea/testData/intentions/addForLoopIndicesIntention") + public static class AddForLoopIndicesIntention extends AbstractCodeTransformationTest { + public void testAllFilesPresentInAddForLoopIndicesIntention() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/addForLoopIndicesIntention"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("inapplicableExistingIndices.kt") + public void testInapplicableExistingIndices() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt"); + } + + @TestMetadata("inapplicableUnorderedCollection.kt") + public void testInapplicableUnorderedCollection() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt"); + } + + @TestMetadata("listWithType.kt") + public void testListWithType() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt"); + } + + @TestMetadata("simpleIntList.kt") + public void testSimpleIntList() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt"); + } + + @TestMetadata("simpleSortedMap.kt") + public void testSimpleSortedMap() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt"); + } + } public static Test suite() { @@ -4301,6 +4334,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT suite.addTestSuite(MakeTypeImplicitInLambda.class); suite.addTestSuite(ConvertToForEachLoop.class); suite.addTestSuite(ConvertToForEachFunctionCall.class); + suite.addTestSuite(AddForLoopIndicesIntention.class); return suite; } } From 35c5a62b111a149d9f04b980baf807e54592a598 Mon Sep 17 00:00:00 2001 From: Ross Hanson Date: Mon, 21 Apr 2014 09:31:28 -0400 Subject: [PATCH 2/3] KT-4820: Intention to remove an unused index variable from a for loop. --- .../jet/generators/tests/GenerateTests.kt | 1 + .../after.kt.template | 3 + .../before.kt.template | 3 + .../description.html | 5 ++ idea/src/META-INF/plugin.xml | 5 ++ .../jetbrains/jet/plugin/JetBundle.properties | 2 + .../RemoveForLoopIndicesIntention.kt | 83 +++++++++++++++++++ .../inapplicableForLoop.kt | 6 ++ .../inapplicableIndexUse.kt | 7 ++ .../loopWithType.kt | 6 ++ .../loopWithType.kt.after | 6 ++ .../simpleLoopWithIndices.kt | 6 ++ .../simpleLoopWithIndices.kt.after | 6 ++ .../AbstractCodeTransformationTest.java | 4 + .../CodeTransformationTestGenerated.java | 33 +++++++- 15 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/after.kt.template create mode 100644 idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template create mode 100644 idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/description.html create mode 100644 idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index e017cb32dca..786f8c455bf 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -415,6 +415,7 @@ fun main(args: Array) { model("intentions/convertToForEachLoop", testMethod = "doTestConvertToForEachLoop") model("intentions/convertToForEachFunctionCall", testMethod = "doTestConvertToForEachFunctionCall") model("intentions/addForLoopIndicesIntention", testMethod = "doTestAddForLoopIndicesIntention") + model("intentions/removeForLoopIndicesIntention", testMethod = "doTestRemoveForLoopIndicesIntention") } testClass(javaClass()) { diff --git a/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/after.kt.template b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/after.kt.template new file mode 100644 index 00000000000..8b1fae6e977 --- /dev/null +++ b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/after.kt.template @@ -0,0 +1,3 @@ +for (x in foo) { + +} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template new file mode 100644 index 00000000000..362674c6894 --- /dev/null +++ b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template @@ -0,0 +1,3 @@ +for ((i,x) in foo.withIndices()) { + +} \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/description.html b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/description.html new file mode 100644 index 00000000000..dfdfe1e2a0c --- /dev/null +++ b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/description.html @@ -0,0 +1,5 @@ + + +This intention removes the index variable from a for loop iterating over a collection. + + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 5ec97031ea1..89c1a612d3e 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -661,6 +661,11 @@ Kotlin + + org.jetbrains.jet.plugin.intentions.RemoveForLoopIndicesIntention + Kotlin + S + org.jetbrains.jet.plugin.intentions.SwapBinaryExpression Kotlin diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties index e1b8ecbd9aa..46ccada2a0d 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties +++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties @@ -294,6 +294,8 @@ convert.negated.expression.with.demorgans.law=Convert negated expression to DeMo convert.negated.expression.with.demorgans.law.family=Convert negated expression to DeMorgan's equivalent add.for.loop.indices=Add indices to for loop add.for.loop.indices.family=Add indices to for loop +remove.for.loop.indices=Remove indices from for loop +remove.for.loop.indices.family=Remove indices from for loop split.if=Split into 2 if's split.if.family=Split If replace.with.operator.assign.intention=Replace with an Operator-Assign Expression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt new file mode 100644 index 00000000000..593902be45e --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt @@ -0,0 +1,83 @@ +/* + * Copyright 2010-2014 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. + */ + +package org.jetbrains.jet.plugin.intentions + +import org.jetbrains.jet.lang.psi.JetForExpression +import com.intellij.openapi.editor.Editor +import org.jetbrains.jet.lang.psi.JetPsiFactory +import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression +import org.jetbrains.jet.lang.psi.JetPsiUtil +import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState +import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil +import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache +import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.jet.lang.resolve.ObservableBindingTrace +import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider +import org.jetbrains.jet.lang.cfg.JetControlFlowProcessor +import com.intellij.debugger.jdi.LocalVariablesUtil +import com.siyeh.ig.psiutils.VariableAccessUtils +import com.google.dart.compiler.util.AstUtil +import com.intellij.find.FindManager +import com.intellij.find.impl.FindManagerImpl +import com.intellij.usageView.UsageInfo +import com.intellij.util.Processor +import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions + +public class RemoveForLoopIndicesIntention : JetSelfTargetingIntention( + "remove.for.loop.indices", javaClass()) { + override fun applyTo(element: JetForExpression, editor: Editor) { + val parameter = element.getMultiParameter()!! + val range = element.getLoopRange() as JetDotQualifiedExpression + val parameters = parameter.getEntries() + if (parameters.size() == 2) { + parameter.replace(parameters[1]) + } else { + JetPsiUtil.deleteElementWithDelimiters(parameters[0]) + } + + range.replace(range.getReceiverExpression()) + } + + override fun isApplicableTo(element: JetForExpression): Boolean { + if (element.getMultiParameter() == null) return false + val range = element.getLoopRange() as? JetDotQualifiedExpression ?: return false + val selector = range.getSelectorExpression() ?: return false + if (!selector.textMatches("withIndices()")) return false + + val indexVar = element.getMultiParameter()!!.getEntries()[0] + + val findManager = FindManager.getInstance(element.getProject()) as FindManagerImpl + val findHandler = findManager.getFindUsagesManager().getFindUsagesHandler(indexVar,false) ?: return false + val options = KotlinPropertyFindUsagesOptions(element.getProject()) + val usageCount = array(0) + val usageFinderRunnable = object : Runnable { + override fun run() { + val processor = object : Processor { + override fun process(t: UsageInfo?): Boolean { + usageCount[0] = usageCount[0] + 1 + return true + } + } + findHandler.processElementUsages(indexVar,processor,options) + } + } + usageFinderRunnable.run() + return usageCount[0] == 0 + } + +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt new file mode 100644 index 00000000000..6a70ccdd704 --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt @@ -0,0 +1,6 @@ +//IS_APPLICABLE: FALSE +fun foo(bar: List) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt new file mode 100644 index 00000000000..554c2be803d --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt @@ -0,0 +1,7 @@ +// IS_APPLICABLE: FALSE +//ERROR: Unresolved reference: withIndices +fun foo(b: List) { + for ((i, c) in b.withIndices()) { + return i + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt new file mode 100644 index 00000000000..ce29523424a --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: withIndices +fun foo(bar: List) { + for ((i : Int, b: Int) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after new file mode 100644 index 00000000000..401456e86c3 --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: withIndices +fun foo(bar: List) { + for (b: Int in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt new file mode 100644 index 00000000000..b66702744fd --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: withIndices +fun foo(bar: List) { + for ((i,a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after new file mode 100644 index 00000000000..08489a0e8a4 --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after @@ -0,0 +1,6 @@ +//ERROR: Unresolved reference: withIndices +fun foo(bar: List) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java index 1bc7e13a38b..1cd83727e07 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationTest.java @@ -278,6 +278,10 @@ public abstract class AbstractCodeTransformationTest extends LightCodeInsightTes doTestIntention(path, new ConvertToForEachFunctionCallIntention()); } + public void doTestRemoveForLoopIndicesIntention(@NotNull String path) throws Exception { + doTestIntention(path, new RemoveForLoopIndicesIntention()); + } + private void doTestIntention(@NotNull String path, @NotNull IntentionAction intentionAction) throws Exception { configureByFile(path); diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java index cfac143f5e0..a89feba5e2d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({CodeTransformationTestGenerated.DoubleBangToIfThen.class, CodeTransformationTestGenerated.IfThenToDoubleBang.class, CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class, CodeTransformationTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, CodeTransformationTestGenerated.ConvertNegatedBooleanSequence.class, CodeTransformationTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, CodeTransformationTestGenerated.SwapBinaryExpression.class, CodeTransformationTestGenerated.SplitIf.class, CodeTransformationTestGenerated.ReplaceWithOperatorAssign.class, CodeTransformationTestGenerated.ReplaceWithTraditionalAssignment.class, CodeTransformationTestGenerated.SimplifyBooleanWithConstants.class, CodeTransformationTestGenerated.InsertExplicitTypeArguments.class, CodeTransformationTestGenerated.RemoveExplicitTypeArguments.class, CodeTransformationTestGenerated.ConvertAssertToIf.class, CodeTransformationTestGenerated.ConvertIfToAssert.class, CodeTransformationTestGenerated.MakeTypeExplicitInLambda.class, CodeTransformationTestGenerated.MakeTypeImplicitInLambda.class, CodeTransformationTestGenerated.ConvertToForEachLoop.class, CodeTransformationTestGenerated.ConvertToForEachFunctionCall.class, CodeTransformationTestGenerated.AddForLoopIndicesIntention.class}) +@InnerTestClasses({CodeTransformationTestGenerated.DoubleBangToIfThen.class, CodeTransformationTestGenerated.IfThenToDoubleBang.class, CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class, CodeTransformationTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, CodeTransformationTestGenerated.ConvertNegatedBooleanSequence.class, CodeTransformationTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, CodeTransformationTestGenerated.SwapBinaryExpression.class, CodeTransformationTestGenerated.SplitIf.class, CodeTransformationTestGenerated.ReplaceWithOperatorAssign.class, CodeTransformationTestGenerated.ReplaceWithTraditionalAssignment.class, CodeTransformationTestGenerated.SimplifyBooleanWithConstants.class, CodeTransformationTestGenerated.InsertExplicitTypeArguments.class, CodeTransformationTestGenerated.RemoveExplicitTypeArguments.class, CodeTransformationTestGenerated.ConvertAssertToIf.class, CodeTransformationTestGenerated.ConvertIfToAssert.class, CodeTransformationTestGenerated.MakeTypeExplicitInLambda.class, CodeTransformationTestGenerated.MakeTypeImplicitInLambda.class, CodeTransformationTestGenerated.ConvertToForEachLoop.class, CodeTransformationTestGenerated.ConvertToForEachFunctionCall.class, CodeTransformationTestGenerated.AddForLoopIndicesIntention.class, CodeTransformationTestGenerated.RemoveForLoopIndicesIntention.class}) public class CodeTransformationTestGenerated extends AbstractCodeTransformationTest { @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen") public static class DoubleBangToIfThen extends AbstractCodeTransformationTest { @@ -4241,7 +4241,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT } - @TestMetadata("idea/testData/intentions/addForLoopIndicesIntention") + @TestMetadata("idea/testData/intentions/addForLoopIndicesIntention") public static class AddForLoopIndicesIntention extends AbstractCodeTransformationTest { public void testAllFilesPresentInAddForLoopIndicesIntention() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/addForLoopIndicesIntention"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4274,6 +4274,34 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT } + @TestMetadata("idea/testData/intentions/removeForLoopIndicesIntention") + public static class RemoveForLoopIndicesIntention extends AbstractCodeTransformationTest { + public void testAllFilesPresentInRemoveForLoopIndicesIntention() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/removeForLoopIndicesIntention"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("inapplicableForLoop.kt") + public void testInapplicableForLoop() throws Exception { + doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt"); + } + + @TestMetadata("inapplicableIndexUse.kt") + public void testInapplicableIndexUse() throws Exception { + doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt"); + } + + @TestMetadata("loopWithType.kt") + public void testLoopWithType() throws Exception { + doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt"); + } + + @TestMetadata("simpleLoopWithIndices.kt") + public void testSimpleLoopWithIndices() throws Exception { + doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt"); + } + + } + public static Test suite() { TestSuite suite = new TestSuite("CodeTransformationTestGenerated"); suite.addTestSuite(DoubleBangToIfThen.class); @@ -4335,6 +4363,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT suite.addTestSuite(ConvertToForEachLoop.class); suite.addTestSuite(ConvertToForEachFunctionCall.class); suite.addTestSuite(AddForLoopIndicesIntention.class); + suite.addTestSuite(RemoveForLoopIndicesIntention.class); return suite; } } From bbbdfd25d9a80167e787a70175ec787ce4e7b700 Mon Sep 17 00:00:00 2001 From: Ross Hanson Date: Fri, 9 May 2014 05:36:46 -0400 Subject: [PATCH 3/3] KT-4820: Added new tests, introduced functionality to detect overridden functions, other minor fixes --- .../before.kt.template | 2 +- .../intentions/AddForLoopIndicesIntention.kt | 28 +++++------ .../RemoveForLoopIndicesIntention.kt | 49 +++++++------------ .../inapplicableExistingIndices.kt | 2 +- .../inapplicableOverridenFunction.kt | 9 ++++ .../inapplicableSyntaxError.kt | 7 +++ .../inapplicableUnorderedCollection.kt | 2 +- .../addForLoopIndicesIntention/intArray.kt | 6 +++ .../intArray.kt.after | 6 +++ .../addForLoopIndicesIntention/iterable.kt | 6 +++ .../iterable.kt.after | 6 +++ .../listWithType.kt | 2 +- .../listWithType.kt.after | 2 +- .../addForLoopIndicesIntention/objectArray.kt | 6 +++ .../objectArray.kt.after | 6 +++ .../simpleIntList.kt | 2 +- .../simpleIntList.kt.after | 2 +- .../simpleSortedMap.kt | 6 --- .../simpleSortedMap.kt.after | 6 --- .../addForLoopIndicesIntention/stream.kt | 6 +++ .../stream.kt.after | 6 +++ .../addForLoopIndicesIntention/string.kt | 6 +++ .../string.kt.after | 6 +++ .../inapplicableIndexUse.kt | 6 ++- .../inapplicableOverridenFunction.kt | 11 +++++ .../loopWithType.kt | 2 +- .../loopWithType.kt.after | 2 +- .../simpleLoopWithIndices.kt | 2 +- .../simpleLoopWithIndices.kt.after | 2 +- .../CodeTransformationTestGenerated.java | 41 ++++++++++++++-- 30 files changed, 170 insertions(+), 75 deletions(-) create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/intArray.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/iterable.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after delete mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt delete mode 100644 idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/stream.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/string.kt create mode 100644 idea/testData/intentions/addForLoopIndicesIntention/string.kt.after create mode 100644 idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt diff --git a/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template index 362674c6894..6c743b16877 100644 --- a/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template +++ b/idea/resources/intentionDescriptions/RemoveForLoopIndicesIntention/before.kt.template @@ -1,3 +1,3 @@ -for ((i,x) in foo.withIndices()) { +for ((i, x) in foo.withIndices()) { } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt index e35eac6c5d8..1fc57a46af1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AddForLoopIndicesIntention.kt @@ -23,18 +23,13 @@ import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache -import org.jetbrains.jet.di.InjectorForMacros import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.resolve.ObservableBindingTrace -import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo import org.jetbrains.jet.lang.psi.JetParenthesizedExpression import com.intellij.codeInsight.template.TemplateBuilderImpl import com.intellij.codeInsight.template.impl.TemplateManagerImpl import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor - +import org.jetbrains.jet.analyzer.analyzeInContext +import org.jetbrains.jet.lang.psi.JetCallExpression public class AddForLoopIndicesIntention : JetSelfTargetingIntention( "add.for.loop.indices", javaClass()) { @@ -69,19 +64,20 @@ public class AddForLoopIndicesIntention : JetSelfTargetingIntention())!! - val components = InjectorForMacros(element.getProject(), module) - val dataFlowInfo = bindingContext[BindingContext.NON_DEFAULT_EXPRESSION_DATA_FLOW, element] ?: DataFlowInfo.EMPTY - val bindingTrace = ObservableBindingTrace(BindingTraceContext()) - val expressionType = components.getExpressionTypingServices()!!.getTypeInfo(scope, potentialExpression, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo, bindingTrace) - return expressionType.getType() != null + val functionSelector = potentialExpression.getSelectorExpression() as JetCallExpression + val updatedContext = potentialExpression.analyzeInContext(scope) + val callScope = updatedContext[BindingContext.RESOLVED_CALL, functionSelector.getCalleeExpression()!!] ?: return false + val callFqName = DescriptorUtils.getFqNameSafe(callScope.getCandidateDescriptor()) + return callFqName.toString() == "kotlin.withIndices" } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt index 593902be45e..2bbbee48faa 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/RemoveForLoopIndicesIntention.kt @@ -18,25 +18,16 @@ package org.jetbrains.jet.plugin.intentions import org.jetbrains.jet.lang.psi.JetForExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.psi.JetPsiFactory import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.cfg.PseudocodeVariablesData.VariableUseState -import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache -import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.resolve.ObservableBindingTrace -import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider -import org.jetbrains.jet.lang.cfg.JetControlFlowProcessor -import com.intellij.debugger.jdi.LocalVariablesUtil -import com.siyeh.ig.psiutils.VariableAccessUtils -import com.google.dart.compiler.util.AstUtil import com.intellij.find.FindManager import com.intellij.find.impl.FindManagerImpl import com.intellij.usageView.UsageInfo -import com.intellij.util.Processor import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions +import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.jet.lang.psi.JetCallExpression +import org.jetbrains.jet.lang.resolve.DescriptorUtils public class RemoveForLoopIndicesIntention : JetSelfTargetingIntention( "remove.for.loop.indices", javaClass()) { @@ -46,7 +37,8 @@ public class RemoveForLoopIndicesIntention : JetSelfTargetingIntention { - override fun process(t: UsageInfo?): Boolean { - usageCount[0] = usageCount[0] + 1 - return true - } - } - findHandler.processElementUsages(indexVar,processor,options) - } - } - usageFinderRunnable.run() - return usageCount[0] == 0 + var usageCount = 0 + val processorLambda: (UsageInfo?) -> Boolean = { t -> usageCount++; false } + findHandler.processElementUsages(indexVar, processorLambda, options) + return usageCount == 0 } } \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt index 486762bc85c..b9b2b899071 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt @@ -1,5 +1,5 @@ //IS_APPLICABLE: FALSE -//ERROR: Unresolved reference: withIndices +// WITH_RUNTIME fun b(c: List) { for ((indexVariable, d) in c.withIndices()) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt new file mode 100644 index 00000000000..c16ceeb8a97 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt @@ -0,0 +1,9 @@ +// WITH_RUNTIME +// IS_APPLICABLE: FALSE +fun String.withIndices(): Int = 42 + +fun foo(s: String) { + for (a in s) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt new file mode 100644 index 00000000000..130fb1e80ba --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt @@ -0,0 +1,7 @@ +//IS_APPLICABLE: FALSE +//ERROR: Unresolved reference: b +fun foo() { + for (a in b) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt index 7a8f65b05a4..42c9ecb7ee7 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt +++ b/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt @@ -1,5 +1,5 @@ // IS_APPLICABLE: FALSE -// ERROR: For-loop range must have an iterator() method +// WITH_RUNTIME fun foo(bar: Map) { for (a in bar) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt b/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt new file mode 100644 index 00000000000..40ab0ca1785 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: IntArray) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after new file mode 100644 index 00000000000..317eb113f87 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: IntArray) { + for ((index, a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt b/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt new file mode 100644 index 00000000000..aca19b4b400 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Iterable) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after new file mode 100644 index 00000000000..4351c3856a9 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Iterable) { + for ((index, a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt index 87e8b8a6e66..0cadfa4e63b 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt +++ b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt @@ -1,4 +1,4 @@ -// ERROR: Unresolved reference: listOf +// WITH_RUNTIME fun a() { val b = listOf(1,2,3,4,5) for (c : Int in b) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after index 652142c4963..633543f3ffe 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after +++ b/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after @@ -1,4 +1,4 @@ -// ERROR: Unresolved reference: listOf +// WITH_RUNTIME fun a() { val b = listOf(1,2,3,4,5) for ((index, c : Int) in b.withIndices()) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt b/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt new file mode 100644 index 00000000000..32c665ac8a3 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Array) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after new file mode 100644 index 00000000000..07f226b0945 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Array) { + for ((index, a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt index b3a5c63ecf1..f7472f3e066 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt @@ -1,4 +1,4 @@ -// ERROR: Unresolved reference: listOf +// WITH_RUNTIME fun a() { val b = listOf(1,2,3,4,5) for (c in b) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after index 51d6a853ab6..68e44be3929 100644 --- a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after +++ b/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after @@ -1,4 +1,4 @@ -// ERROR: Unresolved reference: listOf +// WITH_RUNTIME fun a() { val b = listOf(1,2,3,4,5) for ((index, c) in b.withIndices()) { diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt deleted file mode 100644 index dea2fc57b32..00000000000 --- a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt +++ /dev/null @@ -1,6 +0,0 @@ -//ERROR: Unresolved reference: SortedMap -fun a(b: SortedMap) { - for (c in b) { - - } -} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after deleted file mode 100644 index dffa48df2f5..00000000000 --- a/idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -//ERROR: Unresolved reference: SortedMap -fun a(b: SortedMap) { - for ((index, c) in b.withIndices()) { - - } -} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/stream.kt b/idea/testData/intentions/addForLoopIndicesIntention/stream.kt new file mode 100644 index 00000000000..94eb1690af9 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/stream.kt @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Stream) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after new file mode 100644 index 00000000000..15ba5726654 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: Stream) { + for ((index, a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/string.kt b/idea/testData/intentions/addForLoopIndicesIntention/string.kt new file mode 100644 index 00000000000..d838de6f97e --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/string.kt @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: String) { + for (a in bar) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndicesIntention/string.kt.after b/idea/testData/intentions/addForLoopIndicesIntention/string.kt.after new file mode 100644 index 00000000000..1d015a4fd97 --- /dev/null +++ b/idea/testData/intentions/addForLoopIndicesIntention/string.kt.after @@ -0,0 +1,6 @@ +//WITH_RUNTIME +fun foo(bar: String) { + for ((index, a) in bar.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt index 554c2be803d..9f043ae07e4 100644 --- a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt +++ b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt @@ -1,7 +1,9 @@ // IS_APPLICABLE: FALSE -//ERROR: Unresolved reference: withIndices -fun foo(b: List) { +//WITH_RUNTIME + +fun foo(b: List) : Int { for ((i, c) in b.withIndices()) { return i } + return 0 } \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt new file mode 100644 index 00000000000..7f3a7fd589d --- /dev/null +++ b/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt @@ -0,0 +1,11 @@ +// WITH_RUNTIME +// IS_APPLICABLE: FALSE +import java.util.LinkedList + +fun Int.withIndices(): List> = LinkedList>() + +fun foo(s: Int) { + for ((index, a) in s.withIndices()) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt index ce29523424a..116f672c62a 100644 --- a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt +++ b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt @@ -1,4 +1,4 @@ -//ERROR: Unresolved reference: withIndices +//WITH_RUNTIME fun foo(bar: List) { for ((i : Int, b: Int) in bar.withIndices()) { diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after index 401456e86c3..59f246f69bd 100644 --- a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after +++ b/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after @@ -1,4 +1,4 @@ -//ERROR: Unresolved reference: withIndices +//WITH_RUNTIME fun foo(bar: List) { for (b: Int in bar) { diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt index b66702744fd..f734f259947 100644 --- a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt +++ b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt @@ -1,4 +1,4 @@ -//ERROR: Unresolved reference: withIndices +//WITH_RUNTIME fun foo(bar: List) { for ((i,a) in bar.withIndices()) { diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after index 08489a0e8a4..1a04724adc8 100644 --- a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after +++ b/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after @@ -1,4 +1,4 @@ -//ERROR: Unresolved reference: withIndices +//WITH_RUNTIME fun foo(bar: List) { for (a in bar) { diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java index a89feba5e2d..07b8675f937 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java @@ -4252,24 +4252,54 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt"); } + @TestMetadata("inapplicableOverridenFunction.kt") + public void testInapplicableOverridenFunction() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt"); + } + + @TestMetadata("inapplicableSyntaxError.kt") + public void testInapplicableSyntaxError() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt"); + } + @TestMetadata("inapplicableUnorderedCollection.kt") public void testInapplicableUnorderedCollection() throws Exception { doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt"); } + @TestMetadata("intArray.kt") + public void testIntArray() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/intArray.kt"); + } + + @TestMetadata("iterable.kt") + public void testIterable() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/iterable.kt"); + } + @TestMetadata("listWithType.kt") public void testListWithType() throws Exception { doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt"); } + @TestMetadata("objectArray.kt") + public void testObjectArray() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt"); + } + @TestMetadata("simpleIntList.kt") public void testSimpleIntList() throws Exception { doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt"); } - @TestMetadata("simpleSortedMap.kt") - public void testSimpleSortedMap() throws Exception { - doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/simpleSortedMap.kt"); + @TestMetadata("stream.kt") + public void testStream() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/stream.kt"); + } + + @TestMetadata("string.kt") + public void testString() throws Exception { + doTestAddForLoopIndicesIntention("idea/testData/intentions/addForLoopIndicesIntention/string.kt"); } } @@ -4290,6 +4320,11 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt"); } + @TestMetadata("inapplicableOverridenFunction.kt") + public void testInapplicableOverridenFunction() throws Exception { + doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt"); + } + @TestMetadata("loopWithType.kt") public void testLoopWithType() throws Exception { doTestRemoveForLoopIndicesIntention("idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt");