EditorConfig: Use Path for files for KtLint

eirnym · eirnym · commit 03eae65e91b8 · 2023-01-05T16:27:06.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
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
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
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
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
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -55,7 +56,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.Params(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
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
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,10 +50,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -70,7 +71,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
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
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,10 +50,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		final List<RuleSet> rulesets = new ArrayList<>();
@@ -70,7 +71,7 @@ public String format(final String text, final String name, final boolean isScrip
 		}
 
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				rulesets,
 				userData,
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
@@ -56,10 +56,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -84,7 +84,7 @@ public String format(final String text, final String name, final boolean isScrip
 			editorConfigFilePath = new File(editorConfigPath).toPath();
 		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				emptySet(),
 				allRuleProviders,
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
@@ -54,10 +54,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 	}
 
 	@Override
-	public String format(final String text, final String name, final boolean isScript,
-			final boolean useExperimental,
-			String editorConfigPath, final Map<String, String> userData,
-			final Map<String, Object> editorConfigOverrideMap) {
+	public String format(final String text, Path path, final boolean isScript,
+						 final boolean useExperimental,
+						 String editorConfigPath, final Map<String, String> userData,
+						 final Map<String, Object> editorConfigOverrideMap) {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = new LinkedHashSet<>(
@@ -82,7 +82,7 @@ public String format(final String text, final String name, final boolean isScrip
 			editorConfigFilePath = new File(editorConfigPath).toPath();
 		}
 		return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-				name,
+				path.toFile().getAbsolutePath(),
 				text,
 				allRuleProviders,
 				userData,
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
@@ -15,10 +15,11 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.nio.file.Path;
 import java.util.Map;
 
 public interface KtLintCompatAdapter {
 
-	String format(String text, String name, boolean isScript, boolean useExperimental, String editorConfigPath, Map<String, String> userData,
-			Map<String, Object> editorConfigOverrideMap);
+	String format(String text, Path path, boolean isScript, boolean useExperimental, String 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
@@ -73,6 +73,6 @@ public String applyWithFile(String unix, File file) {
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();
 		}
-		return adapter.format(unix, file.getAbsolutePath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
+		return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ public String applyWithFile(String unix, File file) {`
`73`	`73`	`if (editorConfigPath != null) {`
`74`	`74`	`absoluteEditorConfigPath = editorConfigPath.getOnlyFile().getAbsolutePath();`
`75`	`75`	`}`
`76`		`- return adapter.format(unix, file.getAbsolutePath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);`
	`76`	`+ return adapter.format(unix, file.toPath(), isScript, useExperimental, absoluteEditorConfigPath, userData, editorConfigOverrideMap);`
`77`	`77`	`}`
`78`	`78`	`}`