Upgrade diktat to 1.2.0

Author: nulls

lib/build.gradle

@@ -51,7 +51,7 @@ dependencies {
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-experimental:$VER_KTLINT"
 	ktlintCompileOnly "com.pinterest.ktlint:ktlint-ruleset-standard:$VER_KTLINT"
 
-	String VER_DIKTAT = "1.1.0"
+	String VER_DIKTAT = "1.2.0"
 	diktatCompileOnly "org.cqfn.diktat:diktat-rules:$VER_DIKTAT"
 
 	// used for markdown formatting

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

@@ -20,8 +20,8 @@
 
 import org.cqfn.diktat.ruleset.rules.DiktatRuleSetProvider;
 
+import com.pinterest.ktlint.core.api.EditorConfigOverride;
 import com.pinterest.ktlint.core.KtLint;
-import com.pinterest.ktlint.core.KtLint.Params;
 import com.pinterest.ktlint.core.LintError;
 import com.pinterest.ktlint.core.RuleSet;
 
@@ -33,15 +33,13 @@
 public class DiktatFormatterFunc implements FormatterFunc.NeedsFile {
 
 	private final List<RuleSet> rulesets;
-	private final Map<String, String> userData;
 	private final Function2<? super LintError, ? super Boolean, Unit> formatterCallback;
 	private final boolean isScript;
 
 	private final ArrayList<LintError> errors = new ArrayList<>();
 
-	public DiktatFormatterFunc(boolean isScript, Map<String, String> userData) {
+	public DiktatFormatterFunc(boolean isScript) {
 		rulesets = Collections.singletonList(new DiktatRuleSetProvider().get());
-		this.userData = userData;
 		this.formatterCallback = new FormatterCallback(errors);
 		this.isScript = isScript;
 	}
@@ -65,17 +63,18 @@ public Unit invoke(LintError lintError, Boolean corrected) {
 	@Override
 	public String applyWithFile(String unix, File file) throws Exception {
 		errors.clear();
-		userData.put("file_path", file.getAbsolutePath());
-		String result = KtLint.INSTANCE.format(new Params(
+		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(),
 				unix,
 				rulesets,
-				userData,
+				Collections.emptyMap(),
 				formatterCallback,
 				isScript,
 				null,
+				false,
+				new EditorConfigOverride(),
 				false));
 
 		if (!errors.isEmpty()) {

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

@@ -30,7 +30,7 @@ public class DiktatStep {
 	// prevent direct instantiation
 	private DiktatStep() {}
 
-	private static final String DEFAULT_VERSION = "1.1.0";
+	private static final String DEFAULT_VERSION = "1.2.0";
 	static final String NAME = "diktat";
 	static final String PACKAGE_DIKTAT = "org.cqfn.diktat";
 	static final String MAVEN_COORDINATE = PACKAGE_DIKTAT + ":diktat-rules:";
@@ -44,30 +44,22 @@ public static FormatterStep create(Provisioner provisioner) {
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner) {
-		return create(versionDiktat, provisioner, Collections.emptyMap(), null);
+		return create(versionDiktat, provisioner, null);
 	}
 
 	public static FormatterStep create(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, Collections.emptyMap(), config);
-	}
-
-	public static FormatterStep create(String versionDiktat, Provisioner provisioner, Map<String, String> userData, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, false, userData, config);
+		return create(versionDiktat, provisioner, false, config);
 	}
 
 	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, @Nullable FileSignature config) {
-		return createForScript(versionDiktat, provisioner, Collections.emptyMap(), config);
-	}
-
-	public static FormatterStep createForScript(String versionDiktat, Provisioner provisioner, Map<String, String> userData, @Nullable FileSignature config) {
-		return create(versionDiktat, provisioner, true, userData, config);
+		return create(versionDiktat, provisioner, true, config);
 	}
 
-	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, Map<String, String> userData, @Nullable FileSignature config) {
+	public static FormatterStep create(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) {
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
 		return FormatterStep.createLazy(NAME,
-				() -> new DiktatStep.State(versionDiktat, provisioner, isScript, userData, config),
+				() -> new DiktatStep.State(versionDiktat, provisioner, isScript, config),
 				DiktatStep.State::createFormat);
 	}
 
@@ -79,14 +71,12 @@ static final class State implements Serializable {
 		private final boolean isScript;
 		private final @Nullable FileSignature config;
 		final JarState jar;
-		private final TreeMap<String, String> userData;
 
-		State(String versionDiktat, Provisioner provisioner, boolean isScript, Map<String, String> userData, @Nullable FileSignature config) throws IOException {
+		State(String versionDiktat, Provisioner provisioner, boolean isScript, @Nullable FileSignature config) throws IOException {
 
 			HashSet<String> pkgSet = new HashSet<>();
 			pkgSet.add(MAVEN_COORDINATE + versionDiktat);
 
-			this.userData = new TreeMap<>(userData);
 			this.jar = JarState.from(pkgSet, provisioner);
 			this.isScript = isScript;
 			this.config = config;
@@ -98,8 +88,8 @@ FormatterFunc createFormat() throws Exception {
 			}
 
 			Class<?> formatterFunc = jar.getClassLoader().loadClass("com.diffplug.spotless.glue.diktat.DiktatFormatterFunc");
-			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class, Map.class);
-			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript, userData);
+			Constructor<?> constructor = formatterFunc.getConstructor(boolean.class);
+			return (FormatterFunc.NeedsFile) constructor.newInstance(isScript);
 		}
 	}
 }