Skip to content

Commit 8469300

Browse files
committed
Refine styles
1 parent 0bd1d06 commit 8469300

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

lib/src/ktlint/java/com/diffplug/spotless/glue/ktlint/KtlintFormatterFunc.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424
import com.diffplug.spotless.glue.ktlint.compat.*;
2525

2626
public class KtlintFormatterFunc implements FormatterFunc.NeedsFile {
27-
2827
private final KtLintCompatAdapter adapter;
2928
private final FileSignature editorConfigPath;
3029
private final Map<String, Object> editorConfigOverrideMap;
3130

32-
public KtlintFormatterFunc(String version, FileSignature editorConfigPath,
31+
public KtlintFormatterFunc(
32+
String version,
33+
FileSignature editorConfigPath,
3334
Map<String, Object> editorConfigOverrideMap) {
3435
String[] versions = version.split("\\.");
3536
int majorVersion = Integer.parseInt(versions[0]);
@@ -64,6 +65,9 @@ public String applyWithFile(String unix, File file) {
6465
if (editorConfigPath != null) {
6566
absoluteEditorConfigPath = editorConfigPath.getOnlyFile().toPath();
6667
}
67-
return adapter.format(file.toPath(), absoluteEditorConfigPath, editorConfigOverrideMap);
68+
return adapter.format(
69+
file.toPath(),
70+
absoluteEditorConfigPath,
71+
editorConfigOverrideMap);
6872
}
6973
}

lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public class KtLintStep {
3737
private KtLintStep() {}
3838

3939
private static final String DEFAULT_VERSION = "1.0.1";
40-
static final String NAME = "ktlint";
41-
static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
42-
static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
40+
private static final String NAME = "ktlint";
41+
private static final String MAVEN_COORDINATE_0_DOT = "com.pinterest:ktlint:";
42+
private static final String MAVEN_COORDINATE_1_DOT = "com.pinterest.ktlint:ktlint-cli:";
4343

4444
public static FormatterStep create(Provisioner provisioner) {
4545
return create(defaultVersion(), provisioner);
@@ -67,7 +67,7 @@ public static String defaultVersion() {
6767
static final class State implements Serializable {
6868
private static final long serialVersionUID = 1L;
6969
/** The jar that contains the formatter. */
70-
final JarState jarState;
70+
private final JarState jarState;
7171
private final TreeMap<String, Object> editorConfigOverride;
7272
private final String version;
7373
@Nullable

0 commit comments

Comments
 (0)