Make KtfmtConfig.ConfigurableStyle#configure public

diffplug · Dec 2, 2023 · 5f840aa · 5f840aa
1 parent 28e948e
commit 5f840aa
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md
@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
 
 ## [6.23.2] - 2023-12-01
 ### Fixed

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
@@ -136,7 +136,7 @@ private FormatterStep createStep() {
 		}
 
 		public class ConfigurableStyle {
-			private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
+			public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
 				KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
 				optionsConfiguration.accept(ktfmtFormattingOptions);
 				options = ktfmtFormattingOptions;

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
@@ -45,21 +45,26 @@ void integrationDiktat() throws IOException {
 	}
 
 	@Test
-	void integrationKtfmt_dropboxStyle_0_19() throws IOException {
-		setFile("build.gradle").toLines(
+	void integrationKtfmtDropboxStyleWithPublicApi() throws IOException {
+		setFile("build.gradle.kts").toLines(
 				"plugins {",
-				"    id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
-				"    id 'com.diffplug.spotless'",
+				"    id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"",
+				"    id(\"com.diffplug.spotless\")",
 				"}",
 				"repositories { mavenCentral() }",
 				"spotless {",
 				"    kotlin {",
-				"        ktfmt('0.19').dropboxStyle()",
+				"        ktfmt().dropboxStyle().configure {",
+				"            it.setMaxWidth(4)",
+				"            it.setBlockIndent(4)",
+				"            it.setContinuationIndent(4)",
+				"            it.setRemoveUnusedImport(false)",
+				"        }",
 				"    }",
 				"}");
 		setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktfmt/basic.dirty");
 		gradleRunner().withArguments("spotlessApply").build();
-		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
+		assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropbox-style.clean");
 	}
 
 	@Test

diff --git a/testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean b/testlib/src/main/resources/kotlin/ktfmt/basic-dropbox-style.clean
@@ -0,0 +1,14 @@
+import a.*
+import a.b
+import a.b.c.*
+import kotlinx.android.synthetic.main.layout_name.*
+
+fun main() {
+    fun name() {
+        a()
+        return b
+    }
+    println(
+        ";")
+    println()
+}