Skip to content

Commit f4c2a1d

Browse files
committed
EditorConfig: Use default path without checking (KtLint will check them anyway)
1 parent 5cd53a9 commit f4c2a1d

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,8 @@ public LicenseHeaderConfig licenseHeaderFile(Object licenseHeaderFile) {
6262
/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
6363
public KotlinFormatExtension ktlint(String version) throws IOException {
6464
Objects.requireNonNull(version);
65-
FileSignature editorConfigPath = null;
6665
File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
67-
if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
68-
editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
69-
}
66+
FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
7067
return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
7168
}
7269

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,8 @@ public KotlinGradleExtension(SpotlessExtension spotless) {
4747
/** Adds the specified version of <a href="https://github.com/pinterest/ktlint">ktlint</a>. */
4848
public KotlinFormatExtension ktlint(String version) throws IOException {
4949
Objects.requireNonNull(version, "version");
50-
FileSignature editorConfigPath = null;
5150
File defaultEditorConfig = getProject().getRootProject().file(".editorconfig");
52-
if (defaultEditorConfig.exists() && defaultEditorConfig.isFile()) {
53-
editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
54-
}
51+
FileSignature editorConfigPath = FileSignature.signAsList(defaultEditorConfig);
5552
return new KotlinFormatExtension(version, false, editorConfigPath, Collections.emptyMap(), Collections.emptyMap());
5653
}
5754

0 commit comments

Comments
 (0)