From b67542533b50acaf1976acf561e4877aec43f8f2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 16 Mar 2017 18:01:16 +0300 Subject: [PATCH] Drop unused FunctionDescriptor.Configuration.setSource --- .../descriptors/FunctionDescriptor.java | 3 --- .../impl/FunctionDescriptorImpl.java | 19 +++---------------- .../ErrorSimpleFunctionDescriptorImpl.java | 6 ------ 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java index 57d7da55171..393f80ad231 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java @@ -138,9 +138,6 @@ public interface FunctionDescriptor extends CallableMemberDescriptor { @NotNull CopyBuilder setPreserveSourceElement(); - @NotNull - CopyBuilder setSource(@NotNull SourceElement source); - @NotNull CopyBuilder setDropOriginalInContainingParts(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java index b62baf3d802..593f6c0b7f3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java @@ -369,7 +369,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo private List newTypeParameters = null; private Annotations additionalAnnotations = null; private boolean isHiddenForResolutionEverywhereBesideSupercalls = isHiddenForResolutionEverywhereBesideSupercalls(); - private SourceElement sourceElement; private Map, Object> userDataMap = new LinkedHashMap, Object>(); private Boolean newHasSynthesizedParameterNames = null; @@ -493,13 +492,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo return this; } - @NotNull - @Override - public CopyBuilder setSource(@NotNull SourceElement source) { - this.sourceElement = source; - return this; - } - @Override @NotNull public CopyConfiguration setDropOriginalInContainingParts() { @@ -587,7 +579,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo FunctionDescriptorImpl substitutedDescriptor = createSubstitutedCopy( configuration.newOwner, configuration.original, configuration.kind, configuration.name, resultAnnotations, - getSourceToUseForCopy(configuration.preserveSourceElement, configuration.original, configuration.sourceElement)); + getSourceToUseForCopy(configuration.preserveSourceElement, configuration.original)); List unsubstitutedTypeParameters = configuration.newTypeParameters == null ? getTypeParameters() : configuration.newTypeParameters; @@ -745,14 +737,9 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo ); @NotNull - private SourceElement getSourceToUseForCopy( - boolean preserveSource, - @Nullable FunctionDescriptor original, - @Nullable SourceElement sourceElement - ) { - if (sourceElement != null) return sourceElement; + private SourceElement getSourceToUseForCopy(boolean preserveSource, @Nullable FunctionDescriptor original) { return preserveSource - ? (original != null ? original.getSource() : getOriginal().getSource()) + ? (original != null ? original : getOriginal()).getSource() : SourceElement.NO_SOURCE; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java index e2fedeee101..7989ccf028e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java @@ -162,12 +162,6 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI return this; } - @NotNull - @Override - public CopyBuilder setSource(@NotNull SourceElement source) { - return this; - } - @NotNull @Override public CopyBuilder setDropOriginalInContainingParts() {