diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java index 2375d6bfa79..98741950adb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java @@ -92,7 +92,7 @@ public final class JavaConstructorResolver { ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl( containingClass, Collections.emptyList(), - false); + true); constructorDescriptor.initialize(typeParameters, Collections.emptyList(), containingClass .getVisibility(), isStatic); constructors.add(constructorDescriptor); @@ -103,7 +103,7 @@ public final class JavaConstructorResolver { ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl( containingClass, Collections.emptyList(), - false); + true); List valueParameters = Lists.newArrayList(); PsiMethod[] methods = psiClass.getMethods(); @@ -176,10 +176,12 @@ public final class JavaConstructorResolver { return trace.get(BindingContext.CONSTRUCTOR, psiConstructor); } + boolean primary = constructor.getJetConstructorAnnotation().isDefined(); + ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl( classDescriptor, Collections.emptyList(), // TODO - false); + primary); String context = "constructor of class " + psiClass.getQualifiedName(); JavaDescriptorResolver.ValueParameterDescriptors valueParameterDescriptors = valueParameterResolver.resolveParameterDescriptors(