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.16.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.17.0
Choose a head ref
  • 15 commits
  • 34 files changed
  • 4 contributors

Commits on Feb 27, 2023

  1. Update ci.yml

    cushon authored Feb 27, 2023
    Configuration menu
    Copy the full SHA
    64f98ed View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Prepare for a change to JCTree.getQualifiedIdentifier

    openjdk/jdk@a917fb3
    
    Fixes: #898
    PiperOrigin-RevId: 512759236
    cushon authored and google-java-format Team committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    a7583fb View commit details
    Browse the repository at this point in the history
  2. Use a standard gradle project structure.

    I'm going to add tests next, but with this weird file structure I've been using, there's no good place to put them.
    
    The only content changes here are in build.gradle.
    
    PiperOrigin-RevId: 512914783
    plumpy authored and google-java-format Team committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    9412083 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Move the plugin to the FormattingService API.

    Also support optimizing imports, using the ImportOptimizer API.
    
    PiperOrigin-RevId: 513562756
    plumpy authored and google-java-format Team committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    84b2c9a View commit details
    Browse the repository at this point in the history
  2. Make the -add-exports= passed to g-j-f consistent

    PiperOrigin-RevId: 513589436
    cushon authored and google-java-format Team committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    0644d4c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Switch (deprecated) ProjectManagerListener#onProjectOpened to Startup…

    …Activity.
    
    PiperOrigin-RevId: 513811140
    plumpy authored and google-java-format Team committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    32a6c00 View commit details
    Browse the repository at this point in the history
  2. Link to instructions for properly configuring the IDE's JRE.

    Pop up this warning once per-project per-launch, only when the Formatter is enabled (or at startup if the formatter is already enabled in the project).
    
    PiperOrigin-RevId: 513822794
    plumpy authored and google-java-format Team committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    4f5ffd0 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Convert the gradle config to kotlin.

    I moved the description out of the Gradle config and into the XML. (It was just in the gradle so we could add the gjf version number, but that seems unnecessary since I changed the versioning so that the plugin version matches the gjf version.)
    
    I also updated the IntelliJ Gradle plugin to 1.13.1 because plugin publishing is broken in 1.13.0.
    
    PiperOrigin-RevId: 513888985
    plumpy authored and google-java-format Team committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    1651dea View commit details
    Browse the repository at this point in the history
  2. Update the --add-exports instructions.

    I don't really understand _why_ this works. I'm able to (easily) reproduce the
    problem by not including the `=` in my `idea64.options` file. But then if I
    copy/paste the command line out of `ps`, it works fine.
    
    And since it's easy enough to change this, I'm inclined to just do that?
    
    Fixes #908.
    
    PiperOrigin-RevId: 514440074
    plumpy authored and google-java-format Team committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    20527aa View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Allow blank lines inserted before comments.

    Previously, blank lines could only be emitted before comments if they were there in the input. This was irrespective of BlankLineWanted.YES hints in the OpBuilder.
    
    These hints are already being set by some paths in GJF, so now that they're respected, blank lines will be added to some existing files.
    
    Eval in unknown commit
    
    PiperOrigin-RevId: 514817708
    nreid260 authored and google-java-format Team committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    1a00656 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Make OpsBuilder::add public final

    PiperOrigin-RevId: 515682100
    nreid260 authored and google-java-format Team committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    4c1aeff View commit details
    Browse the repository at this point in the history
  2. Be louder about telling users they need to modify their IDE config to…

    … use gjf.
    
    Right now if your IDE isn't set up properly and you have gjf enabled in a
    project, you get a single warning. Any uses of the code formatter after that
    will instead use the built-in formatter.
    
    This is confusing to people who don't notice the notification. They think gjf
    is formatting their code strangely. Instead, let's warn on every single
    invocation of the formatter until they either fix the configuration issue or
    disable gjf in the project.
    
    Fixes #914 #919.
    
    PiperOrigin-RevId: 515722447
    plumpy authored and google-java-format Team committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    401d5c9 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Remove AD_HOC_FORMATTING from the IntelliJ plugin.

    I have a feeling this is causing a lot of the issues people are seeing where
    it's constantly trying to reformat and failing because of syntax errors.
    Hopefully this will make it only try to reformat when a user specifically
    requests it.
    
    PiperOrigin-RevId: 521657519
    plumpy authored and google-java-format Team committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    25ce685 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Remove tests for handling of extra semi-colons

    javac no longer accepts these, see https://bugs.openjdk.org/browse/JDK-8027682
    
    PiperOrigin-RevId: 525775880
    cushon authored and google-java-format Team committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    18f8358 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

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