Description: The defect of google/google-java-format#1476, fixed in this fork's own way: upstream's patch edits JavadocFormatter.classicCommentText, which does not exist here, so the change lives in the lexer.
Problem. With Javadoc formatting on, lines inside {@code ...} that omit the * margin lost all their leading whitespace, because NEWLINE_PATTERN ate the indentation of every continuation line. The JDK's java.lang.invoke docs are written this way and came out flush left.
Fix. JavadocLexer.stripMargins removes the margins line by line before tokenizing, mirroring upstream's classicCommentText: the * prefix plus one space from lines that have it, and the comment's own indentation from lines that do not. That indentation is min(shortest * prefix, shortest bare-line indentation), so a bare line is never cut into and both kinds of line stay aligned. What is left is relative to the comment, which is what deindentPreCodeBlocks already expects. NEWLINE_PATTERN shrinks to ^[ \t]*\n, the same as upstream's.
HTML comments were the one construct that still saw raw margins (the whole is one token). The writer now re-adds the margin to each of their lines, as upstream's writeHtmlComment does, and commentMostlyUntouched takes upstream's current expectation: * abc, * def, * --> instead of the raw *abc. That is the one visible behaviour change outside bare-line code samples; say if the raw form should be kept instead.
Tests first. preCodeWithoutLeadingStarPreservesIndent (upstream's case), preCodeWithoutLeadingStarInIndentedComment (comment indented by four, so the base column really has to go) and preCodeMixedStarAndBareLinesKeepRelativeIndent all failed with the sample flush left. The first and third carry a summary line before , so they do not depend on the leading-blank-lines fix in #116. Full module suite: 1612 tests, 0 failures.
Blast radius. java.base of JDK 21, 3,474 files, formatted with formatJavadoc(true) by main's jar and this branch's jar: 6 files differ (BootstrapCallInfo, CallSite, MethodHandle, MethodHandles, MutableCallSite, Cleaner), every hunk a bare-line code sample regaining its indentation. The other 3,468 are byte-identical, so the rewritten margin handling changes nothing for * lines.
Only reachable through JavaFormatterOptions.formatJavadoc(true); the CLI and plugins are unaffected.
| react-profiling | 0 |
| react-import-map | react,react-dom,react-dom/client,react-dom/profiling,react-is,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@b8488ee2c322 |
| route-pattern | /:user_id/:repository/pull/:id/files(.:format) |
| route-controller | pull_requests |
| route-action | files |
| fetch-nonce | v2:e5e1301d-824f-2436-66d4-dde4239d2566 |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | A0B0:358700:E5A56:142422:6AFBCA2A |
| html-safe-nonce | 717b83b5395bffeb697ef87f3226adb484aedd1aaeccdf3227497e8e55970db2 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBMEIwOjM1ODcwMDpFNUE1NjoxNDI0MjI6NkFGQkNBMkEiLCJ2aXNpdG9yX2lkIjoiNjgzOTQ4MjE5Nzk5MzA0ODYxOCIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | ffb6fc8730ff404f06221d3f2798b29942a3c9a6c65c414dcaee713f88482256 |
| hovercard-subject-tag | pull_request:4791306206 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | ///pull_requests/show/files |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/openjavaformat/open-java-format/pull/117/files |
| twitter:image | https://avatars.githubusercontent.com/u/214171?s=400&v=4 |
| twitter:card | summary_large_image |
| og:image | https://avatars.githubusercontent.com/u/214171?s=400&v=4 |
| og:image:alt | The defect of google/google-java-format#1476, fixed in this fork's own way: upstream's patch edits JavadocFormatter.classicCommentText, which does not exist here, so the change lives in the... |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | d440bda0d812801778b27bfe9f7c1ce9ff22420c73f6f95150c4fcbca311c50b |
| turbo-cache-control | no-preview |
| diff-view | unified |
| go-import | github.com/openjavaformat/open-java-format git https://github.com/openjavaformat/open-java-format.git |
| octolytics-dimension-user_id | 325177626 |
| octolytics-dimension-user_login | openjavaformat |
| octolytics-dimension-repository_id | 1288055459 |
| octolytics-dimension-repository_nwo | openjavaformat/open-java-format |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | true |
| octolytics-dimension-repository_parent_id | 214273098 |
| octolytics-dimension-repository_parent_nwo | palantir/palantir-java-format |
| octolytics-dimension-repository_network_root_id | 214273098 |
| octolytics-dimension-repository_network_root_nwo | palantir/palantir-java-format |
| turbo-body-classes | logged-out env-production page-responsive full-width |
| disable-turbo | true |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 2c43021aed8695990c86c0eaaedc600bfeffec36 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| Skip to content | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#start-of-content |
| https://redirect.github.com/ |
| Sign in | https://redirect.github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fopenjavaformat%2Fopen-java-format%2Fpull%2F117%2Ffiles |
| GitHubRepository hosting, code review, and collaboration | https://github.com/platform |
| CopilotAI coding agent for tasks, projects, and automated work | https://github.com/features/copilot |
| ActionsCI/CD and automation | https://github.com/features/actions |
| Code QualityQuality analysis, fixes, and enforcement | https://github.com/features/code-quality |
| CodespacesCloud development environments | https://github.com/features/codespaces |
| Code SecurityVulnerability detection and remediation | https://github.com/security/advanced-security/code-security |
| Secret ProtectionSecret scanning and leak prevention | https://github.com/security/advanced-security/secret-protection |
| All Features | https://github.com/features |
| Documentation | https://docs.github.com/en |
| Training | https://learn.github.com/skills |
| Certifications | https://learn.github.com/credentials |
| Build with Copilot | https://github.com/features/ai |
| Customize Copilot | https://docs.github.com/en/copilot/how-tos/copilot-on-github/customize-copilot/customize-copilot-overview |
| Integrations | https://github.com/marketplace |
| Trending repos | https://github.com/trending |
| GitHub Sponsors | https://github.com/open-source/sponsors |
| Developer articles | https://github.com/resources/articles |
| ChangelogYour source for the latest features, improvements, and fixes across GitHub products, all in one place. | https://github.blog/changelog/ |
| Enterprises | https://github.com/enterprise |
| Team | https://github.com/team |
| Startups | https://github.com/enterprise/startups |
| Nonprofits | https://github.com/solutions/industry/nonprofits |
| Healthcare | https://github.com/solutions/industry/healthcare |
| Financial services | https://github.com/solutions/industry/financial-services |
| Manufacturing | https://github.com/solutions/industry/manufacturing |
| Government | https://github.com/solutions/industry/government |
| See all industries | https://github.com/solutions/industry |
| Why GitHub | https://github.com/why-github |
| Customer Stories | https://github.com/customer-stories |
| Business insights | https://github.com/solutions/executive-insights |
| Trust Center | https://github.com/trust-center |
| GitHub Advanced SecurityEnterprise-grade code security | https://github.com/security/advanced-security |
| Copilot for businessEnterprise-grade AI features | https://github.com/features/copilot/copilot-business |
| Premium SupportEnterprise-grade 24/7 support | https://github.com/enterprise/premium-support |
| Documentation | https://docs.github.com/en |
| Resource center | https://github.com/resources |
| Blog | https://github.blog/ |
| Events & webinars | https://github.com/resources/events |
| Community Forum | https://github.com/orgs/community/discussions |
| Customer Stories | https://github.com/customer-stories |
| Integrations | https://github.com/marketplace |
| Customer support | https://help.github.com/ |
| Training | https://learn.github.com/skills |
| GitHub Status | https://www.githubstatus.com/ |
| About | https://github.com/about |
| Partners | https://github.com/partners |
| Changelog | https://github.blog/changelog/ |
| GitHub UniverseThe event for developers, by developers — talks, workshops, and what’s next for GitHub. | https://githubuniverse.com/ |
| Pricing | https://github.com/pricing |
| Sign in | https://redirect.github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fopenjavaformat%2Fopen-java-format%2Fpull%2F117%2Ffiles |
| Sign up | https://redirect.github.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fpull_requests%2Fshow%2Ffiles&source=header-repo&source_repo=openjavaformat%2Fopen-java-format |
| Reload | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| Reload | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| Reload | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| openjavaformat | https://redirect.github.com/openjavaformat |
| open-java-format | https://redirect.github.com/openjavaformat/open-java-format |
| Code | https://redirect.github.com/openjavaformat/open-java-format |
| Issues30 (30) | https://redirect.github.com/openjavaformat/open-java-format/issues |
| Pull requests5 (5) | https://redirect.github.com/openjavaformat/open-java-format/pulls |
| Discussions | https://redirect.github.com/openjavaformat/open-java-format/discussions |
| Actions | https://redirect.github.com/openjavaformat/open-java-format/actions |
| Security and quality | https://redirect.github.com/openjavaformat/open-java-format/security |
| Insights | https://redirect.github.com/openjavaformat/open-java-format/pulse |
| Sign up for GitHub
| https://redirect.github.com/signup?return_to=%2Fopenjavaformat%2Fopen-java-format%2Fissues%2Fnew%2Fchoose |
| terms of service | https://docs.github.com/terms |
| privacy statement | https://docs.github.com/privacy |
| Sign in | https://redirect.github.com/login?return_to=%2Fopenjavaformat%2Fopen-java-format%2Fissues%2Fnew%2Fchoose |
| abashev | https://redirect.github.com/abashev |
| main | https://redirect.github.com/openjavaformat/open-java-format/tree/main |
| gjf-1476-pre-indent-without-star | https://redirect.github.com/openjavaformat/open-java-format/tree/gjf-1476-pre-indent-without-star |
|
Conversation
0
| https://redirect.github.com/openjavaformat/open-java-format/pull/117 |
|
Commits
1
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/commits |
|
Checks
16
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/checks |
|
Files changed
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| Please reload this page | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
Keep the relative indentation of {@code} lines written without *
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#top |
|
Show all changes
1 commit
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
b19048a
Keep the relative indentation of {@code} lines written without `*`
abashev Oct 8, 2026
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/commits/b19048ac98b5d1f932491cf7feb5856d42b166c7 |
|
Clear filters
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| Please reload this page | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
| Please reload this page | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
|
JavadocLexer.java
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
JavadocWriter.java
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
|
JavadocFormattingTest.java
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4874ab5903495ab1f5c86d1252ac208a672e524d979f7a6f5337a773b49b54f6 |
| open-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocLexer.java | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
View file
| https://redirect.github.com/openjavaformat/open-java-format/blob/b19048ac98b5d1f932491cf7feb5856d42b166c7/open-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocLexer.java |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/{{ revealButtonHref }} |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4c525c8e93024d87ee499da472179e93fffbacc0075473d0ae40b09d959d1c40 |
| open-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocWriter.java | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
|
View file
| https://redirect.github.com/openjavaformat/open-java-format/blob/b19048ac98b5d1f932491cf7feb5856d42b166c7/open-java-format/src/main/java/com/palantir/javaformat/java/javadoc/JavadocWriter.java |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/{{ revealButtonHref }} |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-de4a419665098250349ae1bf84b759c76ddafdc46bb5bc7b23f2e89fafcebab1 |
| open-java-format/src/test/java/com/palantir/javaformat/java/JavadocFormattingTest.java | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4874ab5903495ab1f5c86d1252ac208a672e524d979f7a6f5337a773b49b54f6 |
|
View file
| https://redirect.github.com/openjavaformat/open-java-format/blob/b19048ac98b5d1f932491cf7feb5856d42b166c7/open-java-format/src/test/java/com/palantir/javaformat/java/JavadocFormattingTest.java |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/{{ revealButtonHref }} |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4874ab5903495ab1f5c86d1252ac208a672e524d979f7a6f5337a773b49b54f6 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4874ab5903495ab1f5c86d1252ac208a672e524d979f7a6f5337a773b49b54f6 |
|
| https://redirect.github.com/openjavaformat/open-java-format/pull/117/files#diff-4874ab5903495ab1f5c86d1252ac208a672e524d979f7a6f5337a773b49b54f6 |
| Please reload this page | https://redirect.github.com/openjavaformat/open-java-format/pull/117/files |
|
| https://github.com |
| Terms | https://docs.github.com/site-policy/github-terms/github-terms-of-service |
| Privacy | https://docs.github.com/site-policy/privacy-policies/github-privacy-statement |
| Security | https://github.com/security |
| Status | https://www.githubstatus.com/ |
| Community | https://github.community/ |
| Docs | https://docs.github.com/ |
| Contact | https://support.github.com?tags=dotcom-footer |