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

Jump to bottom

Ensure root is set in both worlds. #174

Merged
merged 11 commits into from
Apr 17, 2024
Merged

Ensure root is set in both worlds. #174

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9fef70b
Adapt to changes in https://github.com/eisop/checker-framework/pull/739
wmdietl Apr 14, 2024
d3198a3
Add regression test case; adapt to API changes
wmdietl Apr 14, 2024
9c70df2
Remove accesses and assertions that are no longer needed.
wmdietl Apr 14, 2024
4011143
Run the regression tests
wmdietl Apr 14, 2024
f1fbe5a
Ensure `root` is set in both worlds. Fixes #159.
wmdietl Apr 15, 2024
c8a671e
Include "kind" in output; remove debugging output
wmdietl Apr 15, 2024
74d1c5d
Merge branch 'test-fixes' of github.com:jspecify/jspecify-reference-c…
wmdietl Apr 15, 2024
55b243d
Move update into related block
wmdietl Apr 16, 2024
2eecb6e
Merge branch 'main-eisop' of github.com:jspecify/jspecify-reference-c…
wmdietl Apr 17, 2024
4fad7c3
Undo merge problem
wmdietl Apr 17, 2024
b0b2b64
Fix English
wmdietl Apr 17, 2024
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
22 changes: 22 additions & 0 deletions src/main/java/com/google/jspecify/nullness/NullSpecAnnotatedTypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

import com.sun.source.tree.BinaryTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.LambdaExpressionTree;
Expand Down Expand Up @@ -374,6 +375,27 @@ private NullSpecAnnotatedTypeFactory(
}
}

/** To ensure setRoot is called on both worlds exactly once. */
private boolean settingRoot = false;

/**
* Ensure setRoot is called on both worlds exactly once whenever it is called on one of the
* worlds.
*/
@Override
public void setRoot(@Nullable CompilationUnitTree root) {
if (!settingRoot) {
settingRoot = true;
super.setRoot(root);
if (withLeastConvenientWorld != this) {
withLeastConvenientWorld.setRoot(root);
} else {
withMostConvenientWorld.setRoot(root);
}
settingRoot = false;
}
}

@Override
protected void addCheckedCodeDefaults(QualifierDefaults defs) {
// TODO: add false for subpackages once overload is added to CF. Shouldn't really matter.
Expand Down
Loading