Skip to content
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

Get default type for new class tree #414

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

Get default type for new class tree #414

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df5d7e0
get default type for new class tree
AndrewShf Feb 28, 2023
09ffa38
fix assertion failure
AndrewShf Feb 28, 2023
f6279cf
workaround if it's an anonymous class
AndrewShf Mar 2, 2023
fb56232
get direct super types of the defaultType
AndrewShf Mar 3, 2023
493963a
fix the case when the anonymous class's directSuper type is an interface
AndrewShf Mar 3, 2023
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
18 changes: 18 additions & 0 deletions src/checkers/inference/util/SlotDefaultTypeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.sun.source.tree.AnnotatedTypeTree;
import com.sun.source.tree.ArrayTypeTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.ParameterizedTypeTree;
import com.sun.source.tree.PrimitiveTypeTree;
import com.sun.source.tree.Tree;
Expand Down Expand Up @@ -185,5 +187,21 @@ public Void visitAnnotatedType(AnnotatedTypeTree tree, Void unused) {

return super.visitAnnotatedType(tree, unused);
}

@Override
public Void visitNewClass(NewClassTree tree, Void unused) {
AnnotatedTypeMirror defaultType = getDefaultTypeFor(tree);
if (InferenceUtil.isAnonymousClass(tree)) {
// don't associate the identifier with the defaultType if it's an anonymousclass
// should associate the identifier with the direct super type of the defaultType.
// choose the last one of the directSupertypes, which is either the direct super class
// or implemented interface
List<? extends AnnotatedTypeMirror> superTypes = defaultType.directSupertypes();
defaultTypes.put(tree.getIdentifier(), superTypes.get(superTypes.size()-1));
} else {
defaultTypes.put(tree.getIdentifier(), defaultType);
}
return super.visitNewClass(tree, unused);
}
}
}