EditorConfig: pass Path to an implementation

eirnym · eirnym · commit 5cd53a9bb9fa · 2023-01-05T16:27:15.000+01:00
diff --git a/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java b/lib/src/compatKtLint0Dot31Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot31Dot0Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java b/lib/src/compatKtLint0Dot32Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot32Dot0Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
diff --git a/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java b/lib/src/compatKtLint0Dot34Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot34Dot2Adapter.java
@@ -44,7 +44,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -62,7 +62,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false));
 	}
 }
diff --git a/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java b/lib/src/compatKtLint0Dot45Dot2/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot45Dot2Adapter.java
@@ -52,7 +52,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java b/lib/src/compatKtLint0Dot46Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot46Dot0Adapter.java
@@ -52,7 +52,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath,
+				editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));
diff --git a/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java b/lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java
@@ -17,7 +17,6 @@
 
 import static java.util.Collections.emptySet;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -58,7 +57,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -77,12 +76,7 @@ public String format(final String text, Path path, final boolean isScript,
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-		Path editorConfigFilePath;
-		if (editorConfigPath == null) {
-			editorConfigFilePath = null;
-		} else {
-			editorConfigFilePath = new File(editorConfigPath).toPath();
-		}
+
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
 				path.toFile().getAbsolutePath(),
 				text,
@@ -93,7 +87,7 @@ public String format(final String text, Path path, final boolean isScript,
 				isScript,
 				null,
 				false,
-				EditorConfigDefaults.Companion.load(editorConfigFilePath),
+				EditorConfigDefaults.Companion.load(editorConfigPath),
 				editorConfigOverride,
 				false));
 	}
diff --git a/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java b/lib/src/compatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0Adapter.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -56,7 +55,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	@Override
 	public String format(final String text, Path path, final boolean isScript,
 			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
+			Path editorConfigPath, final Map<String, String> userData,
 			final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
@@ -75,15 +74,10 @@ public String format(final String text, Path path, final boolean isScript,
 							Collectors.toList()),
 					editorConfigOverrideMap);
 		}
-		Path editorConfigFilePath;
-		if (editorConfigPath == null) {
-			editorConfigFilePath = null;
-		} else {
-			editorConfigFilePath = new File(editorConfigPath).toPath();
-		}
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
-				EditorConfigDefaults.Companion.load(editorConfigFilePath),
+				EditorConfigDefaults.Companion.load(editorConfigPath),
 				editorConfigOverride,
 				false)
 						.format(path, formatterCallback);
diff --git a/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java b/lib/src/compatKtLintApi/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompatAdapter.java
@@ -20,6 +20,6 @@
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, Path path, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
+	String format(String text, Path path, boolean isScript, boolean useExperimental, Path editorConfigPath, Map<String, String> userData,
 			Map<String, Object> editorConfigOverrideMap);
 }
diff --git a/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java b/lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java
@@ -16,6 +16,7 @@
 package com.diffplug.spotless.glue.ktlint;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.Map;
 
 import org.jetbrains.annotations.NotNull;
@@ -69,9 +70,9 @@ public KtlintFormatterFunc(String version, boolean isScript, boolean useExperime
 	@Override
 	public String applyWithFile(String unix, File file) {
 
-		String absoluteEditorConfigPath = null;
+		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
-			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
+			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
 		return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@`
`20`	`20`
`21`	`21`	`public interface KtLintCompatAdapter {`
`22`	`22`
`23`		`- String format(String text, Path path, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,`
	`23`	`+ String format(String text, Path path, boolean isScript, boolean useExperimental, Path editorConfigPath, Map<String, String> userData,`
`24`	`24`	`Map<String, Object> editorConfigOverrideMap);`
`25`	`25`	`}`