Skip to content

Commit c0bee92

Browse files
committed
Fix formatting
1 parent 269b90a commit c0bee92

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
7878

7979
@Override
8080
public String format(final String text, Path path, final boolean isScript,
81-
Path editorConfigPath, final Map<String, String> userData,
81+
Path editorConfigPath, final Map<String, String> userData,
8282
final Map<String, Object> editorConfigOverrideMap) {
8383
final FormatterCallback formatterCallback = new FormatterCallback();
8484

8585
Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV2.class, RuleSetProviderV2.class.getClassLoader())
86-
.stream()
87-
.flatMap(loader -> loader.get().getRuleProviders().stream())
88-
.collect(Collectors.toUnmodifiableSet());
86+
.stream()
87+
.flatMap(loader -> loader.get().getRuleProviders().stream())
88+
.collect(Collectors.toUnmodifiableSet());
8989

9090
EditorConfigOverride editorConfigOverride;
9191
if (editorConfigOverrideMap.isEmpty()) {
@@ -108,7 +108,7 @@ public String format(final String text, Path path, final boolean isScript,
108108
editorConfig,
109109
editorConfigOverride,
110110
false)
111-
.format(path, formatterCallback);
111+
.format(path, formatterCallback);
112112
}
113113

114114
/**

lib/src/compatKtLint0Dot49Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot49Dot0Adapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
123123

124124
@Override
125125
public String format(final String text, Path path, final boolean isScript,
126-
Path editorConfigPath, final Map<String, String> userData,
126+
Path editorConfigPath, final Map<String, String> userData,
127127
final Map<String, Object> editorConfigOverrideMap) {
128128
final FormatterCallback formatterCallback = new FormatterCallback();
129129

130130
Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
131-
.stream()
132-
.flatMap(loader -> loader.get().getRuleProviders().stream())
133-
.collect(Collectors.toUnmodifiableSet());
131+
.stream()
132+
.flatMap(loader -> loader.get().getRuleProviders().stream())
133+
.collect(Collectors.toUnmodifiableSet());
134134

135135
EditorConfigOverride editorConfigOverride;
136136
if (editorConfigOverrideMap.isEmpty()) {

lib/src/compatKtLint0Dot50Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot50Dot0Adapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ public Unit invoke(LintError lint, Boolean corrected) {
8585

8686
@Override
8787
public String format(final String text, Path path, final boolean isScript,
88-
Path editorConfigPath, final Map<String, String> userData,
88+
Path editorConfigPath, final Map<String, String> userData,
8989
final Map<String, Object> editorConfigOverrideMap) {
9090
final FormatterCallback formatterCallback = new FormatterCallback();
9191

9292
Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
93-
.stream()
94-
.flatMap(loader -> loader.get().getRuleProviders().stream())
95-
.collect(Collectors.toUnmodifiableSet());
93+
.stream()
94+
.flatMap(loader -> loader.get().getRuleProviders().stream())
95+
.collect(Collectors.toUnmodifiableSet());
9696

9797
EditorConfigOverride editorConfigOverride;
9898
if (editorConfigOverrideMap.isEmpty()) {

lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
public interface KtLintCompatAdapter {
2222

2323
String format(String text, Path path, boolean isScript, Path editorConfigPath, Map<String, String> userData,
24-
Map<String, Object> editorConfigOverrideMap);
24+
Map<String, Object> editorConfigOverrideMap);
2525
}

lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static FormatterStep create(String version, Provisioner provisioner) {
5050
}
5151

5252
public static FormatterStep create(String version, Provisioner provisioner,
53-
Map<String, String> userData, Map<String, Object> editorConfigOverride) {
53+
Map<String, String> userData, Map<String, Object> editorConfigOverride) {
5454
return create(version, provisioner, false, null, userData, editorConfigOverride);
5555
}
5656

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class KotlinFormatExtension {
7777
private Map<String, Object> editorConfigOverride;
7878

7979
KotlinFormatExtension(String version, @Nullable FileSignature editorConfigPath, Map<String, String> config,
80-
Map<String, Object> editorConfigOverride) {
80+
Map<String, Object> editorConfigOverride) {
8181
this.version = version;
8282
this.editorConfigPath = editorConfigPath;
8383
this.userData = config;

0 commit comments

Comments
 (0)