Skip to content

Commit 5db9d64

Browse files
committed
Use Files.exists, make code more consistent
* Use java.nio.file.Files.exists to be consistent * Use empty empty EditorConfigDefaults settings for KtLint 0.47 and 0.48 when possible
1 parent 920cdcc commit 5db9d64

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

lib/src/compatKtLint0Dot47Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot47Dot0Adapter.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static java.util.Collections.emptySet;
1919

20+
import java.nio.file.Files;
2021
import java.nio.file.Path;
2122
import java.util.ArrayList;
2223
import java.util.LinkedHashSet;
@@ -77,6 +78,13 @@ public String format(final String text, Path path, final boolean isScript,
7778
editorConfigOverrideMap);
7879
}
7980

81+
EditorConfigDefaults editorConfig;
82+
if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
83+
editorConfig = EditorConfigDefaults.Companion.getEmptyEditorConfigDefaults();
84+
} else {
85+
editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);
86+
}
87+
8088
return KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
8189
path.toFile().getAbsolutePath(),
8290
text,
@@ -87,7 +95,7 @@ public String format(final String text, Path path, final boolean isScript,
8795
isScript,
8896
null,
8997
false,
90-
EditorConfigDefaults.Companion.load(editorConfigPath),
98+
editorConfig,
9199
editorConfigOverride,
92100
false));
93101
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
*/
1616
package com.diffplug.spotless.glue.ktlint.compat;
1717

18+
import java.nio.file.Path;
19+
import java.nio.file.Files;
1820
import java.util.ArrayList;
1921
import java.util.Collections;
20-
import java.nio.file.Path;
2122
import java.util.LinkedHashSet;
2223
import java.util.List;
2324
import java.util.Map;
@@ -99,7 +100,7 @@ public String format(final String text, Path path, final boolean isScript,
99100
editorConfigOverrideMap);
100101
}
101102
EditorConfigDefaults editorConfig;
102-
if (editorConfigPath == null || !editorConfigPath.toFile().exists()) {
103+
if (editorConfigPath == null || !Files.exists(editorConfigPath)) {
103104
editorConfig = EditorConfigDefaults.Companion.getEMPTY_EDITOR_CONFIG_DEFAULTS();
104105
} else {
105106
editorConfig = EditorConfigDefaults.Companion.load(editorConfigPath);

lib/src/testCompatKtLint0Dot48Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat0Dot48Dot0AdapterTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static org.junit.jupiter.api.Assertions.assertEquals;
1919

20-
import java.io.File;
2120
import java.io.IOException;
2221
import java.io.InputStream;
2322
import java.nio.charset.StandardCharsets;

0 commit comments

Comments
 (0)