Excavator: Upgrades Baseline to the latest version

palantir · Jul 23, 2021 · 5330a7f · 5330a7f
1 parent 2c684ba
commit 5330a7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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.4.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
@@ -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/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);