Skip to content

Avoid NPE when getting localized name #46

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

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Avoid NPE when getting localized name #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/main/java/lsifjava/DocumentIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import spoon.reflect.declaration.*;
import spoon.reflect.reference.CtCatchVariableReference;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtPackageReference;
import spoon.reflect.reference.CtTypeReference;
import spoon.reflect.visitor.CtScanner;

Expand Down Expand Up @@ -511,13 +512,15 @@ private void appendTypeParam(StringBuilder b, CtTypeReference<?> next) {
}

private String getLocalizedName(CtTypeReference<?> type) {
if(type.getPackage().getQualifiedName().equals("java.lang")) {
return type.getSimpleName();
} else if(type.getPackage().getQualifiedName().startsWith(this.packageName)) {
return type.getSimpleName();
} else {
return type.getQualifiedName();
final CtPackageReference packageRef = type.getPackage();
if (packageRef != null) {
final String qualifiedName = packageRef.getQualifiedName();
if (qualifiedName.equals("java.lang") || qualifiedName.startsWith(this.packageName)) {
return type.getSimpleName();
}
}

return type.getQualifiedName();
}

private String humanRange(Range r) {
Expand Down