Skip to content

Commit 1a19da1

Browse files
committed
Use older format function that doesn't load .editorconfig
1 parent 954e6b5 commit 1a19da1

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

lib/src/compatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1Adapter.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.diffplug.spotless.glue.ktlint.compat;
1717

18-
import java.nio.file.Paths;
1918
import java.util.ArrayList;
2019
import java.util.Collections;
2120
import java.util.LinkedHashSet;
@@ -26,7 +25,7 @@
2625
import java.util.stream.Collectors;
2726
import java.util.stream.Stream;
2827

29-
import com.pinterest.ktlint.core.KtLintRuleEngine;
28+
import com.pinterest.ktlint.core.KtLint;
3029
import com.pinterest.ktlint.core.LintError;
3130
import com.pinterest.ktlint.core.Rule;
3231
import com.pinterest.ktlint.core.RuleProvider;
@@ -99,10 +98,17 @@ public String format(final String text, final String name, final boolean isScrip
9998
editorConfigOverrideMap);
10099
}
101100

102-
EditorConfigDefaults editorConfigDefaults = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
103-
boolean isInvokedFromCli = false;
104-
KtLintRuleEngine ktLintRuleEngine = new KtLintRuleEngine(allRuleProviders, editorConfigDefaults, editorConfigOverride, isInvokedFromCli);
105-
return ktLintRuleEngine.format(text, Paths.get(name), formatterCallback);
101+
return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
102+
name,
103+
text,
104+
allRuleProviders,
105+
userData,
106+
formatterCallback,
107+
isScript,
108+
false,
109+
EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS(),
110+
editorConfigOverride,
111+
false));
106112
}
107113

108114
/**

lib/src/testCompatKtLint0Dot48Dot1/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot1AdapterTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public void testEditorConfigCanDisable(@TempDir Path path) throws IOException {
5555
Map<String, String> userData = new HashMap<>();
5656

5757
Map<String, Object> editorConfigOverrideMap = new HashMap<>();
58+
editorConfigOverrideMap.put("indent_style", "tab");
5859
editorConfigOverrideMap.put("ktlint_standard_no-semi", "disabled");
5960

6061
String formatted = KtLintCompat0Dot48Dot1Adapter.format(text, "fails_no_semicolons.kt", false, false, userData, editorConfigOverrideMap);

testlib/src/test/java/com/diffplug/spotless/kotlin/KtLintStepTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@ void works0_47_1() {
129129
"Wildcard import");
130130
}
131131

132+
@Test
133+
void works0_48_0() {
134+
FormatterStep step = KtLintStep.create("0.48.0", TestProvisioner.mavenCentral());
135+
StepHarnessWithFile.forStep(this, step)
136+
.testResource("kotlin/ktlint/basic.dirty", "kotlin/ktlint/basic.clean")
137+
.testResourceExceptionMsg("kotlin/ktlint/unsolvable.dirty").isEqualTo("Error on line: 1, column: 1\n" +
138+
"rule: no-wildcard-imports\n" +
139+
"Wildcard import");
140+
}
141+
132142
@Test
133143
void works0_48_1() {
134144
FormatterStep step = KtLintStep.create("0.48.1", TestProvisioner.mavenCentral());

0 commit comments

Comments
 (0)