fix: add trailingCommaManagementStrategy support for maven plugin

Author: greyhairredbear

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

@@ -171,11 +171,12 @@ public KtfmtFormattingOptions(
 			@Nullable Integer blockIndent,
 			@Nullable Integer continuationIndent,
 			@Nullable Boolean removeUnusedImports,
-			@Nullable Boolean manageTrailingCommas) {
+			@Nullable TrailingCommaManagementStrategy trailingCommaManagementStrategy) {
 			this.maxWidth = maxWidth;
 			this.blockIndent = blockIndent;
 			this.continuationIndent = continuationIndent;
 			this.removeUnusedImports = removeUnusedImports;
+			this.trailingCommaManagementStrategy = trailingCommaManagementStrategy;
 		}
 
 		public void setMaxWidth(int maxWidth) {
@@ -280,9 +281,12 @@ FormatterFunc createFormat() throws Exception {
 			final Constructor<?> optionsConstructor = ktfmtFormattingOptionsClass.getConstructor(
 				Integer.class, Integer.class, Integer.class, Boolean.class, ktfmtTrailingCommaManagmentStrategyClass);
 
-			// TODO: use Enum.valueOf like for ktfmt style for trailing comma management strategy value
+			final Object ktfmtTrailingCommaManagementStrategy =
+				options.trailingCommaManagementStrategy == null
+					? null
+					: Enum.valueOf((Class<? extends Enum>) ktfmtTrailingCommaManagmentStrategyClass, options.trailingCommaManagementStrategy.name());
 			final Object ktfmtFormattingOptions = optionsConstructor.newInstance(
-				options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImports, options.trailingCommaManagementStrategy);
+				options.maxWidth, options.blockIndent, options.continuationIndent, options.removeUnusedImports, ktfmtTrailingCommaManagementStrategy);
 			if (style == null) {
 				final Constructor<?> constructor = formatterFuncClass.getConstructor(ktfmtFormattingOptionsClass);
 				return (FormatterFunc) constructor.newInstance(ktfmtFormattingOptions);
@@ -332,14 +336,14 @@ private void validateStyle() {
 		 */
 		private String getKtfmtStyleOption(Style style) {
 			switch (style) {
-			case META:
-				return "META";
-			case GOOGLE:
-				return "GOOGLE";
-			case KOTLINLANG:
-				return "KOTLIN_LANG";
-			default:
-				throw new IllegalStateException("Unsupported style: " + style);
+				case META:
+					return "META";
+				case GOOGLE:
+					return "GOOGLE";
+				case KOTLINLANG:
+					return "KOTLIN_LANG";
+				default:
+					throw new IllegalStateException("Unsupported style: " + style);
 			}
 		}
 	}

plugin-maven/README.md

@@ -473,7 +473,7 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T
   <blockIndent>4</blockIndent> <!-- optional -->
   <continuationIndent>8</continuationIndent> <!-- optional -->
   <removeUnusedImports>false</removeUnusedImports> <!-- optional -->
-  <manageTrailingCommas>true</manageTrailingCommas> <!-- optional -->
+  <trailingCommaManagementStrategy>COMPLETE</trailingCommaManagementStrategy> <!-- optional -->
 </ktfmt>
 ```
 

plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Ktfmt.java

@@ -21,6 +21,7 @@
 import com.diffplug.spotless.kotlin.KtfmtStep;
 import com.diffplug.spotless.kotlin.KtfmtStep.KtfmtFormattingOptions;
 import com.diffplug.spotless.kotlin.KtfmtStep.Style;
+import com.diffplug.spotless.kotlin.KtfmtStep.TrailingCommaManagementStrategy;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 
@@ -45,13 +46,13 @@ public class Ktfmt implements FormatterStepFactory {
 	private Boolean removeUnusedImports;
 
 	@Parameter
-	private Boolean manageTrailingCommas;
+	private TrailingCommaManagementStrategy trailingCommaManagementStrategy;
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		String version = this.version != null ? this.version : KtfmtStep.defaultVersion();
 		Style style = this.style != null ? Style.valueOf(this.style) : null;
-		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImports, manageTrailingCommas);
+		KtfmtFormattingOptions options = new KtfmtFormattingOptions(maxWidth, blockIndent, continuationIndent, removeUnusedImports, trailingCommaManagementStrategy);
 		return KtfmtStep.create(version, config.getProvisioner(), style, options);
 	}
 }

plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtfmtTest.java

@@ -74,9 +74,8 @@ void testKtfmtStyleWithMaxWidthOption() throws Exception {
 	}
 
 	@Test
-	// TODO
 	void testKtfmtWithManageTrailingCommasOption() throws Exception {
-		writePomWithKotlinSteps("<ktfmt><version>0.49</version><style>DROPBOX</style><manageTrailingCommas>true</manageTrailingCommas></ktfmt>");
+		writePomWithKotlinSteps("<ktfmt><version>0.49</version><style>DROPBOX</style><trailingCommaManagementStrategy>COMPLETE</trailingCommaManagementStrategy></ktfmt>");
 
 		setFile("src/main/kotlin/main.kt").toResource("kotlin/ktfmt/trailing-commas.dirty");
 		mavenRunner().withArguments("spotless:apply").runNoError();

testlib/src/main/resources/kotlin/ktfmt/continuation.clean

@@ -1,6 +1,8 @@
 fun myFunction() {
   val location =
       restTemplate.postForLocation(
-          "/v1/my-api", mapOf("name" to "some-name", "url" to "https://www.google.com"))
+          "/v1/my-api",
+          mapOf("name" to "some-name", "url" to "https://www.google.com"),
+      )
   return location
 }