Simplify logic

[mernst]

Merge after #7743

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: e89f7f7e-1da5-43af-8fdb-045ca78968bf

📥 Commits

Reviewing files that changed from the base of the PR and between ffa8329 and 3d91ebd.

📒 Files selected for processing (2)

• framework/src/main/java/org/checkerframework/common/basetype/BaseTypeValidator.java
• framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java

---

📝 Walkthrough

Walkthrough

This pull request refactors annotation validation logic in two Checker Framework validator classes. BaseTypeValidator now caches a local TypeHierarchy instance and uses it consistently for subtype checks when validating captured type variables against wildcard extends and super bounds, replacing repeated fetches from atypeFactory. BaseTypeVisitor restructures the constructor invocation annotation comparability logic by introducing a local retType variable and reorganizing subtype check branches to separate error and warning cases more explicitly, while preserving all diagnostic behavior.

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[mernst]

@smillst I resolved the merge conflict.