Skip to content

typetools/checker-framework 3.54.0 release - #2216

Merged
wmdietl merged 6 commits into
masterfrom
typetools-3.54.0-fixes
Oct 4, 2026
Merged

wmdietl merged 6 commits into
masterfrom
typetools-3.54.0-fixes

Conversation

@wmdietl

@wmdietl wmdietl commented Oct 3, 2026

Copy link
Copy Markdown
Member

Second step of the typetools 3.54.0 import (merge without squashing).

  • Code comments: converting typetools' two-space formatting to AOSP re-wrapped some comments in the middle of a paragraph and left one-word lines (was, buggy, postInit()), e.g. in NullnessNoInitVisitor, WholeProgramInferenceJavaParserStorage and AnnotatedTypeFactory. I scanned every comment paragraph touched by the import for such widows and reflowed them (4 paragraphs), and tidied a misaligned comment in CloneOrUpdateTask. Remaining over-long comment lines are URLs.
  • Still to decide (details in the first PR): (1) the parentheses to bracket test-expectation change and the test-harness rework, or making the harness accept both forms; (2) canonicalAnnotation() returning non-null versus our canonicalAnnotationOrWritten design; (3) the new prefer.map suggestion of the Optional Checker; (4) a jdk-21 counterpart of the JDK changes.

Companion branches with the same name for CI pairing: eisop/jdk typetools-3.54.0-fixes (same as eisop/jdk#163).

Copilot AI balanced review requested due to automatic review settings October 3, 2026 14:42

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

wmdietl and others added 6 commits October 4, 2026 01:27
Co-authored-by: Liam Miller-Cushon <cushon@google.com>
Co-authored-by: Michael Ernst <mernst@cs.washington.edu>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Suzanne Millstein <smillst@cs.washington.edu>
Converting typetools' two-space formatting to AOSP re-wrapped some comments
mid-paragraph and left a one-word line ("was", "buggy", "postInit()") in
NullnessNoInitVisitor, WholeProgramInferenceJavaParserStorage, and
AnnotatedTypeFactory.  Reflow those paragraphs, and tidy the misaligned comment
in CloneOrUpdateTask.update.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…entheses

Typetools 3.54.0 writes the expected error key of a test as [key] instead of
(key).  Parse both in TestDiagnostic: a key in parentheses, or a key that is the
whole text in square brackets, loses its delimiters, and the two forms are equal;
the delimiters that were written are kept for toString.  Other bracketed text,
such as javac's [unchecked] prefix, is not taken as a key.  Tests written either
way now work, which avoids converting 1,314 test files and the harness rework of
typetools 3.54.0 for now.

New unit tests and BracketErrorKeys.java, which fails without the change.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…AnnotationOrWritten

Typetools 3.54.0 changed canonicalAnnotation() to return its argument when it is
not an alias, which is what canonicalAnnotationOrWritten() did.  That method was
never released, so remove it and use canonicalAnnotation() at its call sites.
asSupportedQualifier() now checks that the canonical form is supported, as its
Javadoc says, and the one caller that tested the result for null (the binary stub
differential check) compares it with its argument.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…ecker accepts

The typecheck job runs the Interning Checker on the framework, which rejected the
== comparison of two AnnotationMirrors in BinaryStubDiffChecker.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The import added typetools' Claude Code settings. The file is not valid JSON (a
trailing comma), enables a Rust analyzer plugin, and allows ./x.py, the Rust
compiler's build script, none of which applies to this repository.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@wmdietl
wmdietl force-pushed the typetools-3.54.0-fixes branch from c27b846 to 928eb95 Compare October 4, 2026 05:30
@wmdietl
wmdietl merged commit aebffd3 into master Oct 4, 2026
48 checks passed
@wmdietl
wmdietl deleted the typetools-3.54.0-fixes branch October 4, 2026 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants