jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-10 15:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import quick fix: support extension iterator function

Browse Source 
#KT-34303 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-10-28 12:45:42 +09:00
committed by Dmitry Gridin
parent 3abfe59d75
commit 68ea677cc4
6 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
View File

@@ -444,6 +444,16 @@ internal class InvokeImportFix(expression: KtExpression) : OrdinaryImportFixBase
}
}
internal class IteratorImportFix(expression: KtExpression) : OrdinaryImportFixBase<KtExpression>(expression, MyFactory) {
override val importNames = listOf(OperatorNameConventions.ITERATOR)
override fun getCallTypeAndReceiver() = element?.let { CallTypeAndReceiver.OPERATOR(it) }
companion object MyFactory : Factory() {
override fun createImportAction(diagnostic: Diagnostic) = (diagnostic.psiElement as? KtExpression)?.let(::IteratorImportFix)
}
}
internal open class ArrayAccessorImportFix(
element: KtArrayAccessExpression,
override val importNames: Collection<Name>,

2
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
View File

@@ -171,6 +171,8 @@ class QuickFixRegistrar : QuickFixContributor {
FUNCTION_EXPECTED.registerFactory(InvokeImportFix)
ITERATOR_MISSING.registerFactory(IteratorImportFix)
DELEGATE_SPECIAL_FUNCTION_MISSING.registerFactory(DelegateAccessorsImportFix)
COMPONENT_FUNCTION_MISSING.registerFactory(ComponentsImportFix, AddDataModifierFix)

12
idea/testData/quickfix/autoImports/iteratorOperator.after.kt vendored Normal file
View File

@@ -0,0 +1,12 @@
// "Import" "true"
// ERROR: For-loop range must have an 'iterator()' method
// WITH_RUNTIME
package bar
import foo.Foo
import foo.iterator
fun foo(start: Foo, end: Foo) {
for (date in start<caret>..end) {}
}

7
idea/testData/quickfix/autoImports/iteratorOperator.before.Dependency.kt vendored Normal file
View File

@@ -0,0 +1,7 @@
package foo
class Foo : Comparable<Foo> {
override fun compareTo(other: Foo): Int = TODO()
}
operator fun ClosedRange<Foo>.iterator(): Iterator<Foo> = TODO()

11
idea/testData/quickfix/autoImports/iteratorOperator.before.Main.kt vendored Normal file
View File

@@ -0,0 +1,11 @@
// "Import" "true"
// ERROR: For-loop range must have an 'iterator()' method
// WITH_RUNTIME
package bar
import foo.Foo
fun foo(start: Foo, end: Foo) {
for (date in start<caret>..end) {}
}

5
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java generated
View File

@@ -790,6 +790,11 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
runTest("idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test");
}
@TestMetadata("iteratorOperator.before.Main.kt")
public void testIteratorOperator() throws Exception {
runTest("idea/testData/quickfix/autoImports/iteratorOperator.before.Main.kt");
}
@TestMetadata("memberImportFunction.test")
public void testMemberImportFunction() throws Exception {
runTest("idea/testData/quickfix/autoImports/memberImportFunction.test");