spotlessApply

Author: nulls

lib/src/compatDiktat1Dot2Dot5/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat1Dot2Dot5Adapter.java

@@ -15,24 +15,23 @@
  */
 package com.diffplug.spotless.glue.diktat.compat;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
+
 import com.pinterest.ktlint.core.KtLint;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
-
 import com.pinterest.ktlint.core.api.EditorConfigOverride;
 
 import kotlin.Unit;
 import kotlin.jvm.functions.Function2;
 
-import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
-
-import javax.annotation.Nullable;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class DiktatCompat1Dot2Dot5Adapter implements DiktatCompatAdapter {
 	private final List<RuleSet> ruleSets;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
@@ -66,18 +65,18 @@ public Unit invoke(LintError lintError, Boolean corrected) {
 	public String format(final File file, final String content, final boolean isScript) {
 		errors.clear();
 		String result = KtLint.INSTANCE.format(new KtLint.ExperimentalParams(
-			// Unlike Ktlint, Diktat requires full path to the file.
-			// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
-			file.getAbsolutePath(),
-			content,
-			ruleSets,
-			Collections.emptyMap(),
-			formatterCallback,
-			isScript,
-			null,
-			false,
-			new EditorConfigOverride(),
-			false));
+				// Unlike Ktlint, Diktat requires full path to the file.
+				// See https://github.com/diffplug/spotless/issues/1189, https://github.com/analysis-dev/diktat/issues/1202
+				file.getAbsolutePath(),
+				content,
+				ruleSets,
+				Collections.emptyMap(),
+				formatterCallback,
+				isScript,
+				null,
+				false,
+				new EditorConfigOverride(),
+				false));
 
 		DiktatReporting.reportIfRequired(errors, LintError::getLine, LintError::getCol, LintError::getDetail);
 

lib/src/compatDiktat2Dot0Dot0/java/com/diffplug/spotless/glue/diktat/compat/DiktatCompat2Dot0Dot0Adapter.java

@@ -23,6 +23,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import com.saveourtool.diktat.DiktatFactoriesKt;
 import com.saveourtool.diktat.DiktatProcessor;
 import com.saveourtool.diktat.api.DiktatCallback;
@@ -32,9 +35,6 @@
 
 import kotlin.Unit;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 public class DiktatCompat2Dot0Dot0Adapter implements DiktatCompatAdapter {
 	private final DiktatProcessor processor;
 	private final DiktatCallback formatterCallback;

lib/src/compatDiktatApi/java/com/diffplug/spotless/glue/diktat/compat/DiktatReporting.java

@@ -26,11 +26,11 @@ static <T> void reportIfRequired(List<T> errors, ToIntFunction<T> lineGetter, To
 			error.append("There are ").append(errors.size()).append(" unfixed errors:");
 			for (T er : errors) {
 				error.append(System.lineSeparator())
-					.append("Error on line: ").append(lineGetter.applyAsInt(er))
-					.append(", column: ").append(columnGetter.applyAsInt(er))
-					.append(" cannot be fixed automatically")
-					.append(System.lineSeparator())
-					.append(detailGetter.apply(er));
+						.append("Error on line: ").append(lineGetter.applyAsInt(er))
+						.append(", column: ").append(columnGetter.applyAsInt(er))
+						.append(" cannot be fixed automatically")
+						.append(System.lineSeparator())
+						.append(detailGetter.apply(er));
 			}
 			throw new AssertionError(error);
 		}

lib/src/diktat/java/com/diffplug/spotless/glue/diktat/DiktatFormatterFunc.java

@@ -17,21 +17,19 @@
 
 import java.io.File;
 
+import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat1Dot2Dot5Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompat2Dot0Dot0Adapter;
 import com.diffplug.spotless.glue.diktat.compat.DiktatCompatAdapter;
 
-import com.diffplug.spotless.FormatterFunc;
-
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 	private final DiktatCompatAdapter adapter;
 	private final boolean isScript;
 
 	public DiktatFormatterFunc(
-		String version,
-		File configFile,
-		boolean isScript
-	) {
+			String version,
+			File configFile,
+			boolean isScript) {
 		if (version.startsWith("1.")) {
 			this.adapter = new DiktatCompat1Dot2Dot5Adapter(configFile);
 		} else {

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

@@ -97,10 +97,9 @@ FormatterFunc createFormat() throws Exception {
 			final File configFile = (config != null) ? config.getOnlyFile() : null;
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
 			Constructor<?> constructor = formatterFunc.getConstructor(
-				String.class,
-				File.class,
-				boolean.class
-			);
+					String.class,
+					File.class,
+					boolean.class);
 			return (FormatterFunc.NeedsFile) constructor.newInstance(versionDiktat, configFile, isScript);
 		}
 	}