From ad29696272d6e5b7e3306ba10186490ac246027e Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Tue, 10 Dec 2024 07:12:59 -0800 Subject: [PATCH 1/3] Update the IntelliJ plugin to 1.25.1. PiperOrigin-RevId: 704697540 --- idea_plugin/build.gradle.kts | 4 ++-- idea_plugin/src/main/resources/META-INF/plugin.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts index 74cd1bd0..b2405603 100644 --- a/idea_plugin/build.gradle.kts +++ b/idea_plugin/build.gradle.kts @@ -18,7 +18,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases plugins { - id("org.jetbrains.intellij.platform") version "2.1.0" + id("org.jetbrains.intellij.platform") version "2.2.0" } repositories { @@ -30,7 +30,7 @@ repositories { } // https://github.com/google/google-java-format/releases -val googleJavaFormatVersion = "1.25.0" +val googleJavaFormatVersion = "1.25.1" java { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml index 612f922c..edede315 100644 --- a/idea_plugin/src/main/resources/META-INF/plugin.xml +++ b/idea_plugin/src/main/resources/META-INF/plugin.xml @@ -35,6 +35,8 @@ ]]> +
1.25.1.0
+
Updated to use google-java-format 1.25.1.
1.25.0.0
Updated to use google-java-format 1.25.0.
1.24.0.0
From 3d2f63e1a2363e1c2a225e37db5d7a95b0d64325 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Wed, 11 Dec 2024 13:24:53 -0800 Subject: [PATCH 2/3] Fix another text block special case Handle removing trailing whitespace when the closing delimiter is on the same line as the final line of the text block. Fixes https://github.com/google/google-java-format/issues/1205 PiperOrigin-RevId: 705218533 --- .../com/google/googlejavaformat/java/StringWrapper.java | 4 +++- .../com/google/googlejavaformat/java/testdata/I1205.input | 7 +++++++ .../google/googlejavaformat/java/testdata/I1205.output | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input create mode 100644 core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output diff --git a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java index c1c38d34..5d10da38 100644 --- a/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java +++ b/core/src/main/java/com/google/googlejavaformat/java/StringWrapper.java @@ -225,7 +225,9 @@ private void indentTextBlocks( } if (i == lines.size() - 1) { String withoutDelimiter = - trimmed.substring(0, trimmed.length() - TEXT_BLOCK_DELIMITER.length()); + trimmed + .substring(0, trimmed.length() - TEXT_BLOCK_DELIMITER.length()) + .stripTrailing(); if (!withoutDelimiter.stripLeading().isEmpty()) { output.append(withoutDelimiter).append('\\').append(separator).append(prefix); } diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input new file mode 100644 index 00000000..8f8acaa1 --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.input @@ -0,0 +1,7 @@ +public interface Foo { + + private static String foo = + """ + foo\ + bar """; +} diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output new file mode 100644 index 00000000..c82862c0 --- /dev/null +++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I1205.output @@ -0,0 +1,8 @@ +public interface Foo { + + private static String foo = + """ + foo\ + bar\ + """; +} From 27412e545b49264a1f29ff490063477aba6aa556 Mon Sep 17 00:00:00 2001 From: cushon Date: Wed, 11 Dec 2024 21:28:48 +0000 Subject: [PATCH 3/3] Release google-java-format 1.25.2 --- core/pom.xml | 2 +- eclipse_plugin/META-INF/MANIFEST.MF | 2 +- eclipse_plugin/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 5b6bbb4d..25df9488 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ com.google.googlejavaformat google-java-format-parent - HEAD-SNAPSHOT + 1.25.2 google-java-format diff --git a/eclipse_plugin/META-INF/MANIFEST.MF b/eclipse_plugin/META-INF/MANIFEST.MF index 91324539..2dcc7b2b 100644 --- a/eclipse_plugin/META-INF/MANIFEST.MF +++ b/eclipse_plugin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: google-java-format Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true Bundle-Vendor: Google -Bundle-Version: 1.13.0 +Bundle-Version: 1.25.2 Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.jface, diff --git a/eclipse_plugin/pom.xml b/eclipse_plugin/pom.xml index b2c6e368..1fad0e7b 100644 --- a/eclipse_plugin/pom.xml +++ b/eclipse_plugin/pom.xml @@ -22,7 +22,7 @@ com.google.googlejavaformat google-java-format-eclipse-plugin eclipse-plugin - 1.13.0 + 1.25.2 Google Java Format Plugin for Eclipse 4.5+ diff --git a/pom.xml b/pom.xml index f6efb7b7..1edcc95e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.google.googlejavaformat google-java-format-parent pom - HEAD-SNAPSHOT + 1.25.2 core