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

KT-4820: Intention to introduce/remove indices from a for-loop (update to modern Kotlin)

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-07-02 13:16:34 +02:00
parent 7f3f834011
commit 21e25e8509
19 changed files with 184 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
-5
View File
@@ -803,11 +803,6 @@
<category>Kotlin</category>
</intentionAction>S
<intentionAction>
<className>org.jetbrains.jet.plugin.intentions.SwapBinaryExpression</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.SwapBinaryExpressionIntention</className>
<category>Kotlin</category>
idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt
+31 -30
View File
@@ -16,34 +16,33 @@
package org.jetbrains.kotlin.idea.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.lang.resolve.BindingContext
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import com.intellij.codeInsight.template.TemplateBuilderImpl
import com.intellij.codeInsight.template.TemplateManager
import com.intellij.codeInsight.template.impl.TemplateManagerImpl
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.analyzer.analyzeInContext
import org.jetbrains.jet.lang.psi.JetCallExpression
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.analyzer.analyzeInContext
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils
public class AddForLoopIndicesIntention : JetSelfTargetingIntention<JetForExpression>(
"add.for.loop.indices", javaClass()) {
javaClass(), "Add indices to 'for' loop") {
override fun applyTo(element: JetForExpression, editor: Editor) {
val loopRange = element.getLoopRange()!!
val newRangeText = "${loopRange.getText()}.withIndices()"
val newRange = JetPsiFactory.createExpression(editor.getProject(), newRangeText)
val newRangeText = "${loopRange.getText()}.withIndex()"
val project = editor.getProject()!!
val psiFactory = JetPsiFactory(project)
val newRange = psiFactory.createExpression(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 parenthesizedParam = psiFactory.createExpression("(index)") as JetParenthesizedExpression
val indexElement = parenthesizedParam.getExpression()!!
val comma = JetPsiFactory.createComma(editor.getProject())
val newParamElement = JetPsiFactory.createExpression(editor.getProject(), " ${loopParameter.getText()}")
val comma = psiFactory.createComma()
val newParamElement = psiFactory.createExpression(loopParameter.getText())
parenthesizedParam.addAfter(newParamElement, indexElement)
parenthesizedParam.addAfter(comma, indexElement)
@@ -55,29 +54,31 @@ public class AddForLoopIndicesIntention : JetSelfTargetingIntention<JetForExpres
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()!!)
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument())
TemplateManager.getInstance(project).startTemplate(editor, templateBuilder.buildInlineTemplate()!!)
}
override fun isApplicableTo(element: JetForExpression): Boolean {
override fun isApplicableTo(element: JetForExpression, caretOffset: Int): Boolean {
if (element.getLoopParameter() == null) return false
val body = element.getBody()
if (body != null && caretOffset >= body.getTextRange().getStartOffset()) return false
val range = element.getLoopRange() ?: return false
if (range is JetDotQualifiedExpression) {
val selector = range.getSelectorExpression() ?: return true
if (selector.getText() == "withIndices()") return false
if (selector.getText() == "withIndex()") return false
}
val potentialExpression = JetPsiFactory.createExpression(element.getProject(),
"${range.getText()}.withIndices()") as JetDotQualifiedExpression
val psiFactory = JetPsiFactory(element.getProject())
val potentialExpression = psiFactory.createExpression("${range.getText()}.withIndex()") as JetDotQualifiedExpression
val bindingContext = AnalyzerFacadeWithCache.getContextForElement(element)
val bindingContext = element.analyze()
val scope = bindingContext[BindingContext.RESOLUTION_SCOPE, element] ?: return false
val functionSelector = potentialExpression.getSelectorExpression() as JetCallExpression
val updatedContext = potentialExpression.analyzeInContext(scope)
val callScope = updatedContext[BindingContext.RESOLVED_CALL, functionSelector.getCalleeExpression()!!] ?: return false
val call = updatedContext[BindingContext.CALL, functionSelector.getCalleeExpression()] ?: return false
val callScope = updatedContext[BindingContext.RESOLVED_CALL, call] ?: return false
val callFqName = DescriptorUtils.getFqNameSafe(callScope.getCandidateDescriptor())
return callFqName.toString() == "kotlin.withIndices"
return callFqName.toString() == "kotlin.withIndex"
}
}
}
idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt
+23 -30
View File
@@ -16,55 +16,48 @@
package org.jetbrains.kotlin.idea.intentions
import org.jetbrains.jet.lang.psi.JetForExpression
import com.intellij.openapi.editor.Editor
import org.jetbrains.jet.lang.psi.JetDotQualifiedExpression
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import com.intellij.find.FindManager
import com.intellij.find.impl.FindManagerImpl
import com.intellij.openapi.editor.Editor
import com.intellij.psi.search.searches.ReferencesSearch
import com.intellij.usageView.UsageInfo
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
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils
public class RemoveForLoopIndicesIntention : JetSelfTargetingIntention<JetForExpression>(
"remove.for.loop.indices", javaClass()) {
javaClass(), "Remove indices in 'for' loop") {
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])
}
val loop = JetPsiFactory(element).createExpression("for (${parameters[1].getText()} in _) {}") as JetForExpression
parameter.replace(loop.getLoopParameter()!!)
range.replace(range.getReceiverExpression())
}
override fun isApplicableTo(element: JetForExpression): Boolean {
override fun isApplicableTo(element: JetForExpression, caretOffset: Int): Boolean {
val multiParameter = element.getMultiParameter() ?: return false
if (multiParameter.getEntries().size() != 2) return false
val range = element.getLoopRange() as? JetDotQualifiedExpression ?: return false
val selector = range.getSelectorExpression() as? JetCallExpression ?: return false
if (!selector.textMatches("withIndices()")) return false
if (!selector.textMatches("withIndex()")) return false
val bindingContext = AnalyzerFacadeWithCache.getContextForElement(element)
val callResolution = bindingContext[BindingContext.RESOLVED_CALL, selector.getCalleeExpression()!!] ?: return false
val body = element.getBody()
if (body != null && caretOffset >= body.getTextRange().getStartOffset()) return false
val bindingContext = element.analyze()
val call = bindingContext[BindingContext.CALL, selector.getCalleeExpression()] ?: return false
val callResolution = bindingContext[BindingContext.RESOLVED_CALL, call] ?: return false
val fqName = DescriptorUtils.getFqNameSafe(callResolution.getCandidateDescriptor())
if (fqName.toString() != "kotlin.withIndices") return false
if (fqName.toString() != "kotlin.withIndex") return false
val indexVar = multiParameter.getEntries()[0]
val findManager = FindManager.getInstance(element.getProject()) as FindManagerImpl
val findHandler = findManager.getFindUsagesManager().getFindUsagesHandler(indexVar, false) ?: return false
val options = KotlinPropertyFindUsagesOptions(element.getProject())
var usageCount = 0
val processorLambda: (UsageInfo?) -> Boolean = { t -> usageCount++; false }
findHandler.processElementUsages(indexVar, processorLambda, options)
return usageCount == 0
return ReferencesSearch.search(indexVar).findFirst() == null
}
}
}
idea/testData/intentions/addForLoopIndicesIntention/.intention
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.AddForLoopIndicesIntention
idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
//IS_APPLICABLE: FALSE
// WITH_RUNTIME
fun b(c: List<String>) {
for ((<caret>indexVariable, d) in c.withIndices()) {
for ((<caret>indexVariable, d) in c.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// IS_APPLICABLE: FALSE
fun String.withIndices(): Int = 42
fun String.withIndex(): Int = 42
fun foo(s: String) {
for (<caret>a in s) {
idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: IntArray) {
for ((index, a) in bar.withIndices()) {
for ((index, a) in bar.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: Iterable<Int>) {
for ((index, a) in bar.withIndices()) {
for ((index, a) in bar.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
fun a() {
val b = listOf(1,2,3,4,5)
for ((index, c : Int) in b.withIndices()) {
for ((index, c : Int) in b.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: Array<Object>) {
for ((index, a) in bar.withIndices()) {
for ((index, a) in bar.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
fun a() {
val b = listOf(1,2,3,4,5)
for ((index, c) in b.withIndices()) {
for ((index, c) in b.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: Stream<String>) {
for ((index, a) in bar.withIndices()) {
for ((index, a) in bar.withIndex()) {
}
}
idea/testData/intentions/addForLoopIndicesIntention/string.kt.after
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: String) {
for ((index, a) in bar.withIndices()) {
for ((index, a) in bar.withIndex()) {
}
}
idea/testData/intentions/removeForLoopIndicesIntention/.intention
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.RemoveForLoopIndicesIntention
idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
//WITH_RUNTIME
fun foo(b: List<Int>) : Int {
for ((i, <caret>c) in b.withIndices()) {
for ((i, <caret>c) in b.withIndex()) {
return i
}
return 0
idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt
Vendored
+2 -3
View File
@@ -1,11 +1,10 @@
// WITH_RUNTIME
// IS_APPLICABLE: FALSE
import java.util.LinkedList
fun Int.withIndices(): List<Pair<Int, Int>> = LinkedList<Pair<Int, Int>>()
fun Int.withIndex(): List<Pair<Int, Int>> = linkedListOf<Pair<Int, Int>>()
fun foo(s: Int) {
for ((index<caret>, a) in s.withIndices()) {
for ((index<caret>, a) in s.withIndex()) {
}
}
idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: List<Int>) {
for ((i : <caret>Int, b: Int) in bar.withIndices()) {
for ((i : <caret>Int, b: Int) in bar.withIndex()) {
}
}
idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
//WITH_RUNTIME
fun foo(bar: List<String>) {
for ((i,<caret>a) in bar.withIndices()) {
for ((i,<caret>a) in bar.withIndex()) {
}
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+114
View File
@@ -92,6 +92,81 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
}
@TestMetadata("idea/testData/intentions/addForLoopIndicesIntention")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class AddForLoopIndicesIntention extends AbstractIntentionTest {
public void testAllFilesPresentInAddForLoopIndicesIntention() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndicesIntention"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("inapplicableExistingIndices.kt")
public void testInapplicableExistingIndices() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt");
doTest(fileName);
}
@TestMetadata("inapplicableOverridenFunction.kt")
public void testInapplicableOverridenFunction() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt");
doTest(fileName);
}
@TestMetadata("inapplicableSyntaxError.kt")
public void testInapplicableSyntaxError() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt");
doTest(fileName);
}
@TestMetadata("inapplicableUnorderedCollection.kt")
public void testInapplicableUnorderedCollection() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt");
doTest(fileName);
}
@TestMetadata("intArray.kt")
public void testIntArray() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/intArray.kt");
doTest(fileName);
}
@TestMetadata("iterable.kt")
public void testIterable() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/iterable.kt");
doTest(fileName);
}
@TestMetadata("listWithType.kt")
public void testListWithType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt");
doTest(fileName);
}
@TestMetadata("objectArray.kt")
public void testObjectArray() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt");
doTest(fileName);
}
@TestMetadata("simpleIntList.kt")
public void testSimpleIntList() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt");
doTest(fileName);
}
@TestMetadata("stream.kt")
public void testStream() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/stream.kt");
doTest(fileName);
}
@TestMetadata("string.kt")
public void testString() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/string.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/addNameToArgument")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -6089,6 +6164,45 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
@TestMetadata("idea/testData/intentions/removeForLoopIndicesIntention")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class RemoveForLoopIndicesIntention extends AbstractIntentionTest {
public void testAllFilesPresentInRemoveForLoopIndicesIntention() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeForLoopIndicesIntention"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true);
}
@TestMetadata("inapplicableForLoop.kt")
public void testInapplicableForLoop() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt");
doTest(fileName);
}
@TestMetadata("inapplicableIndexUse.kt")
public void testInapplicableIndexUse() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt");
doTest(fileName);
}
@TestMetadata("inapplicableOverridenFunction.kt")
public void testInapplicableOverridenFunction() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt");
doTest(fileName);
}
@TestMetadata("loopWithType.kt")
public void testLoopWithType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt");
doTest(fileName);
}
@TestMetadata("simpleLoopWithIndices.kt")
public void testSimpleLoopWithIndices() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/removeUnnecessaryParentheses")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)