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

Change signature fix: correct parameter add / remove from enum constructor calls, relevant test fixes

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-08-06 15:46:37 +03:00
parent 8405a9a021
commit fe716d7e56
11 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+14 -5
View File
@@ -110,12 +110,12 @@ private fun JetElement.getConstructorCallDescriptor(): DeclarationDescriptor? {
return null
}
public fun PsiElement.processDelegationCallConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) {
public fun PsiElement.processDelegationCallConstructorUsages(scope: SearchScope, process: (JetCallElement) -> Unit) {
processDelegationCallKotlinConstructorUsages(scope, process)
processDelegationCallJavaConstructorUsages(scope, process)
}
private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) {
private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: SearchScope, process: (JetCallElement) -> Unit) {
val element = unwrapped
val klass = when (element) {
is JetConstructor<*> -> element.getContainingClassOrObject()
@@ -130,7 +130,7 @@ private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: Searc
processInheritorsDelegatingCallToSpecifiedConstructor(klass, scope, descriptor, process)
}
private fun PsiElement.processDelegationCallJavaConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) {
private fun PsiElement.processDelegationCallJavaConstructorUsages(scope: SearchScope, process: (JetCallElement) -> Unit) {
if (this is KotlinLightElement<*, *>) return
// TODO: Temporary hack to avoid NPE while KotlinNoOriginLightMethod is around
if (this is KotlinNoOriginLightMethod) return
@@ -145,7 +145,7 @@ private fun processInheritorsDelegatingCallToSpecifiedConstructor(
klass: PsiElement,
scope: SearchScope,
descriptor: ConstructorDescriptor,
process: (JetConstructorDelegationCall) -> Unit
process: (JetCallElement) -> Unit
) {
HierarchySearchRequest(klass, scope, false).searchInheritors().forEach() {
val unwrapped = it.unwrapped
@@ -156,7 +156,7 @@ private fun processInheritorsDelegatingCallToSpecifiedConstructor(
}
private fun processClassDelegationCallsToSpecifiedConstructor(
klass: JetClass, constructor: DeclarationDescriptor, process: (JetConstructorDelegationCall) -> Unit
klass: JetClass, constructor: DeclarationDescriptor, process: (JetCallElement) -> Unit
) {
for (secondaryConstructor in klass.getSecondaryConstructors()) {
val delegationCallDescriptor = secondaryConstructor.getDelegationCall().getConstructorCallDescriptor()
@@ -164,6 +164,15 @@ private fun processClassDelegationCallsToSpecifiedConstructor(
process(secondaryConstructor.getDelegationCall())
}
}
if (!klass.isEnum()) return
for (declaration in klass.declarations) {
if (declaration is JetEnumEntry) {
val delegationCall = declaration.getDelegationSpecifiers().firstOrNull()
if (delegationCall is JetDelegatorToSuperCall && constructor == delegationCall.calleeExpression.getConstructorCallDescriptor()) {
process(delegationCall)
}
}
}
}
// Check if reference resolves to extension function whose receiver is the same as declaration's parent (or its superclass)