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

Find Usages: Fix exception in the search of class with default parameters in primary constructor

Browse Source
This commit is contained in:
Alexey Sedunov
2015-03-27 16:23:22 +03:00
parent 0a93cfc9c0
commit 11675322ee
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
+2
View File
@@ -43,6 +43,7 @@ import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory
import com.intellij.psi.PsiMethod
import com.intellij.psi.search.searches.MethodReferencesSearch
import com.intellij.util.CommonProcessors
import org.jetbrains.kotlin.asJava.KotlinLightMethod
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages
@@ -93,6 +94,7 @@ public class KotlinFindClassUsagesHandler(
if (kotlinOptions.searchConstructorUsages) {
val constructors = classOrObject.toLightClass()?.getConstructors() ?: PsiMethod.EMPTY_ARRAY
for (constructor in constructors) {
if (constructor !is KotlinLightMethod) continue
constructor.processDelegationCallConstructorUsages(constructor.getUseScope()) {
it.getCalleeExpression()?.getReference()?.let { KotlinFindUsagesHandler.processUsage(uniqueProcessor, it) }
}
idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt
+8
View File
@@ -0,0 +1,8 @@
// PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass
// OPTIONS: usages, constructorUsages
class <caret>A(a: Int = 1)
fun test() {
A(0)
A()
}
idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
+2
View File
@@ -0,0 +1,2 @@
New instance creation (6: 5) A(0)
New instance creation (7: 5) A()
idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
+6
View File
@@ -527,6 +527,12 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt");
doTest(fileName);
}
@TestMetadata("primaryConstructorWithDefaultParams.0.kt")
public void testPrimaryConstructorWithDefaultParams() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages")