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

Get rid of isConstructorOfStaticNestedClass()

Browse Source 
This value can always be computed in ConstructorDescriptorImpl#initialize
This commit is contained in:
Alexander Udalov
2014-07-27 22:35:12 +02:00
parent 415fe7a5e6
commit 4ff6a627d0
11 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+4 -5
View File
@@ -56,7 +56,7 @@ public class LazyJavaClassMemberScope(
internal val _constructors = c.storageManager.createLazyValue {
jClass.getConstructors().flatMap {
jCtor ->
val constructor = resolveConstructor(jCtor, getContainingDeclaration(), jClass.isStatic())
val constructor = resolveConstructor(jCtor, getContainingDeclaration())
val samAdapter = resolveSamAdapter(constructor)
if (samAdapter != null) {
samAdapter.setReturnType(containingDeclaration.getDefaultType())
@@ -113,7 +113,7 @@ public class LazyJavaClassMemberScope(
else null
}
private fun resolveConstructor(constructor: JavaMethod, classDescriptor: ClassDescriptor, isStaticClass: Boolean): JavaConstructorDescriptor {
private fun resolveConstructor(constructor: JavaMethod, classDescriptor: ClassDescriptor): JavaConstructorDescriptor {
val constructorDescriptor = JavaConstructorDescriptor.createJavaConstructor(
classDescriptor, Annotations.EMPTY, /* isPrimary = */ false, c.sourceElementFactory.source(constructor)
)
@@ -125,8 +125,7 @@ public class LazyJavaClassMemberScope(
constructorDescriptor.initialize(
classDescriptor.getTypeConstructor().getParameters(),
effectiveSignature.getValueParameters(),
constructor.getVisibility(),
isStaticClass
constructor.getVisibility()
)
constructorDescriptor.setHasStableParameterNames(effectiveSignature.hasStableParameterNames())
constructorDescriptor.setHasSynthesizedParameterNames(valueParameters.hasSynthesizedNames)
@@ -157,7 +156,7 @@ public class LazyJavaClassMemberScope(
else Collections.emptyList<ValueParameterDescriptor>()
constructorDescriptor.setHasSynthesizedParameterNames(false)
constructorDescriptor.initialize(typeParameters, valueParameters, getConstructorVisibility(classDescriptor), jClass.isStatic())
constructorDescriptor.initialize(typeParameters, valueParameters, getConstructorVisibility(classDescriptor))
constructorDescriptor.setHasStableParameterNames(true)
constructorDescriptor.setReturnType(classDescriptor.getDefaultType())
c.javaResolverCache.recordConstructor(jClass, constructorDescriptor);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+1 -6
View File
@@ -210,12 +210,7 @@ public class SingleAbstractMethodUtils {
@NotNull List<ValueParameterDescriptor> valueParameters,
@Nullable JetType returnType
) {
result.initialize(
typeParameters,
valueParameters,
original.getVisibility(),
original.getExpectedThisObject() == ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER
);
result.initialize(typeParameters, valueParameters, original.getVisibility());
}
});
}