Skip to content

Commit

Permalink
Accidentally bonked this during a merge conflict resolution.
Browse files Browse the repository at this point in the history
  • Loading branch information
nedtwigg committed May 29, 2024
1 parent ac05b58 commit a0f39d2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/src/main/java/com/diffplug/spotless/FormatterStep.java
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
static <State extends Serializable> FormatterStep createLazy(
String name,
ThrowingEx.Supplier<State> stateSupplier,
SerializedFunction<State, FormatterFunc> stateToFormatter) {
return createLazy(name, stateSupplier, SerializedFunction.identity(), stateToFormatter);
ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
return new FormatterStepImpl.Standard<>(name, stateSupplier, stateToFormatter);
}

/**
Expand All @@ -168,7 +168,7 @@ static <State extends Serializable> FormatterStep createLazy(
static <State extends Serializable> FormatterStep create(
String name,
State state,
SerializedFunction<State, FormatterFunc> stateToFormatter) {
ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
Objects.requireNonNull(state, "state");
return createLazy(name, () -> state, stateToFormatter);
}
Expand Down

0 comments on commit a0f39d2

Please sign in to comment.