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

Deserialize constructors of static nested classes correctly

Browse Source 
Similar to what is done in TopDownAnalyzer
 #KT-4081 Fixed
This commit is contained in:
Alexander Udalov
2013-10-15 19:17:43 +04:00
parent d5bd8eebff
commit 6e45533065
6 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+2 -2
View File
@@ -25,11 +25,11 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.descriptors.impl.*;
import org.jetbrains.jet.lang.resolve.DescriptorFactory;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.storage.StorageManager;
import java.util.ArrayList;
import java.util.Collections;
@@ -267,7 +267,7 @@ public class DescriptorDeserializer {
classDescriptor.getTypeConstructor().getParameters(),
local.valueParameters(proto.getValueParameterList()),
visibility(Flags.VISIBILITY.get(proto.getFlags())),
!classDescriptor.isInner()
DescriptorUtils.isConstructorOfStaticNestedClass(descriptor)
);
descriptor.setReturnType(local.typeDeserializer.type(proto.getReturnType()));
return descriptor;