Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: google/google-java-format
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.23.0
Choose a base ref
...
head repository: google/google-java-format
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.24.0
Choose a head ref
  • 14 commits
  • 26 files changed
  • 8 contributors

Commits on Aug 5, 2024

  1. Fix inconsistency in formatting of comments in switch statements

    This was introduced by f7543b2, which only updated the logic for for JDK 17+.
    
    Fixes #1127
    
    PiperOrigin-RevId: 659616575
    cushon authored and google-java-format Team committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    b3c7c11 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Avoid mangling {@snippet ...}.

    This CL also implements some minimal formatting behavior _around_ `{@snippet ...}` (namely, a blank line before and after). It does not make any effort to change formatting _inside_ `{@snippet ...}`, only to stop reflowing it blindly.
    
    PiperOrigin-RevId: 665555661
    cpovirk authored and google-java-format Team committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    ebf9b52 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Fix #1132 Load services outside of constructors and class initializers

    Fixes the error on startup by loading the service when needed and not when the class is initializing.  IntelliJ docs on this, https://plugins.jetbrains.com/docs/intellij/plugin-services.html#retrieving-a-service.
    
    Tested locally with IntelliJ versions 2021.3 and 2024.2.
    
    #1134 has bug #1132 tagged, but I don't think it does anything to resolve the issue in it's current state. (I do agree that getting on the newer IntelliJ tooling is beneficial though, it offers inspections that catches issues like this.)
    
    Fixes #1132.
    
    Fixes #1138
    
    COPYBARA_INTEGRATE_REVIEW=#1138 from nrayburn-tech:fix/1132 5866980
    PiperOrigin-RevId: 665876052
    nrayburn-tech authored and google-java-format Team committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ac46c75 View commit details
    Browse the repository at this point in the history
  2. #1132 Migrate to IntelliJ Platform Gradle Plugin 2.0

    Hello,
    
    I have no experience in IntelliJ plugin development, but maybe I can support you that the required invest in time isn't that high. As far as I can tell the `gradle build` works.
    
    Due to the changes of the IntelliJ gradle plugin I was urged to raise the java compatibility to 17 as well as the supported IntelliJ version to at least 2022.3 (see [requirements](https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#requirements))
    
    #1132
    
    Fixes #1134
    
    COPYBARA_INTEGRATE_REVIEW=#1134 from mmaeller:gh-1132 abed210
    PiperOrigin-RevId: 665880070
    mmaeller authored and google-java-format Team committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    0ebb588 View commit details
    Browse the repository at this point in the history
  3. Update IntelliJ plugin to 1.23.0.

    PiperOrigin-RevId: 665921070
    plumpy authored and google-java-format Team committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    5544952 View commit details
    Browse the repository at this point in the history
  4. Fix the until-build property of the IntelliJ plugin.

    Setting it to "" creates a broken plugin, but omitting it sets it to the same as
    since-build. So apparently you have to do this.
    
    PiperOrigin-RevId: 665927556
    plumpy authored and google-java-format Team committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3fe163b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Update the README to point to JetBrains documentation where appropriate.

    Fixes #1136
    
    PiperOrigin-RevId: 666125973
    plumpy authored and google-java-format Team committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    f9eca5a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Fix package version metadata #9.

    * ebnf-mode: Last change 13 years ago with open PR from phst from 2019.  For the sake of the current package version metadata work, just slap in a pkg.el file for now.
    * llm-goose: Missing header.
    * gyp: Missing header.
    * lv: Include pkg.el added earlier.
    
    PiperOrigin-RevId: 667696660
    java-team-github-bot authored and google-java-format Team committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    9f2611e View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Add a regression test for handling of /// comments

    #1153
    
    PiperOrigin-RevId: 673574143
    cushon authored and google-java-format Team committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8a0e3b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Fix different formatting of block line comments with openjdk 23+

    Fixes #1153.
    
    Fixes #1161
    
    COPYBARA_INTEGRATE_REVIEW=#1161 from dweiss:1153-block-line-comments-in-java23 e3ed83c
    PiperOrigin-RevId: 674304999
    dweiss authored and google-java-format Team committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    5e0d9e3 View commit details
    Browse the repository at this point in the history
  2. Always run integration test for #1161

    The intent was to only run the test on JDK 23+ and to disable it until the linked issue was fixed, but it actually resulted in the test being discovered and run on all JDK versions.
    
    That's fine, because the test is backwards compatible (`///` comments are valid in all versions, they just aren't markdown comments until 23).
    
    The test is being fixed in #1161
    
    PiperOrigin-RevId: 674352956
    cushon authored and google-java-format Team committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    40ac75f View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Print the problem line as context in error messages

    PiperOrigin-RevId: 675207795
    cushon authored and google-java-format Team committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    8c652ed View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Fix column numbers in diagnostics

    Despite documentation to the contrary, the column numbers are already 1-indexed. The comment was added in unknown commit when g-j-f was still implemented using ecj instead of javac, so maybe it was true then?
    
    PiperOrigin-RevId: 681451766
    cushon authored and google-java-format Team committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c101ee9 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    fe9abad View commit details
    Browse the repository at this point in the history
Loading