Default EditorConfig path to ".editorconfig" in plugin-maven ktlint step

The default path was never set, which means that .editorconfig was never
picked up if not explicitly set.

Author: OlivierGenez

plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktlint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
+import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +44,12 @@ public class Ktlint implements FormatterStepFactory {
 	public FormatterStep newFormatterStep(final FormatterStepConfig stepConfig) {
 		String ktlintVersion = version != null ? version : KtLintStep.defaultVersion();
 		FileSignature configPath = null;
+		if (editorConfigPath == null) {
+			File defaultEditorConfig = new File(".editorconfig");
+			if (defaultEditorConfig.exists()) {
+				editorConfigPath = defaultEditorConfig.getPath();
+			}
+		}
 		if (editorConfigPath != null) {
 			configPath = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(editorConfigPath)));
 		}

plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,9 +50,9 @@ void testKtlintEditorConfigOverride() throws Exception {
 
 	@Test
 	void testReadCodeStyleFromEditorConfigFile() throws Exception {
-		setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
+		setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
 		writePomWithKotlinSteps("<ktlint/>");
-		checkKtlintOfficialStyle();
+		checkIntellijIdeaStyle();
 	}
 
 	@Test
@@ -87,4 +87,11 @@ private void checkKtlintOfficialStyle() throws Exception {
 		mavenRunner().withArguments("spotless:apply").runNoError();
 		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean");
 	}
+
+	private void checkIntellijIdeaStyle() throws Exception {
+		String path = "src/main/kotlin/Main.kt";
+		setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
+		mavenRunner().withArguments("spotless:apply").runNoError();
+		assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean");
+	}
 }

testlib/src/main/resources/kotlin/ktlint/experimentalEditorConfigOverride.intellijIdea.clean

@@ -0,0 +1,5 @@
+fun main() {
+    val list = listOf(
+        "hello",
+    )
+}