Skip to content

Commit b74d87c

Browse files
committed
Filter blacklisted supertypes and interfaces
1 parent 1bd6513 commit b74d87c

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
}
99

1010
compileJava {
11-
options.release = 11
11+
options.release = 16
1212
}
1313

1414
dependencies {

src/main/java/io/github/bensku/tsbind/AstGenerator.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class AstGenerator {
5656
private final JavaParser parser;
5757

5858
/**
59-
* Blacklisted type name fragments. Types that contain any of these are not
59+
* Blacklisted type name fragments. Types that match any of these are never
6060
* emitted. All {@link Member members} that contain them are also ignored.
6161
*/
6262
private final List<String> blacklist;
@@ -190,9 +190,13 @@ private Optional<TypeDefinition> processType(String typeName, TypeDeclaration<?>
190190
PublicFilterResult extendedResult = filterPublicTypes(decl.getExtendedTypes());
191191
PublicFilterResult implementedResult = filterPublicTypes(decl.getImplementedTypes());
192192
superTypes = extendedResult.publicTypes.stream()
193-
.map(TypeRef::fromType).collect(Collectors.toList());;
193+
.map(TypeRef::fromType)
194+
.filter(t -> !isBlacklisted(t))
195+
.toList();
194196
interfaces = implementedResult.publicTypes.stream()
195-
.map(TypeRef::fromType).collect(Collectors.toList());
197+
.map(TypeRef::fromType)
198+
.filter(t -> !isBlacklisted(t))
199+
.toList();
196200

197201
extendedResult.privateTypes.forEach(t -> privateOverrides.addAll(getAllMethods(t)));
198202
implementedResult.privateTypes.forEach(t -> privateOverrides.addAll(getAllMethods(t)));

0 commit comments

Comments
 (0)