Allow selecting code style in Intellij plugin

changelog/@unreleased/pr-1256.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Allow selecting code style in Intellij plugin
+  links:
+    - https://github.com/palantir/palantir-java-format/pull/1256
+

idea-plugin/src/main/java/com/palantir/javaformat/intellij/FormatterProvider.java

@@ -33,6 +33,7 @@
 import com.palantir.javaformat.bootstrap.BootstrappingFormatterService;
 import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
 import com.palantir.javaformat.java.FormatterService;
+import com.palantir.javaformat.java.JavaFormatterOptions.Style;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -69,6 +70,7 @@ Optional<FormatterService> get(Project project, PalantirJavaFormatSettings setti
         return implementationCache.get(new FormatterCacheKey(
                 project,
                 getSdkVersion(project),
+                settings.getStyle(),
                 settings.getImplementationClassPath(),
                 settings.getNativeImageClassPath(),
                 settings.injectedVersionIsOutdated()));
@@ -93,7 +95,8 @@ private static Optional<FormatterService> createFormatter(FormatterCacheKey cach
                 jdkMajorVersion, ApplicationInfo.getInstance().getBuild())) {
             Path jdkPath = getJdkPath(cacheKey.project);
             log.info("Using bootstrapping formatter with jdk version {} and path: {}", jdkMajorVersion, jdkPath);
-            return Optional.of(new BootstrappingFormatterService(jdkPath, jdkMajorVersion, implementationClasspath));
+            return Optional.of(new BootstrappingFormatterService(
+                    jdkPath, jdkMajorVersion, implementationClasspath, cacheKey.style));
         }
 
         // Use "in-process" formatter service
@@ -214,18 +217,21 @@ private static List<Path> listDirAsUrlsUnchecked(Path dir) {
     private static final class FormatterCacheKey {
         private final Project project;
         private final OptionalInt jdkMajorVersion;
+        private final Style style;
         private final Optional<List<URI>> implementationClassPath;
         private final Optional<URI> nativeImageClassPath;
         private final boolean useBundledImplementation;
 
         FormatterCacheKey(
                 Project project,
                 OptionalInt jdkMajorVersion,
+                Style style,
                 Optional<List<URI>> implementationClassPath,
                 Optional<URI> nativeImageClassPath,
                 boolean useBundledImplementation) {
             this.project = project;
             this.jdkMajorVersion = jdkMajorVersion;
+            this.style = style;
             this.implementationClassPath = implementationClassPath;
             this.nativeImageClassPath = nativeImageClassPath;
             this.useBundledImplementation = useBundledImplementation;
@@ -243,14 +249,20 @@ public boolean equals(Object o) {
             return Objects.equals(jdkMajorVersion, that.jdkMajorVersion)
                     && useBundledImplementation == that.useBundledImplementation
                     && Objects.equals(project, that.project)
+                    && Objects.equals(style, that.style)
                     && Objects.equals(implementationClassPath, that.implementationClassPath)
                     && Objects.equals(nativeImageClassPath, that.nativeImageClassPath);
         }
 
         @Override
         public int hashCode() {
             return Objects.hash(
-                    project, jdkMajorVersion, implementationClassPath, nativeImageClassPath, useBundledImplementation);
+                    project,
+                    jdkMajorVersion,
+                    style,
+                    implementationClassPath,
+                    nativeImageClassPath,
+                    useBundledImplementation);
         }
     }
 }

idea-plugin/src/main/java/com/palantir/javaformat/intellij/UiFormatterStyle.java

@@ -24,6 +24,8 @@
 /** Configuration options for the formatting style. */
 enum UiFormatterStyle {
     PALANTIR("Default Palantir Java style", Style.PALANTIR),
+    GOOGLE("Default Google Java Style", Style.GOOGLE),
+    AOSP("AOSP-compliant Style", Style.AOSP),
     ;
 
     private final String description;

palantir-java-format-jdk-bootstrap/src/main/java/com/palantir/javaformat/bootstrap/BootstrappingFormatterService.java

@@ -25,6 +25,7 @@
 import com.google.common.collect.Range;
 import com.palantir.javaformat.java.FormatterException;
 import com.palantir.javaformat.java.FormatterService;
+import com.palantir.javaformat.java.JavaFormatterOptions.Style;
 import com.palantir.javaformat.java.Replacement;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -43,11 +44,18 @@ public final class BootstrappingFormatterService implements FormatterService {
     private final Path jdkPath;
     private final Integer jdkMajorVersion;
     private final List<Path> implementationClassPath;
+    private final Style style;
 
     public BootstrappingFormatterService(Path jdkPath, Integer jdkMajorVersion, List<Path> implementationClassPath) {
+        this(jdkPath, jdkMajorVersion, implementationClassPath, Style.PALANTIR);
+    }
+
+    public BootstrappingFormatterService(
+            Path jdkPath, Integer jdkMajorVersion, List<Path> implementationClassPath, Style style) {
         this.jdkPath = jdkPath;
         this.jdkMajorVersion = jdkMajorVersion;
         this.implementationClassPath = implementationClassPath;
+        this.style = style;
     }
 
     @Override
@@ -85,6 +93,7 @@ private ImmutableList<Replacement> getFormatReplacementsInternal(String input, C
                 .implementationClasspath(implementationClassPath)
                 .outputReplacements(true)
                 .characterRanges(ranges.stream().map(RangeUtils::toStringRange).collect(Collectors.toList()))
+                .style(style)
                 .build();
 
         Optional<String> output = FormatterCommandRunner.runWithStdin(command.toArgs(), input);
@@ -100,6 +109,7 @@ private String runFormatterCommand(String input) throws IOException {
                 .withJvmArgsForVersion(jdkMajorVersion)
                 .implementationClasspath(implementationClassPath)
                 .outputReplacements(false)
+                .style(style)
                 .build();
         return FormatterCommandRunner.runWithStdin(command.toArgs(), input).orElse(input);
     }
@@ -116,6 +126,8 @@ interface FormatterCliArgs {
 
         List<String> jvmArgs();
 
+        Style style();
+
         default List<String> toArgs() {
             ImmutableList.Builder<String> args = ImmutableList.<String>builder()
                     .add(jdkPath().toAbsolutePath().toString())
@@ -134,9 +146,16 @@ default List<String> toArgs() {
                 args.add("--output-replacements");
             }
 
+            switch (style()) {
+                case GOOGLE -> {}
+                case PALANTIR -> {
+                    args.add("--palantir");
+                }
+                case AOSP -> {
+                    args.add("--aosp");
+                }
+            }
             return args
-                    // Use palantir style
-                    .add("--palantir")
                     // Trailing "-" enables formatting stdin -> stdout
                     .add("-")
                     .build();