Drop unused FunctionDescriptor.Configuration.setSource
This commit is contained in:
@@ -138,9 +138,6 @@ public interface FunctionDescriptor extends CallableMemberDescriptor {
|
|||||||
@NotNull
|
@NotNull
|
||||||
CopyBuilder<D> setPreserveSourceElement();
|
CopyBuilder<D> setPreserveSourceElement();
|
||||||
|
|
||||||
@NotNull
|
|
||||||
CopyBuilder<D> setSource(@NotNull SourceElement source);
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
CopyBuilder<D> setDropOriginalInContainingParts();
|
CopyBuilder<D> setDropOriginalInContainingParts();
|
||||||
|
|
||||||
|
|||||||
+3
-16
@@ -369,7 +369,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
|
|||||||
private List<TypeParameterDescriptor> newTypeParameters = null;
|
private List<TypeParameterDescriptor> newTypeParameters = null;
|
||||||
private Annotations additionalAnnotations = null;
|
private Annotations additionalAnnotations = null;
|
||||||
private boolean isHiddenForResolutionEverywhereBesideSupercalls = isHiddenForResolutionEverywhereBesideSupercalls();
|
private boolean isHiddenForResolutionEverywhereBesideSupercalls = isHiddenForResolutionEverywhereBesideSupercalls();
|
||||||
private SourceElement sourceElement;
|
|
||||||
private Map<UserDataKey<?>, Object> userDataMap = new LinkedHashMap<UserDataKey<?>, Object>();
|
private Map<UserDataKey<?>, Object> userDataMap = new LinkedHashMap<UserDataKey<?>, Object>();
|
||||||
private Boolean newHasSynthesizedParameterNames = null;
|
private Boolean newHasSynthesizedParameterNames = null;
|
||||||
|
|
||||||
@@ -493,13 +492,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public CopyBuilder<FunctionDescriptor> setSource(@NotNull SourceElement source) {
|
|
||||||
this.sourceElement = source;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@NotNull
|
@NotNull
|
||||||
public CopyConfiguration setDropOriginalInContainingParts() {
|
public CopyConfiguration setDropOriginalInContainingParts() {
|
||||||
@@ -587,7 +579,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
|
|||||||
|
|
||||||
FunctionDescriptorImpl substitutedDescriptor = createSubstitutedCopy(
|
FunctionDescriptorImpl substitutedDescriptor = createSubstitutedCopy(
|
||||||
configuration.newOwner, configuration.original, configuration.kind, configuration.name, resultAnnotations,
|
configuration.newOwner, configuration.original, configuration.kind, configuration.name, resultAnnotations,
|
||||||
getSourceToUseForCopy(configuration.preserveSourceElement, configuration.original, configuration.sourceElement));
|
getSourceToUseForCopy(configuration.preserveSourceElement, configuration.original));
|
||||||
|
|
||||||
List<TypeParameterDescriptor> unsubstitutedTypeParameters =
|
List<TypeParameterDescriptor> unsubstitutedTypeParameters =
|
||||||
configuration.newTypeParameters == null ? getTypeParameters() : configuration.newTypeParameters;
|
configuration.newTypeParameters == null ? getTypeParameters() : configuration.newTypeParameters;
|
||||||
@@ -745,14 +737,9 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
|
|||||||
);
|
);
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private SourceElement getSourceToUseForCopy(
|
private SourceElement getSourceToUseForCopy(boolean preserveSource, @Nullable FunctionDescriptor original) {
|
||||||
boolean preserveSource,
|
|
||||||
@Nullable FunctionDescriptor original,
|
|
||||||
@Nullable SourceElement sourceElement
|
|
||||||
) {
|
|
||||||
if (sourceElement != null) return sourceElement;
|
|
||||||
return preserveSource
|
return preserveSource
|
||||||
? (original != null ? original.getSource() : getOriginal().getSource())
|
? (original != null ? original : getOriginal()).getSource()
|
||||||
: SourceElement.NO_SOURCE;
|
: SourceElement.NO_SOURCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-6
@@ -162,12 +162,6 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
|
||||||
public CopyBuilder<SimpleFunctionDescriptor> setSource(@NotNull SourceElement source) {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public CopyBuilder<SimpleFunctionDescriptor> setDropOriginalInContainingParts() {
|
public CopyBuilder<SimpleFunctionDescriptor> setDropOriginalInContainingParts() {
|
||||||
|
|||||||
Reference in New Issue
Block a user