The KtLint formatters were reading from the File instead of the String, which clobbers the work of earlier steps.

Author: nedtwigg

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 DiffPlug
+ * Copyright 2023-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,6 +74,7 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
 			Map<String, Object> editorConfigOverrideMap) {
@@ -105,7 +106,7 @@ public String format(
 				editorConfig,
 				editorConfigOverride,
 				false)
-				.format(path, formatterCallback);
+				.format(unix, path, formatterCallback);
 	}
 
 	/**

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

@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
@@ -121,9 +122,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -146,13 +148,19 @@ public String format(
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
 				editorConfigOverride,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**

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

@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -83,9 +84,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -108,14 +110,20 @@ public String format(
 			editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath, RuleProviderKt.propertyTypes(allRuleProviders));
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
 				editorConfigOverride,
 				true,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**

lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java

@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.glue.ktlint.compat;
 
+import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
@@ -82,9 +83,10 @@ public Unit invoke(LintError lint, Boolean corrected) {
 
 	@Override
 	public String format(
+			String unix,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap) {
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException {
 		final FormatterCallback formatterCallback = new FormatterCallback();
 
 		Set<RuleProvider> allRuleProviders = ServiceLoader.load(RuleSetProviderV3.class, RuleSetProviderV3.class.getClassLoader())
@@ -103,13 +105,19 @@ public String format(
 					editorConfigOverrideMap);
 		}
 
+		// create Code and then set the content to match previous steps in the Spotless pipeline
+		Code code = Code.Companion.fromPath(path);
+		Field contentField = code.getClass().getDeclaredField("content");
+		contentField.setAccessible(true);
+		contentField.set(code, unix);
+
 		return new KtLintRuleEngine(
 				allRuleProviders,
 				editorConfig,
 				editorConfigOverride,
 				false,
 				path.getFileSystem())
-				.format(Code.Companion.fromPath(path), formatterCallback);
+				.format(code, formatterCallback);
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 DiffPlug
+ * Copyright 2022-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 public interface KtLintCompatAdapter {
 
 	String format(
+			String content,
 			Path path,
 			Path editorConfigPath,
-			Map<String, Object> editorConfigOverrideMap);
+			Map<String, Object> editorConfigOverrideMap) throws NoSuchFieldException, IllegalAccessException;
 }

lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,12 +60,13 @@ public KtlintFormatterFunc(
 	}
 
 	@Override
-	public String applyWithFile(String unix, File file) {
+	public String applyWithFile(String unix, File file) throws NoSuchFieldException, IllegalAccessException {
 		Path absoluteEditorConfigPath = null;
 		if (editorConfigPath != null) {
 			absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
 		}
 		return adapter.format(
+				unix,
 				file.toPath(),
 				absoluteEditorConfigPath,
 				editorConfigOverrideMap);