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

Light Classes: Primary constructor fixes

Browse Source
This commit is contained in:
Alexey Sedunov
2015-06-08 18:50:11 +03:00
parent 608ce59f15
commit 1ea2c24562
16 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+3 -1
View File
@@ -1046,7 +1046,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor);
functionCodegen.generateMethod(OtherOrigin(myClass, constructorDescriptor), constructorDescriptor, constructorContext,
JetPrimaryConstructor primaryConstructor = myClass.getPrimaryConstructor();
JvmDeclarationOrigin origin = OtherOrigin(primaryConstructor != null ? primaryConstructor : myClass, constructorDescriptor);
functionCodegen.generateMethod(origin, constructorDescriptor, constructorContext,
new FunctionGenerationStrategy.CodegenBased<ConstructorDescriptor>(state, constructorDescriptor) {
@Override
public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
+3 -3
View File
@@ -100,15 +100,15 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
//noinspection unchecked
PsiElement declaration = JetPsiUtil.getTopmostParentOfTypes(
classOrObject,
JetNamedFunction.class, JetProperty.class, JetClassInitializer.class, JetParameter.class
JetNamedFunction.class, JetConstructor.class, JetProperty.class, JetClassInitializer.class, JetParameter.class
);
if (declaration instanceof JetParameter) {
declaration = PsiTreeUtil.getParentOfType(declaration, JetNamedDeclaration.class);
}
if (declaration instanceof JetNamedFunction) {
JetNamedFunction function = (JetNamedFunction) declaration;
if (declaration instanceof JetFunction) {
JetFunction function = (JetFunction) declaration;
return getParentByPsiMethod(LightClassUtil.getLightClassMethod(function), function.getName(), false);
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+2 -7
View File
@@ -78,13 +78,8 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
int jetIndex = PsiUtilPackage.isExtensionDeclaration(declaration) ? index - 1 : index;
if (jetIndex < 0) return null;
if (declaration instanceof JetNamedFunction) {
List<JetParameter> paramList = ((JetNamedFunction) declaration).getValueParameters();
return jetIndex < paramList.size() ? paramList.get(jetIndex) : null;
}
if (declaration instanceof JetClass) {
List<JetParameter> paramList = ((JetClass) declaration).getPrimaryConstructorParameters();
if (declaration instanceof JetFunction) {
List<JetParameter> paramList = ((JetFunction) declaration).getValueParameters();
return jetIndex < paramList.size() ? paramList.get(jetIndex) : null;
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+4
View File
@@ -247,6 +247,10 @@ public class LightClassUtil {
declaration = (JetProperty) propertyParent;
}
if (declaration instanceof JetConstructor) {
return getPsiClass(((JetConstructor) declaration).getClassOrObject());
}
//noinspection unchecked
if (PsiTreeUtil.getParentOfType(declaration, JetFunction.class, JetProperty.class) != null) {
// Can't get wrappers for internal declarations. Their classes are not generated during calcStub
compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+7 -11
View File
@@ -67,22 +67,18 @@ public fun PsiElement.getRepresentativeLightMethod(): PsiMethod? =
}
public fun JetParameter.toPsiParameter(): PsiParameter? {
val paramList = getNonStrictParentOfType<JetParameterList>()
if (paramList == null) return null
val paramList = getNonStrictParentOfType<JetParameterList>() ?: return null
val paramIndex = paramList.getParameters().indexOf(this)
val owner = paramList.getParent()
val lightParamIndex = if (owner is JetDeclaration && owner.isExtensionDeclaration()) paramIndex + 1 else paramIndex
val method: PsiMethod? = when (owner) {
is JetFunction -> LightClassUtil.getLightClassMethod(owner)
is JetPropertyAccessor -> LightClassUtil.getLightClassAccessorMethod(owner)
is JetPrimaryConstructor -> LightClassUtil.getPsiClass(owner.getContainingClassOrObject())?.getConstructors()?.let { constructors ->
if (constructors.isNotEmpty()) constructors[0] else null
}
else -> null
}
if (method == null) return null
val method: PsiMethod =
when (owner) {
is JetFunction -> LightClassUtil.getLightClassMethod(owner)
is JetPropertyAccessor -> LightClassUtil.getLightClassAccessorMethod(owner)
else -> null
} ?: return null
return method.getParameterList().getParameters()[lightParamIndex]
}
compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt
Vendored
+4 -5
View File
@@ -2,21 +2,21 @@
package constructorVsFun
class <!CONFLICTING_OVERLOADS!>a()<!> { }
class a<!CONFLICTING_OVERLOADS!>()<!> { }
<!CONFLICTING_OVERLOADS!>fun a()<!> = 1
class Tram {
<!CONFLICTING_OVERLOADS!>fun f()<!> { }
class <!CONFLICTING_OVERLOADS!>f()<!> { }
class f<!CONFLICTING_OVERLOADS!>()<!> { }
}
class Yvayva {
companion object {
<!CONFLICTING_OVERLOADS!>fun fghj()<!> { }
class <!CONFLICTING_OVERLOADS!>fghj()<!> { }
class fghj<!CONFLICTING_OVERLOADS!>()<!> { }
}
}
@@ -26,5 +26,4 @@ class Rtyu {
companion object {
class ololo() { }
}
}
}
compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.kt
Vendored
+1 -2
View File
@@ -31,5 +31,4 @@ fun z(<!UNUSED_PARAMETER!>view<!>: () -> Unit) {}
<!CONFLICTING_OVERLOADS!>fun x()<!> = z { z { z { z { z { z { z { z { } } } } } } } }
<!CONFLICTING_OVERLOADS!>fun x()<!> = z { z { z { z { z { z { z { z { } } } } } } } }
class <!CONFLICTING_OVERLOADS!>x()<!> {}
class x<!CONFLICTING_OVERLOADS!>()<!> {}
compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class <!CONFLICTING_OVERLOADS!>A(x: String = "", y: String = "")<!> {
class A<!CONFLICTING_OVERLOADS!>(x: String = "", y: String = "")<!> {
<!CONFLICTING_OVERLOADS!>constructor(x: String, y: String)<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>(x, y)
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
@@ -13,7 +13,7 @@ class B {
<!CONFLICTING_OVERLOADS!>fun B(x: Int)<!> {}
class Outer {
class <!CONFLICTING_OVERLOADS!>A(x: String = "", y: String = "")<!> {
class A<!CONFLICTING_OVERLOADS!>(x: String = "", y: String = "")<!> {
<!CONFLICTING_OVERLOADS!>constructor(x: String, y: String)<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>(x, y)
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
<!CONFLICTING_OVERLOADS!>constructor()<!>: <!OVERLOAD_RESOLUTION_AMBIGUITY!>this<!>("", "")
@@ -24,4 +24,4 @@ class Outer {
}
<!CONFLICTING_OVERLOADS!>fun B(x: Int)<!> {}
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
+2 -5
View File
@@ -340,11 +340,8 @@ public class JetRefactoringUtil {
if (method instanceof KotlinLightMethod) {
JetDeclaration declaration = ((KotlinLightMethod) method).getOrigin();
if (declaration instanceof JetNamedFunction) {
result.add(((JetNamedFunction) declaration).getValueParameters().get(parameterIndex));
}
else if (declaration instanceof JetClass) {
result.add(((JetClass) declaration).getPrimaryConstructorParameters().get(parameterIndex));
if (declaration instanceof JetFunction) {
result.add(((JetFunction) declaration).getValueParameters().get(parameterIndex));
}
}
else {
idea/testData/hierarchy/class/sub/ClassFromClass/ClassFromClass_verification.xml
Vendored
+4 -2
View File
@@ -1,12 +1,14 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="X in MyClass ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="X in MyClass() in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="X in MyClass2() in MyClass2 ()"/>
<node text="Anonymous in MyClass2() in MyClass2 ()"/>
<node text="E in bar() in main.kt ()"/>
</node>
idea/testData/hierarchy/class/sub/ClassFromClass/main.kt
Vendored
+4
View File
@@ -18,6 +18,10 @@ class MyClass(a: A = run { class X: A(); object: A() {} }) {
}
}
class MyClass2 {
constructor(a: A = run { class X: A(); object: A() {} })
}
val bar: Int
get() {
class E: A()
idea/testData/hierarchy/class/sub/ClassFromTrait/ClassFromTrait_verification.xml
Vendored
+7 -7
View File
@@ -1,12 +1,12 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="X in MyClass ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="B ()"/>
<node text="C in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="X in MyClass() in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
</node>
idea/testData/hierarchy/class/sub/ObjectFromClass/ObjectFromClass_verification.xml
Vendored
+6 -6
View File
@@ -1,10 +1,10 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="F in t() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="Anonymous in x() in main.kt ()"/>
<node text="B ()"/>
<node text="C in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="F in t() in MyClass ()"/>
</node>
idea/testData/hierarchy/class/sub/ObjectFromTrait/ObjectFromTrait_verification.xml
Vendored
+6 -6
View File
@@ -1,10 +1,10 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="F in t() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="Anonymous in x() in main.kt ()"/>
<node text="B ()"/>
<node text="C in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="F in t() in MyClass ()"/>
</node>
idea/testData/hierarchy/class/sub/TraitFromClass/TraitFromClass_verification.xml
Vendored
+7 -7
View File
@@ -1,12 +1,12 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="X in MyClass ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="B ()"/>
<node text="C in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="X in MyClass() in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
</node>
idea/testData/hierarchy/class/sub/TraitFromTrait/TraitFromTrait_verification.xml
Vendored
+7 -7
View File
@@ -1,12 +1,12 @@
<node text="A ()" base="true">
<node text="B ()"/>
<node text="X in MyClass ()"/>
<node text="Anonymous in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="C in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
<node text="Anonymous in MyClass() in MyClass ()"/>
<node text="Anonymous in foo() in MyClass ()"/>
<node text="B ()"/>
<node text="C in MyClass ()"/>
<node text="D in foo() in MyClass ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="E in bar() in main.kt ()"/>
<node text="F in foo() in MyClass ()"/>
<node text="G in MyClass ()"/>
<node text="X in MyClass() in MyClass ()"/>
<node text="X in foo() in MyClass ()"/>
</node>