Skip to content

Commit 915b78f

Browse files
plumpygoogle-java-format Team
authored andcommitted
Update the release notes for the IntelliJ plugin.
(Also updated a dependency and tweaked the comment formatting.) PiperOrigin-RevId: 563439879
1 parent 9f2cd68 commit 915b78f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

idea_plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ tasks {
6262
dependencies {
6363
implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
6464
testImplementation("junit:junit:4.13.2")
65-
testImplementation("com.google.truth:truth:1.1.3")
65+
testImplementation("com.google.truth:truth:1.1.5")
6666
}

idea_plugin/src/main/java/com/google/googlejavaformat/intellij/GoogleJavaFormatImportOptimizer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public boolean supports(@NotNull PsiFile file) {
6464
return Runnables.doNothing();
6565
}
6666

67-
/* pointless to change document text if it hasn't changed, plus this can interfere with
68-
e.g. GoogleJavaFormattingService's output, i.e. it can overwrite the results from the main
69-
formatter. */
67+
// pointless to change document text if it hasn't changed, plus this can interfere with
68+
// e.g. GoogleJavaFormattingService's output, i.e. it can overwrite the results from the main
69+
// formatter.
7070
if (text.equals(origText)) {
7171
return Runnables.doNothing();
7272
}
@@ -76,9 +76,9 @@ public boolean supports(@NotNull PsiFile file) {
7676
documentManager.doPostponedOperationsAndUnblockDocument(document);
7777
}
7878

79-
/* similarly to above, don't overwrite new document text if it has changed - we use
80-
getCharsSequence() as we should have `writeAction()` (which I think means effectively a
81-
write-lock) and it saves calling getText(), which apparently is expensive. */
79+
// similarly to above, don't overwrite new document text if it has changed - we use
80+
// getCharsSequence() as we should have `writeAction()` (which I think means effectively a
81+
// write-lock) and it saves calling getText(), which apparently is expensive.
8282
CharSequence newText = document.getCharsSequence();
8383
if (CharSequence.compare(origText, newText) != 0) {
8484
return;

idea_plugin/src/main/resources/META-INF/plugin.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
]]></description>
3636
<change-notes><![CDATA[
3737
<dl>
38+
<dt>1.17.0.0</dt>
39+
<dd>Updated to use google-java-format 1.17.0.</dd>
40+
<dd>Fixed "Document is locked" errors (Thanks, <code>@facboy</code>!)</dd>
3841
<dt>1.16.0.2</dt>
3942
<dd>Disable AD_HOC_FORMATTING, which should stop the formatter from running so often when it wasn't specifically requested.
4043
<dt>1.16.0.1</dt>

0 commit comments

Comments
 (0)