Skip to content

Commit b18da45

Browse files
committed
EditorConfig: Set sane default for Gradle
1 parent bd93e17 commit b18da45

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.gradle.spotless;
1717

18+
import java.io.File;
1819
import java.io.IOException;
1920
import java.util.Collections;
2021
import java.util.Map;
@@ -43,12 +44,17 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
4344
}
4445

4546
/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
46-
public KotlinFormatExtension ktlint(String version) {
47+
public KotlinFormatExtension ktlint(String version) throws IOException {
4748
Objects.requireNonNull(version, "version");
48-
return new KotlinFormatExtension(version, false, null, Collections.emptyMap(), Collections.emptyMap());
49+
FileSignature editorConfigPath = null;
50+
File defaultEditorConfig = getProject().getRootProject().file(".editorConfig");
51+
if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
52+
editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
53+
}
54+
return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
4955
}
5056

51-
public KotlinFormatExtension ktlint() {
57+
public KotlinFormatExtension ktlint() throws IOException {
5258
return ktlint(KtLintStep.defaultVersion());
5359
}
5460

@@ -104,7 +110,7 @@ public KotlinFormatExtension editorConfigOverride(Map<String, Object> editorConf
104110
}
105111

106112
private FormatterStep createStep() {
107-
return KtLintStep.createForScript(version, provisioner(), useExperimental, userData, editorConfigOverride);
113+
return KtLintStep.createForScript(version, provisioner(), useExperimental, editorConfigPath, userData, editorConfigOverride);
108114
}
109115
}
110116

0 commit comments

Comments
 (0)