Skip to content

Added an additional catch for RecordDeclaration #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MercerK wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added an additional catch for RecordDeclaration #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
476a58e
adds catcher for the RecordDeclaration
MercerK Jul 28, 2022
f50d860
bumps java parser to 3.24.2
MercerK Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ compileJava {
}

dependencies {
implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.22.1'
implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.24.2'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.beust:jcommander:1.81'
implementation 'org.jsoup:jsoup:1.13.1'
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/io/github/bensku/tsbind/AstGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ public Optional<TypeDefinition> parseType(SourceUnit source) {
} catch (UnsolvedSymbolException e) {
System.err.println("failed to resolve symbol " + e.getName() + " in " + source.name + "; omitting entire type!");
return Optional.empty();
} catch (Exception e) {
// RecordDeclaration doesn't get caught by the above.
// StructuresLocateEvent in Paper 1.18 is triggering this.
System.err.println("failed to resolve in " + source.name + "; omitting entire type!");
return Optional.empty();
}
} else {
return Optional.empty();
Expand Down Expand Up @@ -302,7 +307,7 @@ private static class PublicFilterResult {
private PublicFilterResult filterPublicTypes(List<ClassOrInterfaceType> types) {
PublicFilterResult result = new PublicFilterResult();
for (ClassOrInterfaceType type : types) {
ResolvedReferenceType resolved = type.resolve();
ResolvedReferenceType resolved = type.resolve().asReferenceType();
if (isPublic(resolved.getTypeDeclaration().orElse(null))) {
result.publicTypes.add(resolved);
} else {
Expand Down