2.3.0-1.10.0-rc02-3

GuilhE · GuilhE · commit 21390d01ae3c · 2025-12-23T16:13:04.000Z
- Improves swiftformat from the output swift files
diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ public struct ComposeSimpleViewRepresentable: UIViewControllerRepresentable {
         ComposeSimpleViewUIViewController().make()
     }
 
-    func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+    func updateUIViewController(_: UIViewController, context _: Context) {
         // unused
     }
 }
@@ -167,7 +167,7 @@ public struct ComposeAdvancedViewRepresentable: UIViewControllerRepresentable {
         ComposeAdvancedViewUIViewController().make(callback: callback)
     }
 
-    func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+    func updateUIViewController(_: UIViewController, context _: Context) {
         ComposeAdvancedViewUIViewController().update(viewState: viewState)
     }
 }
diff --git a/kmp-composeuiviewcontroller-ksp/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/ksp/Processor.kt b/kmp-composeuiviewcontroller-ksp/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/ksp/Processor.kt
@@ -352,13 +352,13 @@ internal class Processor(
                     ${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.make($makeParametersParsed)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     // unused
                 }
             }
         """.trimIndent()
         val indentedCode = indentParameters(indentParameters(code, frameworks), letParameters)
-        val updatedCode = if (letParameters.isEmpty()) removeEmptyLineBetweenStructAndFunc(indentedCode) else indentedCode
+        val updatedCode = (if (letParameters.isEmpty()) removeEmptyLineBetweenStructAndFunc(indentedCode) else indentedCode).plus("\n")
         codeGenerator
             .createNewFile(
                 dependencies = Dependencies(true),
@@ -399,12 +399,12 @@ internal class Processor(
                     ${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.make($makeParametersParsed)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     ${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.update($stateParameterName: $stateParameterName)
                 }
             }
         """.trimIndent()
-        val updatedCode = indentParameters(indentParameters(code, frameworks), letParameters)
+        val updatedCode = indentParameters(indentParameters(code, frameworks), letParameters).plus("\n")
         codeGenerator
             .createNewFile(
                 dependencies = Dependencies(true),
diff --git a/kmp-composeuiviewcontroller-ksp/src/test/kotlin/composeuiviewcontroller/Templates.kt b/kmp-composeuiviewcontroller-ksp/src/test/kotlin/composeuiviewcontroller/Templates.kt
@@ -584,10 +584,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
         ${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.make(${params.joinToString(", ") { "${it.first}: ${it.first}" }})
     }
 
-    public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+    public func updateUIViewController(_: UIViewController, context _: Context) {
         // unused
     }
 }
+
 """.trimIndent()
 
         fun swiftRepresentableWithState(
@@ -607,10 +608,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.make()
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     ${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.update(state: state)
                 }
             }
+            
         """.trimIndent()
 
         fun swiftRepresentableWithExternalDependency(framework: String = DEFAULT_FRAMEWORK, functionName: String = "Screen") = """
@@ -625,10 +627,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ${functionName}UIViewController().make(data: data)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     // unused
                 }
             }
+            
         """.trimIndent()
 
         fun swiftRepresentableWithExternalDependencies(
@@ -648,10 +651,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ${functionName}UIViewController.shared.make(data: data)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     // unused
                 }
             }
+            
         """.trimIndent()
 
         fun swiftRepresentableWithObjCTypes(
@@ -686,10 +690,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ${functionName}UIViewController().make(callBackA: callBackA, callBackB: callBackB, callBackS: callBackS, callBackC: callBackC, callBackD: callBackD, callBackE: callBackE, callBackF: callBackF, callBackG: callBackG, callBackH: callBackH, callBackI: callBackI, callBackJ: callBackJ, callBackK: callBackK, callBackL: callBackL, callBackM: callBackM, callBackN: callBackN, callBackO: callBackO, callBackP: callBackP)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     ${functionName}UIViewController().update(state: state)
                 }
             }
+            
         """.trimIndent()
 
         fun swiftRepresentableWithSwiftExportTypes(
@@ -724,10 +729,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ${functionName}UIViewController.shared.make(callBackA: callBackA, callBackB: callBackB, callBackS: callBackS, callBackC: callBackC, callBackD: callBackD, callBackE: callBackE, callBackF: callBackF, callBackG: callBackG, callBackH: callBackH, callBackI: callBackI, callBackJ: callBackJ, callBackK: callBackK, callBackL: callBackL, callBackM: callBackM, callBackN: callBackN, callBackO: callBackO, callBackP: callBackP)
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     ${functionName}UIViewController.shared.update(state: state)
                 }
             }
+            
         """.trimIndent()
 
         fun swiftTypeAliasForExternalDependencies() = """
@@ -754,10 +760,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {
                     ScreenUIViewController().make()
                 }
 
-                public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {
+                public func updateUIViewController(_: UIViewController, context _: Context) {
                     // unused
                 }
             }
+            
         """.trimIndent()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public struct ComposeSimpleViewRepresentable: UIViewControllerRepresentable {`
`120`	`120`	`ComposeSimpleViewUIViewController().make()`
`121`	`121`	`}`
`122`	`122`
`123`		`- func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`123`	`+ func updateUIViewController(_: UIViewController, context _: Context) {`
`124`	`124`	`// unused`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -167,7 +167,7 @@ public struct ComposeAdvancedViewRepresentable: UIViewControllerRepresentable {`
`167`	`167`	`ComposeAdvancedViewUIViewController().make(callback: callback)`
`168`	`168`	`}`
`169`	`169`
`170`		`- func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`170`	`+ func updateUIViewController(_: UIViewController, context _: Context) {`
`171`	`171`	`ComposeAdvancedViewUIViewController().update(viewState: viewState)`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -352,13 +352,13 @@ internal class Processor(`
`352`	`352`	`${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.make($makeParametersParsed)`
`353`	`353`	`}`
`354`	`354`
`355`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`355`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`356`	`356`	`// unused`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`	`""".trimIndent()`
`360`	`360`	`val indentedCode = indentParameters(indentParameters(code, frameworks), letParameters)`
`361`		`- val updatedCode = if (letParameters.isEmpty()) removeEmptyLineBetweenStructAndFunc(indentedCode) else indentedCode`
	`361`	`+ val updatedCode = (if (letParameters.isEmpty()) removeEmptyLineBetweenStructAndFunc(indentedCode) else indentedCode).plus("\n")`
`362`	`362`	`codeGenerator`
`363`	`363`	`.createNewFile(`
`364`	`364`	`dependencies = Dependencies(true),`
`@@ -399,12 +399,12 @@ internal class Processor(`
`399`	`399`	`${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.make($makeParametersParsed)`
`400`	`400`	`}`
`401`	`401`
`402`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`402`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`403`	`403`	`${composable.name()}UIViewController${if (swiftExportEnabled) ".shared" else "()"}.update($stateParameterName: $stateParameterName)`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`	`""".trimIndent()`
`407`		`- val updatedCode = indentParameters(indentParameters(code, frameworks), letParameters)`
	`407`	`+ val updatedCode = indentParameters(indentParameters(code, frameworks), letParameters).plus("\n")`
`408`	`408`	`codeGenerator`
`409`	`409`	`.createNewFile(`
`410`	`410`	`dependencies = Dependencies(true),`
Original file line number	Diff line number	Diff line change
`@@ -584,10 +584,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`584`	`584`	`${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.make(${params.joinToString(", ") { "${it.first}: ${it.first}" }})`
`585`	`585`	`}`
`586`	`586`
`587`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`587`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`588`	`588`	`// unused`
`589`	`589`	`}`
`590`	`590`	`}`
	`591`	`+`
`591`	`592`	`""".trimIndent()`
`592`	`593`
`593`	`594`	`fun swiftRepresentableWithState(`
`@@ -607,10 +608,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`607`	`608`	`${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.make()`
`608`	`609`	`}`
`609`	`610`
`610`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`611`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`611`	`612`	`${functionName}UIViewController${if (isSharedInstance) ".shared" else "()"}.update(state: state)`
`612`	`613`	`}`
`613`	`614`	`}`
	`615`	`+`
`614`	`616`	`""".trimIndent()`
`615`	`617`
`616`	`618`	`fun swiftRepresentableWithExternalDependency(framework: String = DEFAULT_FRAMEWORK, functionName: String = "Screen") = """`
`@@ -625,10 +627,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`625`	`627`	`${functionName}UIViewController().make(data: data)`
`626`	`628`	`}`
`627`	`629`
`628`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`630`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`629`	`631`	`// unused`
`630`	`632`	`}`
`631`	`633`	`}`
	`634`	`+`
`632`	`635`	`""".trimIndent()`
`633`	`636`
`634`	`637`	`fun swiftRepresentableWithExternalDependencies(`
`@@ -648,10 +651,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`648`	`651`	`${functionName}UIViewController.shared.make(data: data)`
`649`	`652`	`}`
`650`	`653`
`651`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`654`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`652`	`655`	`// unused`
`653`	`656`	`}`
`654`	`657`	`}`
	`658`	`+`
`655`	`659`	`""".trimIndent()`
`656`	`660`
`657`	`661`	`fun swiftRepresentableWithObjCTypes(`
`@@ -686,10 +690,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`686`	`690`	`${functionName}UIViewController().make(callBackA: callBackA, callBackB: callBackB, callBackS: callBackS, callBackC: callBackC, callBackD: callBackD, callBackE: callBackE, callBackF: callBackF, callBackG: callBackG, callBackH: callBackH, callBackI: callBackI, callBackJ: callBackJ, callBackK: callBackK, callBackL: callBackL, callBackM: callBackM, callBackN: callBackN, callBackO: callBackO, callBackP: callBackP)`
`687`	`691`	`}`
`688`	`692`
`689`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`693`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`690`	`694`	`${functionName}UIViewController().update(state: state)`
`691`	`695`	`}`
`692`	`696`	`}`
	`697`	`+`
`693`	`698`	`""".trimIndent()`
`694`	`699`
`695`	`700`	`fun swiftRepresentableWithSwiftExportTypes(`
`@@ -724,10 +729,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`724`	`729`	`${functionName}UIViewController.shared.make(callBackA: callBackA, callBackB: callBackB, callBackS: callBackS, callBackC: callBackC, callBackD: callBackD, callBackE: callBackE, callBackF: callBackF, callBackG: callBackG, callBackH: callBackH, callBackI: callBackI, callBackJ: callBackJ, callBackK: callBackK, callBackL: callBackL, callBackM: callBackM, callBackN: callBackN, callBackO: callBackO, callBackP: callBackP)`
`725`	`730`	`}`
`726`	`731`
`727`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`732`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`728`	`733`	`${functionName}UIViewController.shared.update(state: state)`
`729`	`734`	`}`
`730`	`735`	`}`
	`736`	`+`
`731`	`737`	`""".trimIndent()`
`732`	`738`
`733`	`739`	`fun swiftTypeAliasForExternalDependencies() = """`
`@@ -754,10 +760,11 @@ public struct ${functionName}Representable: UIViewControllerRepresentable {`
`754`	`760`	`ScreenUIViewController().make()`
`755`	`761`	`}`
`756`	`762`
`757`		`- public func updateUIViewController(_ uiViewController: UIViewController, context _: Context) {`
	`763`	`+ public func updateUIViewController(_: UIViewController, context _: Context) {`
`758`	`764`	`// unused`
`759`	`765`	`}`
`760`	`766`	`}`
	`767`	`+`
`761`	`768`	`""".trimIndent()`
`762`	`769`	`}`
`763`	`770`