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

Drop unused FunctionDescriptor.Configuration.setSource

Browse Source
This commit is contained in:
Alexander Udalov
2017-03-16 18:01:16 +03:00
parent 288c2b5dc9
commit b67542533b
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java
-3
View File
@@ -138,9 +138,6 @@ public interface FunctionDescriptor extends CallableMemberDescriptor {
@NotNull
CopyBuilder<D> setPreserveSourceElement();
@NotNull
CopyBuilder<D> setSource(@NotNull SourceElement source);
@NotNull
CopyBuilder<D> setDropOriginalInContainingParts();
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+3 -16
View File
@@ -369,7 +369,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private List<TypeParameterDescriptor> newTypeParameters = null;
private Annotations additionalAnnotations = null;
private boolean isHiddenForResolutionEverywhereBesideSupercalls = isHiddenForResolutionEverywhereBesideSupercalls();
private SourceElement sourceElement;
private Map<UserDataKey<?>, Object> userDataMap = new LinkedHashMap<UserDataKey<?>, Object>();
private Boolean newHasSynthesizedParameterNames = null;
@@ -493,13 +492,6 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
return this;
}
@NotNull
@Override
public CopyBuilder<FunctionDescriptor> 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<TypeParameterDescriptor> 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;
}
core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java
-6
View File
@@ -162,12 +162,6 @@ public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorI
return this;
}
@NotNull
@Override
public CopyBuilder<SimpleFunctionDescriptor> setSource(@NotNull SourceElement source) {
return this;
}
@NotNull
@Override
public CopyBuilder<SimpleFunctionDescriptor> setDropOriginalInContainingParts() {