#394 Move mapping of formatter options to KtfmtWorker, so that it is …

…the only class accessing ktfmt directly
cortinico · Jan 17, 2025 · 33eacf1 · 33eacf1
1 parent e6187d2
commit 33eacf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 44 deletions.
diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts
@@ -56,10 +56,6 @@ dependencies {
     testImplementation(platform(libs.junit.bom))
     testImplementation(libs.jupiter)
     testImplementation(libs.truth)
-
-    testImplementation(libs.ktfmt){
-        isTransitive = false
-    }
 }
 
 @Suppress("UnstableApiUsage")

diff --git a/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/tasks/worker/KtfmtWorkAction.kt b/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/tasks/worker/KtfmtWorkAction.kt
@@ -103,14 +103,14 @@ internal abstract class KtfmtWorkAction : WorkAction<KtfmtWorkAction.KtfmtWorkPa
 
         return sourceFile.canonicalFile !in includedFiles
     }
-}
 
-internal fun FormattingOptionsBean.toFormattingOptions(): FormattingOptions =
-    FormattingOptions(
-        maxWidth = maxWidth,
-        blockIndent = blockIndent,
-        continuationIndent = continuationIndent,
-        removeUnusedImports = removeUnusedImports,
-        manageTrailingCommas = manageTrailingCommas,
-        debuggingPrintOpsAfterFormatting = debuggingPrintOpsAfterFormatting,
-    )
+    private fun FormattingOptionsBean.toFormattingOptions(): FormattingOptions =
+        FormattingOptions(
+            maxWidth = maxWidth,
+            blockIndent = blockIndent,
+            continuationIndent = continuationIndent,
+            removeUnusedImports = removeUnusedImports,
+            manageTrailingCommas = manageTrailingCommas,
+            debuggingPrintOpsAfterFormatting = debuggingPrintOpsAfterFormatting,
+        )
+}
diff --git a/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/FormattingOptionsBeanTest.kt b/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/FormattingOptionsBeanTest.kt