Develop to master #21
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update repo
# Conflicts: # core/pom.xml # core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java # idea_plugin/build.gradle # idea_plugin/resources/META-INF/plugin.xml # pom.xml
# Conflicts: # idea_plugin/build.gradle
# Conflicts: # .gitignore # pom.xml
# Conflicts: # core/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java # idea_plugin/build.gradle # idea_plugin/src/main/resources/META-INF/plugin.xml
Check the last line instead of the first line of the text block contents. Empty lines in the text block have no leading whitespace but do not indicate the contents are deindented, only non-empty lines should be considered. The last line will never be empty, it contains at least the close delimiter. PiperOrigin-RevId: 697785256
PiperOrigin-RevId: 698016480
…a text block If the last line contains contents other than the closing delimiter, it may have significant leading whitespace. This change prevents that whitespace from being removed. google#1195 PiperOrigin-RevId: 698939557
…ts JDK 17 PiperOrigin-RevId: 699235273
PiperOrigin-RevId: 699256809
PiperOrigin-RevId: 700741432
PiperOrigin-RevId: 704697540
Handle removing trailing whitespace when the closing delimiter is on the same line as the final line of the text block. Fixes google#1205 PiperOrigin-RevId: 705218533
JDK 17 is now the minimum supported version. PiperOrigin-RevId: 705237702
PiperOrigin-RevId: 705324566
See google#1210 PiperOrigin-RevId: 708100474
PiperOrigin-RevId: 738874322
* Don't automatically deindent long text blocks to start at column 0. For text blocks that are already deindented the existing choice will be preserved, but it won't happen automatically. * For deindented text blocks, put the opening `"""` at column 0 instead of indenting it PiperOrigin-RevId: 739966701
Manually created Google internal equivalent of public google#1228, just in case it's easier to review here instead of there; quote with rationale for this, from public PR description: It at first confused the hell out of me why clearly the exact SAME version of google-java-format worked great locally but failed with errors (due to my use of record matching pattern syntax) on a GitHub Action - until I've noticed that it still ran under Java 17 - and that this matters to google-java-format (my naive initial assumption was that only the google-java-format version itself was relevant). PiperOrigin-RevId: 741076633
More permissions
PiperOrigin-RevId: 741251928
@kwin re. google#1225 @cushon merge? Fixes google#1235 COPYBARA_INTEGRATE_REVIEW=google#1235 from vorburger:patch-7 38255fa PiperOrigin-RevId: 741534873
PiperOrigin-RevId: 744065507
This allows the CheckReturnValue analysis to tell that it's a builder and ignore the results of builder methods. PiperOrigin-RevId: 745341492
PiperOrigin-RevId: 745356200
*** Reason for rollback *** Breaks test/protobuf.msan [failure]([] *** Original change description *** Internal change PiperOrigin-RevId: 745520292
# Conflicts: # core/pom.xml # eclipse_plugin/pom.xml # eclipse_plugin/src/com/google/googlejavaformat/java/GoogleJavaFormatter.java # pom.xml
nemanjamasnikosa
approved these changes
Apr 12, 2025
andrejm93
approved these changes
Apr 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.