Missing from #1442 - NPE's in older adapters.

nedtwigg · nedtwigg · commit 77b77f7b2e7b · 2023-01-09T12:43:57.000-08:00
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
@@ -62,7 +62,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : 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
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : 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
@@ -77,7 +77,7 @@ public String format(final String text, Path path, final boolean isScript,
 				userData,
 				formatterCallback,
 				isScript,
-				editorConfigPath.toFile().getAbsolutePath(),
+				editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),
 				false,
 				editorConfigOverride,
 				false));

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public String format(final String text, Path path, final boolean isScript,`
`62`	`62`	`userData,`
`63`	`63`	`formatterCallback,`
`64`	`64`	`isScript,`
`65`		`- editorConfigPath.toFile().getAbsolutePath(),`
	`65`	`+ editorConfigPath == null ? null : editorConfigPath.toFile().getAbsolutePath(),`
`66`	`66`	`false));`
`67`	`67`	`}`
`68`	`68`	`}`