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

Refactor DescriptorRenderer's renderAccessors option

Browse Source 
In some tests with txt (probably all except loadJava), property
accessors are not rendered at all, so a third option value (NONE) will
be useful to determine whether we need to render annotations on property
accessors as get/set/sparam-targeted annotations on the property
This commit is contained in:
Alexander Udalov
2018-08-13 13:31:05 +02:00
parent 896cf61443
commit 4219aff548
6 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+28 -3
View File
@@ -43,6 +43,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry;
@@ -366,7 +367,7 @@ public class RecursiveDescriptorComparator {
this.checkFunctionContracts = checkFunctionContracts;
this.recursiveFilter = recursiveFilter;
this.validationStrategy = validationStrategy;
this.renderer = renderer;
this.renderer = rendererWithPropertyAccessors(renderer, checkPropertyAccessors);
}
public Configuration filterRecursion(@NotNull Predicate<DeclarationDescriptor> stepIntoFilter) {
@@ -381,8 +382,11 @@ public class RecursiveDescriptorComparator {
}
public Configuration checkPropertyAccessors(boolean checkPropertyAccessors) {
return new Configuration(checkPrimaryConstructors, checkPropertyAccessors, includeMethodsOfKotlinAny,
renderDeclarationsFromOtherModules, checkFunctionContracts, recursiveFilter, validationStrategy, renderer);
return new Configuration(
checkPrimaryConstructors, checkPropertyAccessors, includeMethodsOfKotlinAny, renderDeclarationsFromOtherModules,
checkFunctionContracts, recursiveFilter, validationStrategy,
rendererWithPropertyAccessors(renderer, checkPropertyAccessors)
);
}
public Configuration checkFunctionContracts(boolean checkFunctionContracts) {
@@ -409,5 +413,26 @@ public class RecursiveDescriptorComparator {
return new Configuration(checkPrimaryConstructors, checkPropertyAccessors, includeMethodsOfKotlinAny,
renderDeclarationsFromOtherModules, checkFunctionContracts, recursiveFilter, validationStrategy, renderer);
}
@NotNull
private static DescriptorRenderer rendererWithPropertyAccessors(
@NotNull DescriptorRenderer renderer, boolean checkPropertyAccessors
) {
return newRenderer(renderer, options ->
options.setPropertyAccessorRenderingPolicy(
checkPropertyAccessors ? PropertyAccessorRenderingPolicy.DEBUG : PropertyAccessorRenderingPolicy.NONE
)
);
}
@NotNull
private static DescriptorRenderer newRenderer(
@NotNull DescriptorRenderer renderer, @NotNull Consumer<DescriptorRendererOptions> configure
) {
return renderer.withOptions(options -> {
configure.accept(options);
return Unit.INSTANCE;
});
}
}
}