From 48b95ac1876c16d6d4038f33ec61e01fae571862 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Fri, 23 Jul 2021 23:54:35 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../intellij/CodeStyleManagerDecorator.java | 4 +-- .../com/palantir/javaformat/OpsBuilder.java | 11 +++++++- .../com/palantir/javaformat/doc/Level.java | 11 +++++++- .../com/palantir/javaformat/doc/State.java | 27 ++++++++++++++++--- .../javaformat/java/InputMetadata.java | 2 ++ .../palantir/javaformat/java/JsonSink.java | 6 ++--- 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 7843bd141..be286dc77 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.2.1' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.2.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.5.0' - classpath 'com.palantir.baseline:gradle-baseline-java:3.96.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.7.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.0.0' diff --git a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java index 043a5a9f9..b7b403bd3 100644 --- a/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java +++ b/idea-plugin/src/main/java/com/palantir/javaformat/intellij/CodeStyleManagerDecorator.java @@ -167,8 +167,8 @@ public Indent zeroIndent() { } @Override - public void reformatNewlyAddedElement(ASTNode block, ASTNode addedElement) throws IncorrectOperationException { - delegate.reformatNewlyAddedElement(block, addedElement); + public void reformatNewlyAddedElement(ASTNode parent, ASTNode addedElement) throws IncorrectOperationException { + delegate.reformatNewlyAddedElement(parent, addedElement); } @Override diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java b/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java index c768ac467..242b687cd 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/OpsBuilder.java @@ -35,6 +35,10 @@ import com.palantir.javaformat.java.FormatterDiagnostic; import com.palantir.javaformat.java.InputMetadata; import com.palantir.javaformat.java.InputMetadataBuilder; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -494,8 +498,13 @@ private static int getI(Input.Token token) { private static final NonBreakingSpace SPACE = NonBreakingSpace.make(); - @Value.Immutable + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.SOURCE) @Value.Style(overshadowImplementation = true) + @interface OpsOutputStyle {} + + @OpsOutputStyle + @Value.Immutable public interface OpsOutput { ImmutableList ops(); diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java b/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java index be040e01a..7efab8a90 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/doc/Level.java @@ -36,6 +36,10 @@ import com.palantir.javaformat.doc.Obs.ExplorationNode; import com.palantir.javaformat.doc.Obs.LevelNode; import com.palantir.javaformat.doc.StartsWithBreakVisitor.Result; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -754,8 +758,13 @@ public String toString() { .toString(); } - @Value.Immutable + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.SOURCE) @Value.Style(overshadowImplementation = true) + @interface SplitsBreaksStyle {} + + @SplitsBreaksStyle + @Value.Immutable interface SplitsBreaks { /** Groups of {@link Doc}s that are children of the current {@link Level}, separated by {@link Break}s. */ ImmutableList> splits(); diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/doc/State.java b/palantir-java-format/src/main/java/com/palantir/javaformat/doc/State.java index e54d8bbb9..bae2ea024 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/doc/State.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/doc/State.java @@ -22,10 +22,16 @@ import com.palantir.javaformat.Indent; import fj.data.Set; import fj.data.TreeMap; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.immutables.value.Value; import org.immutables.value.Value.Parameter; /** State for writing. */ +// Automatically suppressed to unblock enforcement in new code +@SuppressWarnings("ImmutablesStyle") @Value.Immutable @Value.Style(overshadowImplementation = true) @JsonSerialize(as = ImmutableState.class) @@ -219,8 +225,13 @@ public static Builder builder() { return new Builder(); } - @Value.Immutable + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.SOURCE) @Value.Style(overshadowImplementation = true) + @interface BreakStateStyle {} + + @BreakStateStyle + @Value.Immutable @JsonSerialize(as = ImmutableBreakState.class) interface BreakState { @Parameter @@ -230,16 +241,26 @@ interface BreakState { int newIndent(); } - @Value.Immutable + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.SOURCE) @Value.Style(overshadowImplementation = true) + @interface LevelStateStyle {} + + @LevelStateStyle + @Value.Immutable interface LevelState { /** True if the entire {@link Level} fits on one line. */ @Parameter boolean oneLine(); } - @Value.Immutable + @Target(ElementType.TYPE) + @Retention(RetentionPolicy.SOURCE) @Value.Style(overshadowImplementation = true) + @interface TokStateStyle {} + + @TokStateStyle + @Value.Immutable interface TokState { @Parameter String text(); diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/InputMetadata.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/InputMetadata.java index 47c22dda4..815786b81 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/InputMetadata.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/InputMetadata.java @@ -26,6 +26,8 @@ * Records metadata about the input, namely existing blank lines that we might want to preserve, as well as what ranges * can be partially formatted. */ +// Automatically suppressed to unblock enforcement in new code +@SuppressWarnings("ImmutablesStyle") @Immutable @Value.Immutable @Value.Style(overshadowImplementation = true) diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java index 1c76d6079..87d7f7ecc 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JsonSink.java @@ -39,7 +39,7 @@ public final class JsonSink implements Sink { @Override public FinishExplorationNode startExplorationNode( - int explorationId, + int exporationId, OptionalInt parentLevelId, String humanDescription, int startColumn, @@ -51,13 +51,13 @@ public FinishExplorationNode startExplorationNode( json = rootNode = OBJECT_MAPPER.createObjectNode(); } json.put("type", "exploration"); - json.put("id", explorationId); + json.put("id", exporationId); parentLevelId.ifPresent(id -> json.put("parentId", id)); json.put("humanDescription", humanDescription); // The column where we started off this exploration. Necessary to correctly indent the level. json.put("startColumn", startColumn); incomingState.ifPresent(state -> json.set("incomingState", OBJECT_MAPPER.valueToTree(state))); - createChildrenNode(explorationId, json); + createChildrenNode(exporationId, json); return (parentLevel, newState) -> { ObjectNode resultNode = OBJECT_MAPPER.createObjectNode(); json.set("result", resultNode);