Skip to content

Commit 5f4417e

Browse files
eirnymeirnym
committed
EditorConfig: Using KtLintRuleEngine for KtLint 0.48.x
1 parent 03eae65 commit 5f4417e

File tree

8 files changed

+26
-31
lines changed

8 files changed

+26
-31
lines changed

‎lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
4343

4444
@Override
4545
public String format(final String text, Path path, final boolean isScript,
46-
final boolean useExperimental,
47-
String editorConfigPath, final Map<String, String> userData,
48-
final Map<String, Object> editorConfigOverrideMap) {
46+
final boolean useExperimental,
47+
String editorConfigPath, final Map<String, String> userData,
48+
final Map<String, Object> editorConfigOverrideMap) {
4949
final FormatterCallback formatterCallback = new FormatterCallback();
5050

5151
final List<RuleSet> rulesets = new ArrayList<>();

‎lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
4343

4444
@Override
4545
public String format(final String text, Path path, final boolean isScript,
46-
final boolean useExperimental,
47-
String editorConfigPath, final Map<String, String> userData,
48-
final Map<String, Object> editorConfigOverrideMap) {
46+
final boolean useExperimental,
47+
String editorConfigPath, final Map<String, String> userData,
48+
final Map<String, Object> editorConfigOverrideMap) {
4949
final FormatterCallback formatterCallback = new FormatterCallback();
5050

5151
final List<RuleSet> rulesets = new ArrayList<>();

‎lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
4343

4444
@Override
4545
public String format(final String text, Path path, final boolean isScript,
46-
final boolean useExperimental,
47-
String editorConfigPath, final Map<String, String> userData,
48-
final Map<String, Object> editorConfigOverrideMap) {
46+
final boolean useExperimental,
47+
String editorConfigPath, final Map<String, String> userData,
48+
final Map<String, Object> editorConfigOverrideMap) {
4949
final FormatterCallback formatterCallback = new FormatterCallback();
5050

5151
final List<RuleSet> rulesets = new ArrayList<>();

‎lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
5151

5252
@Override
5353
public String format(final String text, Path path, final boolean isScript,
54-
final boolean useExperimental,
55-
String editorConfigPath, final Map<String, String> userData,
56-
final Map<String, Object> editorConfigOverrideMap) {
54+
final boolean useExperimental,
55+
String editorConfigPath, final Map<String, String> userData,
56+
final Map<String, Object> editorConfigOverrideMap) {
5757
final FormatterCallback formatterCallback = new FormatterCallback();
5858

5959
final List<RuleSet> rulesets = new ArrayList<>();

‎lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
5151

5252
@Override
5353
public String format(final String text, Path path, final boolean isScript,
54-
final boolean useExperimental,
55-
String editorConfigPath, final Map<String, String> userData,
56-
final Map<String, Object> editorConfigOverrideMap) {
54+
final boolean useExperimental,
55+
String editorConfigPath, final Map<String, String> userData,
56+
final Map<String, Object> editorConfigOverrideMap) {
5757
final FormatterCallback formatterCallback = new FormatterCallback();
5858

5959
final List<RuleSet> rulesets = new ArrayList<>();

‎lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
5757

5858
@Override
5959
public String format(final String text, Path path, final boolean isScript,
60-
final boolean useExperimental,
61-
String editorConfigPath, final Map<String, String> userData,
62-
final Map<String, Object> editorConfigOverrideMap) {
60+
final boolean useExperimental,
61+
String editorConfigPath, final Map<String, String> userData,
62+
final Map<String, Object> editorConfigOverrideMap) {
6363
final FormatterCallback formatterCallback = new FormatterCallback();
6464

6565
Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.stream.Collectors;
2626
import java.util.stream.Stream;
2727

28-
import com.pinterest.ktlint.core.KtLint;
28+
import com.pinterest.ktlint.core.KtLintRuleEngine;
2929
import com.pinterest.ktlint.core.LintError;
3030
import com.pinterest.ktlint.core.Rule;
3131
import com.pinterest.ktlint.core.RuleProvider;
@@ -55,9 +55,9 @@ public Unit invoke(LintError lint, Boolean corrected) {
5555

5656
@Override
5757
public String format(final String text, Path path, final boolean isScript,
58-
final boolean useExperimental,
59-
String editorConfigPath, final Map<String, String> userData,
60-
final Map<String, Object> editorConfigOverrideMap) {
58+
final boolean useExperimental,
59+
String editorConfigPath, final Map<String, String> userData,
60+
final Map<String, Object> editorConfigOverrideMap) {
6161
final FormatterCallback formatterCallback = new FormatterCallback();
6262

6363
Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -81,17 +81,12 @@ public String format(final String text, Path path, final boolean isScript,
8181
} else {
8282
editorConfigFilePath = new File(editorConfigPath).toPath();
8383
}
84-
return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
85-
path.toFile().getAbsolutePath(),
86-
text,
84+
return new KtLintRuleEngine(
8785
allRuleProviders,
88-
userData,
89-
formatterCallback,
90-
isScript,
91-
false,
9286
EditorConfigDefaults.Companion.load(editorConfigFilePath),
9387
editorConfigOverride,
94-
false));
88+
false)
89+
.format(path, formatterCallback);
9590
}
9691

9792
/**

‎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, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
24-
Map<String, Object> editorConfigOverrideMap);
24+
Map<String, Object> editorConfigOverrideMap);
2525
}

0 commit comments

Comments
 (0)