comments() {
+ return comments;
+ }
+
@Override
protected Comment processComment(int pos, int endPos, CommentStyle style) {
char[] buf = getRawCharactersReflectively(pos, endPos);
- return new CommentWithTextAndPosition(
- pos, endPos, new AccessibleReader(fac, buf, buf.length), style);
+ Comment comment = super.processComment(pos, endPos, style);
+ CommentWithTextAndPosition commentWithTextAndPosition =
+ new CommentWithTextAndPosition(pos, endPos, new String(buf));
+ comments.put(comment, commentWithTextAndPosition);
+ return comment;
}
private char[] getRawCharactersReflectively(int beginIndex, int endIndex) {
@@ -260,21 +173,16 @@ private char[] getRawCharactersReflectively(int beginIndex, int endIndex) {
}
/** A {@link Comment} that saves its text and start position. */
- static class CommentWithTextAndPosition implements Comment {
+ static class CommentWithTextAndPosition {
private final int pos;
private final int endPos;
- private final AccessibleReader reader;
- private final CommentStyle style;
+ private final String text;
- private String text = null;
-
- public CommentWithTextAndPosition(
- int pos, int endPos, AccessibleReader reader, CommentStyle style) {
+ public CommentWithTextAndPosition(int pos, int endPos, String text) {
this.pos = pos;
this.endPos = endPos;
- this.reader = reader;
- this.style = style;
+ this.text = text;
}
/**
@@ -283,7 +191,6 @@ public CommentWithTextAndPosition(
* The handling of javadoc comments in javac has more logic to skip over leading whitespace
* and '*' characters when indexing into doc comments, but we don't need any of that.
*/
- @Override
public int getSourcePos(int index) {
checkArgument(
0 <= index && index < (endPos - pos),
@@ -293,49 +200,22 @@ public int getSourcePos(int index) {
return pos + index;
}
- @Override
- public CommentStyle getStyle() {
- return style;
- }
-
- @Override
public String getText() {
- String text = this.text;
- if (text == null) {
- this.text = text = new String(reader.getRawCharacters());
- }
return text;
}
- /**
- * We don't care about {@code @deprecated} javadoc tags (see the DepAnn check).
- *
- * @return false
- */
- @Override
- public boolean isDeprecated() {
- return false;
- }
-
@Override
public String toString() {
return String.format("Comment: '%s'", getText());
}
}
- // Scanner(ScannerFactory, JavaTokenizer) is package-private
+ // Scanner(ScannerFactory, JavaTokenizer) is protected
static class AccessibleScanner extends Scanner {
protected AccessibleScanner(ScannerFactory fac, JavaTokenizer tokenizer) {
super(fac, tokenizer);
}
}
- // UnicodeReader(ScannerFactory, char[], int) is package-private
- static class AccessibleReader extends UnicodeReader {
- protected AccessibleReader(ScannerFactory fac, char[] buffer, int length) {
- super(fac, buffer, length);
- }
- }
-
private JavacTokens() {}
}
diff --git a/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java b/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java
index e14b29036..1b26f7d69 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java
@@ -16,6 +16,9 @@
package com.google.googlejavaformat.java;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Iterables.getLast;
+
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.google.common.collect.Range;
@@ -26,12 +29,12 @@
import com.sun.tools.javac.parser.Tokens.TokenKind;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.lang.model.element.Modifier;
+import org.jspecify.annotations.Nullable;
/** Fixes sequences of modifiers to be in JLS order. */
final class ModifierOrderer {
@@ -42,6 +45,71 @@ static JavaInput reorderModifiers(String text) throws FormatterException {
new JavaInput(text), ImmutableList.of(Range.closedOpen(0, text.length())));
}
+ /**
+ * A class that contains the tokens corresponding to a modifier. This is usually a single token
+ * (e.g. for {@code public}), but may be multiple tokens for modifiers containing {@code -} (e.g.
+ * {@code non-sealed}).
+ */
+ static class ModifierTokens implements Comparable {
+ private final ImmutableList tokens;
+ private final Modifier modifier;
+
+ static ModifierTokens create(ImmutableList tokens) {
+ return new ModifierTokens(tokens, asModifier(tokens));
+ }
+
+ static ModifierTokens empty() {
+ return new ModifierTokens(ImmutableList.of(), null);
+ }
+
+ ModifierTokens(ImmutableList tokens, Modifier modifier) {
+ this.tokens = tokens;
+ this.modifier = modifier;
+ }
+
+ boolean isEmpty() {
+ return tokens.isEmpty() || modifier == null;
+ }
+
+ Modifier modifier() {
+ return modifier;
+ }
+
+ ImmutableList tokens() {
+ return tokens;
+ }
+
+ private Token first() {
+ return tokens.get(0);
+ }
+
+ private Token last() {
+ return getLast(tokens);
+ }
+
+ int startPosition() {
+ return first().getTok().getPosition();
+ }
+
+ int endPosition() {
+ return last().getTok().getPosition() + last().getTok().getText().length();
+ }
+
+ ImmutableList getToksBefore() {
+ return first().getToksBefore();
+ }
+
+ ImmutableList getToksAfter() {
+ return last().getToksAfter();
+ }
+
+ @Override
+ public int compareTo(ModifierTokens o) {
+ checkState(!isEmpty()); // empty ModifierTokens are filtered out prior to sorting
+ return modifier.compareTo(o.modifier);
+ }
+ }
+
/**
* Reorders all modifiers in the given text and within the given character ranges to be in JLS
* order.
@@ -57,43 +125,37 @@ static JavaInput reorderModifiers(JavaInput javaInput, Collection
Iterator it = javaInput.getTokens().iterator();
TreeRangeMap replacements = TreeRangeMap.create();
while (it.hasNext()) {
- Token token = it.next();
- if (!tokenRanges.contains(token.getTok().getIndex())) {
- continue;
- }
- Modifier mod = asModifier(token);
- if (mod == null) {
+ ModifierTokens tokens = getModifierTokens(it);
+ if (tokens.isEmpty()
+ || !tokens.tokens().stream()
+ .allMatch(token -> tokenRanges.contains(token.getTok().getIndex()))) {
continue;
}
- List modifierTokens = new ArrayList<>();
- List mods = new ArrayList<>();
+ List modifierTokens = new ArrayList<>();
- int begin = token.getTok().getPosition();
- mods.add(mod);
- modifierTokens.add(token);
+ int begin = tokens.startPosition();
+ modifierTokens.add(tokens);
int end = -1;
while (it.hasNext()) {
- token = it.next();
- mod = asModifier(token);
- if (mod == null) {
+ tokens = getModifierTokens(it);
+ if (tokens.isEmpty()) {
break;
}
- mods.add(mod);
- modifierTokens.add(token);
- end = token.getTok().getPosition() + token.getTok().length();
+ modifierTokens.add(tokens);
+ end = tokens.endPosition();
}
- if (!Ordering.natural().isOrdered(mods)) {
- Collections.sort(mods);
+ if (!Ordering.natural().isOrdered(modifierTokens)) {
+ List sorted = Ordering.natural().sortedCopy(modifierTokens);
StringBuilder replacement = new StringBuilder();
- for (int i = 0; i < mods.size(); i++) {
+ for (int i = 0; i < sorted.size(); i++) {
if (i > 0) {
addTrivia(replacement, modifierTokens.get(i).getToksBefore());
}
- replacement.append(mods.get(i));
- if (i < (modifierTokens.size() - 1)) {
+ replacement.append(sorted.get(i).modifier());
+ if (i < (sorted.size() - 1)) {
addTrivia(replacement, modifierTokens.get(i).getToksAfter());
}
}
@@ -109,11 +171,41 @@ private static void addTrivia(StringBuilder replacement, ImmutableList it) {
+ Token token = it.next();
+ ImmutableList.Builder result = ImmutableList.builder();
+ result.add(token);
+ if (!token.getTok().getText().equals("non")) {
+ return ModifierTokens.create(result.build());
+ }
+ if (!it.hasNext()) {
+ return ModifierTokens.empty();
+ }
+ Token dash = it.next();
+ result.add(dash);
+ if (!dash.getTok().getText().equals("-") || !it.hasNext()) {
+ return ModifierTokens.empty();
+ }
+ result.add(it.next());
+ return ModifierTokens.create(result.build());
+ }
+
+ private static @Nullable Modifier asModifier(ImmutableList tokens) {
+ if (tokens.size() == 1) {
+ return asModifier(tokens.get(0));
+ }
+ Modifier modifier = asModifier(getLast(tokens));
+ if (modifier == null) {
+ return null;
+ }
+ return Modifier.valueOf("NON_" + modifier.name());
+ }
+
/**
* Returns the given token as a {@link javax.lang.model.element.Modifier}, or {@code null} if it
* is not a modifier.
*/
- private static Modifier asModifier(Token token) {
+ private static @Nullable Modifier asModifier(Token token) {
TokenKind kind = ((JavaInput.Tok) token.getTok()).kind();
if (kind != null) {
switch (kind) {
@@ -145,8 +237,6 @@ private static Modifier asModifier(Token token) {
}
}
switch (token.getTok().getText()) {
- case "non-sealed":
- return Modifier.valueOf("NON_SEALED");
case "sealed":
return Modifier.valueOf("SEALED");
default:
diff --git a/core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java b/core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java
index a0fc2f54a..8c3cae319 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java
@@ -273,7 +273,7 @@ private static RangeMap buildReplacements(
Set usedNames,
Multimap> usedInJavadoc) {
RangeMap replacements = TreeRangeMap.create();
- for (JCImport importTree : unit.getImports()) {
+ for (JCTree importTree : unit.getImports()) {
String simpleName = getSimpleName(importTree);
if (!isUnused(unit, usedNames, usedInJavadoc, importTree, simpleName)) {
continue;
@@ -291,7 +291,7 @@ private static RangeMap buildReplacements(
return replacements;
}
- private static String getSimpleName(JCImport importTree) {
+ private static String getSimpleName(JCTree importTree) {
return getQualifiedIdentifier(importTree).getIdentifier().toString();
}
@@ -299,7 +299,7 @@ private static boolean isUnused(
JCCompilationUnit unit,
Set usedNames,
Multimap> usedInJavadoc,
- JCImport importTree,
+ JCTree importTree,
String simpleName) {
JCFieldAccess qualifiedIdentifier = getQualifiedIdentifier(importTree);
String qualifier = qualifiedIdentifier.getExpression().toString();
@@ -322,7 +322,7 @@ private static boolean isUnused(
return true;
}
- private static JCFieldAccess getQualifiedIdentifier(JCImport importTree) {
+ private static JCFieldAccess getQualifiedIdentifier(JCTree importTree) {
// Use reflection because the return type is JCTree in some versions and JCFieldAccess in others
try {
return (JCFieldAccess) JCImport.class.getMethod("getQualifiedIdentifier").invoke(importTree);
diff --git a/core/src/main/java/com/google/googlejavaformat/java/UsageException.java b/core/src/main/java/com/google/googlejavaformat/java/UsageException.java
index a10f2d076..50d55d4d4 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/UsageException.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/UsageException.java
@@ -56,7 +56,7 @@ final class UsageException extends Exception {
" --set-exit-if-changed",
" Return exit code 1 if there are any formatting changes.",
" --lines, -lines, --line, -line",
- " Line range(s) to format, like 5:10 (1-based; default is all).",
+ " Line range(s) to format, e.g. the first 5 lines are 1:5 (1-based; default is all).",
" --offset, -offset",
" Character offset to format (0-based; default is all).",
" --length, -length",
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
index e502f49a1..a0037edb7 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
@@ -233,9 +233,9 @@ public Void visitCase(CaseTree node, Void unused) {
? plusFour
: ZERO);
if (isDefault) {
- token("default", plusTwo);
+ token("default", ZERO);
} else {
- token("case", plusTwo);
+ token("case", ZERO);
builder.open(labels.size() > 1 ? plusFour : ZERO);
builder.space();
boolean afterFirstToken = false;
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
index 2192a32a9..859c9c0cf 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/java21/Java21InputAstVisitor.java
@@ -23,7 +23,6 @@
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.PatternCaseLabelTree;
import com.sun.source.tree.PatternTree;
-import com.sun.source.tree.StringTemplateTree;
import com.sun.source.tree.Tree;
import com.sun.tools.javac.tree.JCTree;
import javax.lang.model.element.Name;
@@ -63,7 +62,6 @@ public Void visitConstantCaseLabel(ConstantCaseLabelTree node, Void aVoid) {
@Override
public Void visitDeconstructionPattern(DeconstructionPatternTree node, Void unused) {
- sync(node);
scan(node.getDeconstructor(), null);
builder.open(plusFour);
token("(");
@@ -82,25 +80,6 @@ public Void visitDeconstructionPattern(DeconstructionPatternTree node, Void unus
return null;
}
- @SuppressWarnings("preview")
- @Override
- public Void visitStringTemplate(StringTemplateTree node, Void unused) {
- sync(node);
- builder.open(plusFour);
- scan(node.getProcessor(), null);
- token(".");
- token(builder.peekToken().get());
- for (int i = 0; i < node.getFragments().size() - 1; i++) {
- token("{");
- builder.breakOp();
- scan(node.getExpressions().get(i), null);
- token("}");
- token(builder.peekToken().get());
- }
- builder.close();
- return null;
- }
-
@Override
protected void variableName(Name name) {
if (name.isEmpty()) {
@@ -118,7 +97,7 @@ public Void scan(Tree tree, Void unused) {
visitJcAnyPattern((JCTree.JCAnyPattern) tree);
return null;
} else {
- return super.scan(tree, unused);
+ return super.scan(tree, null);
}
}
diff --git a/core/src/main/scripts/google-java-format.el b/core/src/main/scripts/google-java-format.el
index f269ab361..5df8a1396 100644
--- a/core/src/main/scripts/google-java-format.el
+++ b/core/src/main/scripts/google-java-format.el
@@ -49,6 +49,13 @@ A string containing the name or the full path of the executable."
:type '(file :must-match t :match (lambda (widget file) (file-executable-p file)))
:risky t)
+(defcustom google-java-format-arguments
+ '()
+ "Arguments to pass into google-java-format-executable"
+ :group 'google-java-format
+ :type '(repeat string)
+ :risky t)
+
;;;###autoload
(defun google-java-format-region (start end)
"Use google-java-format to format the code between START and END.
@@ -62,16 +69,17 @@ there is no region, then formats the current line."
(temp-buffer (generate-new-buffer " *google-java-format-temp*"))
(stderr-file (make-temp-file "google-java-format")))
(unwind-protect
- (let ((status (call-process-region
- ;; Note that emacs character positions are 1-indexed,
- ;; and google-java-format is 0-indexed, so we have to
- ;; subtract 1 from START to line it up correctly.
- (point-min) (point-max)
- google-java-format-executable
- nil (list temp-buffer stderr-file) t
- "--offset" (number-to-string (1- start))
- "--length" (number-to-string (- end start))
- "-"))
+ (let ((status (apply #'call-process-region
+ ;; Note that emacs character positions are 1-indexed,
+ ;; and google-java-format is 0-indexed, so we have to
+ ;; subtract 1 from START to line it up correctly.
+ (point-min) (point-max)
+ google-java-format-executable
+ nil (list temp-buffer stderr-file) t
+ (append google-java-format-arguments
+ `("--offset" ,(number-to-string (1- start))
+ "--length" ,(number-to-string (- end start))
+ "-"))))
(stderr
(with-temp-buffer
(insert-file-contents stderr-file)
diff --git a/core/src/test/java/com/google/googlejavaformat/java/CommandLineOptionsParserTest.java b/core/src/test/java/com/google/googlejavaformat/java/CommandLineOptionsParserTest.java
index 08fbbbab3..93dfb79c2 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/CommandLineOptionsParserTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/CommandLineOptionsParserTest.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Range;
@@ -151,15 +150,13 @@ public void setExitIfChanged() {
.isTrue();
}
- // TODO(cushon): consider handling this in the parser and reporting a more detailed error
@Test
- public void illegalLines() {
- try {
- CommandLineOptionsParser.parse(Arrays.asList("-lines=1:1", "-lines=1:1"));
- fail();
- } catch (IllegalArgumentException e) {
- assertThat(e).hasMessageThat().contains("overlap");
- }
+ public void mergedLines() {
+ assertThat(
+ CommandLineOptionsParser.parse(Arrays.asList("-lines=1:5", "-lines=2:8"))
+ .lines()
+ .asRanges())
+ .containsExactly(Range.closedOpen(0, 8));
}
@Test
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
index d31218e28..3e4e175e6 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -48,9 +48,18 @@ public class FormatterIntegrationTest {
private static final ImmutableMultimap VERSIONED_TESTS =
ImmutableMultimap.builder()
- .putAll(14, "I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574", "I594")
+ .putAll(
+ 14,
+ "I477",
+ "Records",
+ "RSLs",
+ "Var",
+ "ExpressionSwitch",
+ "I574",
+ "I594",
+ "SwitchComment")
.putAll(15, "I603")
- .putAll(16, "I588")
+ .putAll(16, "I588", "Sealed")
.putAll(17, "I683", "I684", "I696")
.putAll(
21,
@@ -61,10 +70,8 @@ public class FormatterIntegrationTest {
"I880",
"Unnamed",
"I981",
- "StringTemplate",
"I1020",
- "I1037",
- "TextBlockTemplates")
+ "I1037")
.build();
@Parameters(name = "{index}: {0}")
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java
index b0d7b4030..3835673d9 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/FormatterTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertWithMessage;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
import com.google.common.base.Joiner;
import com.google.common.io.CharStreams;
@@ -511,27 +510,4 @@ public void removeTrailingTabsInComments() throws Exception {
+ " }\n"
+ "}\n");
}
-
- @Test
- public void stringTemplateTests() throws Exception {
- assumeTrue(Runtime.version().feature() >= 21);
- assertThat(
- new Formatter()
- .formatSource(
- "public class Foo {\n"
- + " String test(){\n"
- + " var simple = STR.\"mytemplate1XXXX \\{exampleXXXX.foo()}yyy\";\n"
- + " var nested = STR.\"template \\{example. foo()+"
- + " STR.\"templateInner\\{ example}\"}xxx }\";\n"
- + " }\n"
- + "}\n"))
- .isEqualTo(
- "public class Foo {\n"
- + " String test() {\n"
- + " var simple = STR.\"mytemplate1XXXX \\{exampleXXXX.foo()}yyy\";\n"
- + " var nested = STR.\"template \\{example.foo() +"
- + " STR.\"templateInner\\{example}\"}xxx }\";\n"
- + " }\n"
- + "}\n");
- }
}
diff --git a/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java b/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java
index 1f8fc1721..0f01e9d3f 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/ModifierOrdererTest.java
@@ -17,6 +17,7 @@
package com.google.googlejavaformat.java;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
import com.google.common.base.Joiner;
import com.google.common.collect.Range;
@@ -103,4 +104,11 @@ public void whitespace() throws FormatterException {
.getText();
assertThat(output).contains("public\n static int a;");
}
+
+ @Test
+ public void sealedClass() throws FormatterException {
+ assume().that(Runtime.version().feature()).isAtLeast(16);
+ assertThat(ModifierOrderer.reorderModifiers("non-sealed sealed public").getText())
+ .isEqualTo("public sealed non-sealed");
+ }
}
diff --git a/core/src/test/java/com/google/googlejavaformat/java/StringWrapperTest.java b/core/src/test/java/com/google/googlejavaformat/java/StringWrapperTest.java
index 5ef7cb51a..fd176ed4e 100644
--- a/core/src/test/java/com/google/googlejavaformat/java/StringWrapperTest.java
+++ b/core/src/test/java/com/google/googlejavaformat/java/StringWrapperTest.java
@@ -119,6 +119,35 @@ public void textBlockTrailingWhitespace() throws Exception {
assertThat(actual).isEqualTo(expected);
}
+ // It would be neat if the formatter could remove the trailing whitespace here, but in general
+ // it preserves unicode escapes from the original text.
+ @Test
+ public void textBlockTrailingWhitespaceUnicodeEscape() throws Exception {
+ assumeTrue(Runtime.version().feature() >= 15);
+ // We want a unicode escape in the Java source being formatted, so it needs to be escaped
+ // in the string literal in this test.
+ String input =
+ lines(
+ "public class T {",
+ " String s =",
+ " \"\"\"",
+ " lorem\\u0020",
+ " ipsum",
+ " \"\"\";",
+ "}");
+ String expected =
+ lines(
+ "public class T {",
+ " String s =",
+ " \"\"\"",
+ " lorem\\u0020",
+ " ipsum",
+ " \"\"\";",
+ "}");
+ String actual = StringWrapper.wrap(100, input, new Formatter());
+ assertThat(actual).isEqualTo(expected);
+ }
+
@Test
public void textBlockSpaceTabMix() throws Exception {
assumeTrue(Runtime.version().feature() >= 15);
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.input
deleted file mode 100644
index bba0b7267..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.input
+++ /dev/null
@@ -1,12 +0,0 @@
-class Foo {
- private static final int X = 42;
- private static final String A = STR."\{X} = \{X}";
- private static final String B = STR."";
- private static final String C = STR."\{X}";
- private static final String D = STR."\{X}\{X}";
- private static final String E = STR."\{X}\{X}\{X}";
- private static final String F = STR." \{X}";
- private static final String G = STR."\{X} ";
- private static final String H = STR."\{X} one long incredibly unbroken sentence moving from "+"topic to topic so that no-one had a chance to interrupt";
- private static final String I = STR."\{X} \uD83D\uDCA9 ";
-}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.output
deleted file mode 100644
index ff173fb6a..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I981.output
+++ /dev/null
@@ -1,14 +0,0 @@
-class Foo {
- private static final int X = 42;
- private static final String A = STR."\{X} = \{X}";
- private static final String B = STR."";
- private static final String C = STR."\{X}";
- private static final String D = STR."\{X}\{X}";
- private static final String E = STR."\{X}\{X}\{X}";
- private static final String F = STR." \{X}";
- private static final String G = STR."\{X} ";
- private static final String H =
- STR."\{X} one long incredibly unbroken sentence moving from "
- + "topic to topic so that no-one had a chance to interrupt";
- private static final String I = STR."\{X} \uD83D\uDCA9 ";
-}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.input
new file mode 100644
index 000000000..f19165843
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.input
@@ -0,0 +1,6 @@
+class T {
+ sealed interface I extends A permits C, B {}
+ final class C implements I {}
+ sealed private interface A permits I {}
+ non-sealed private interface B extends I {}
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.output
new file mode 100644
index 000000000..4bafc6399
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/Sealed.output
@@ -0,0 +1,9 @@
+class T {
+ sealed interface I extends A permits C, B {}
+
+ final class C implements I {}
+
+ private sealed interface A permits I {}
+
+ private non-sealed interface B extends I {}
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.input
new file mode 100644
index 000000000..52d3c1226
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.input
@@ -0,0 +1,3 @@
+class SemicolonInClass {
+ ;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.output
new file mode 100644
index 000000000..52d3c1226
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SemicolonInClass.output
@@ -0,0 +1,3 @@
+class SemicolonInClass {
+ ;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.input
deleted file mode 100644
index 98a19bba7..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.input
+++ /dev/null
@@ -1,10 +0,0 @@
-public class StringTemplates {
- void test(){
- var m = STR."template \{example}xxx";
- var nested = STR."template \{example.foo()+ STR."templateInner\{example}"}xxx }";
- var nestNested = STR."template \{example0.
- foo() +
- STR."templateInner\{example1.test(STR."\{example2
- }")}"}xxx }";
- }
-}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.output
deleted file mode 100644
index e60bab70b..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/StringTemplate.output
+++ /dev/null
@@ -1,9 +0,0 @@
-public class StringTemplates {
- void test() {
- var m = STR."template \{example}xxx";
- var nested = STR."template \{example.foo() + STR."templateInner\{example}"}xxx }";
- var nestNested =
- STR."template \{
- example0.foo() + STR."templateInner\{example1.test(STR."\{example2}")}"}xxx }";
- }
-}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.input
new file mode 100644
index 000000000..f43acd351
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.input
@@ -0,0 +1,31 @@
+class T {
+ void f(String v) {
+ int x =
+ switch (v) {
+ // this is a line comment about "zero"
+ case "zero" -> 0;
+ case "one" ->
+ // this is a line comment about "one"
+ 1;
+ case "two" -> // this is a line comment about "two"
+ 2;
+ default -> -1;
+ };
+ }
+
+ void g(String v) {
+ int x =
+ switch (v) {
+ // this is a line comment about "zero"
+ case "zero":
+ return 0;
+ case "one":
+ // this is a line comment about "one"
+ return 1;
+ case "two": // this is a line comment about "two"
+ return 2;
+ default:
+ return -1;
+ };
+ }
+}
\ No newline at end of file
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.output
new file mode 100644
index 000000000..f1afa6484
--- /dev/null
+++ b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.output
@@ -0,0 +1,31 @@
+class T {
+ void f(String v) {
+ int x =
+ switch (v) {
+ // this is a line comment about "zero"
+ case "zero" -> 0;
+ case "one" ->
+ // this is a line comment about "one"
+ 1;
+ case "two" -> // this is a line comment about "two"
+ 2;
+ default -> -1;
+ };
+ }
+
+ void g(String v) {
+ int x =
+ switch (v) {
+ // this is a line comment about "zero"
+ case "zero":
+ return 0;
+ case "one":
+ // this is a line comment about "one"
+ return 1;
+ case "two": // this is a line comment about "two"
+ return 2;
+ default:
+ return -1;
+ };
+ }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.input
deleted file mode 100644
index 2d00d3300..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.input
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract class RSLs {
- abstract String f();
-
- String a = STR."""
- lorem
- foo\{ /** a method */ f( // line comment
- /* TODO */
- )}bar
- ipsum
- """;
-}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.output
deleted file mode 100644
index 36736724f..000000000
--- a/core/src/test/resources/com/google/googlejavaformat/java/testdata/TextBlockTemplates.output
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract class RSLs {
- abstract String f();
-
- String a =
- STR."""
- lorem
- foo\{
- /** a method */
- f( // line comment
- /* TODO */
- )}bar
- ipsum
- """;
-}
diff --git a/eclipse_plugin/META-INF/MANIFEST.MF b/eclipse_plugin/META-INF/MANIFEST.MF
index 913245393..12c9b58f2 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.23.0
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 b2c6e368a..0efe5b90a 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.23.0
Google Java Format Plugin for Eclipse 4.5+
diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts
index 05010fe3c..0ba5032dc 100644
--- a/idea_plugin/build.gradle.kts
+++ b/idea_plugin/build.gradle.kts
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-plugins { id("org.jetbrains.intellij") version "1.17.2" }
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+plugins { id("org.jetbrains.intellij") version "1.17.3" }
apply(plugin = "org.jetbrains.intellij")
@@ -22,7 +23,8 @@ apply(plugin = "java")
repositories { mavenCentral() }
-val googleJavaFormatVersion = "1.21.0"
+// https://github.com/google/google-java-format/releases
+val googleJavaFormatVersion = "1.22.0"
java {
sourceCompatibility = JavaVersion.VERSION_11
@@ -61,6 +63,8 @@ tasks {
dependencies {
implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}")
+ // https://mvnrepository.com/artifact/junit/junit
testImplementation("junit:junit:4.13.2")
+ // https://mvnrepository.com/artifact/com.google.truth/truth
testImplementation("com.google.truth:truth:1.4.2")
}
diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml
index c426a1ff1..378c2529c 100644
--- a/idea_plugin/src/main/resources/META-INF/plugin.xml
+++ b/idea_plugin/src/main/resources/META-INF/plugin.xml
@@ -35,6 +35,10 @@
]]>
+ 1.22.0.0
+ Updated to use google-java-format 1.22.0.
+ 1.21.0.0
+ Updated to use google-java-format 1.21.0.
1.20.0.0
Updated to use google-java-format 1.20.0.
1.19.2.0
diff --git a/pom.xml b/pom.xml
index 152fdfde2..b300a328f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
com.google.googlejavaformat
google-java-format-parent
pom
- HEAD-SNAPSHOT
+ 1.23.0
core
@@ -88,8 +88,8 @@
1.8
32.1.3-jre
1.4.0
- 0.3.0
- 2.16
+ 1.0.0
+ 2.28.0
1.9
1.0.1
3.6.3