KT-12077 Code completion inserts FQN for annotations with use-site target inside primary constructor

KT-13009 Kotlin: annotation auto-import is broken in multiple ways

  #KT-12077 Fixed
  #KT-13009 Fixed
This commit is contained in:
Valentin Kipyatkov
2016-10-10 19:32:33 +03:00
parent 0c14058d13
commit 73dc5fefcb
16 changed files with 159 additions and 17 deletions
@@ -832,14 +832,14 @@ public class BodyResolver {
assert functionDescriptor.getReturnType() != null;
}
public void resolveConstructorParameterDefaultValuesAndAnnotations(
public void resolveConstructorParameterDefaultValues(
@NotNull DataFlowInfo outerDataFlowInfo,
@NotNull BindingTrace trace,
@NotNull KtClass klass,
@NotNull KtPrimaryConstructor constructor,
@NotNull ConstructorDescriptor constructorDescriptor,
@NotNull LexicalScope declaringScope
) {
List<KtParameter> valueParameters = klass.getPrimaryConstructorParameters();
List<KtParameter> valueParameters = constructor.getValueParameters();
List<ValueParameterDescriptor> valueParameterDescriptors = constructorDescriptor.getValueParameters();
LexicalScope scope = getPrimaryConstructorParametersScope(declaringScope, constructorDescriptor);