From 1f6b2924409bcae0bbc4b38559acdcc0c3d5f5e0 Mon Sep 17 00:00:00 2001
From: Egor Andreevici <andreevich.egor@gmail.com>
Date: Sat, 16 Dec 2017 01:15:02 +0200
Subject: [PATCH] Opt-out wrapping

---
 src/main/java/com/squareup/kotlinpoet/FunSpec.kt        | 2 +-
 src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt | 2 +-
 src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt  | 8 ++++----
 src/main/java/com/squareup/kotlinpoet/TypeSpec.kt       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/squareup/kotlinpoet/FunSpec.kt b/src/main/java/com/squareup/kotlinpoet/FunSpec.kt
index 9c97385214..79b470473d 100644
--- a/src/main/java/com/squareup/kotlinpoet/FunSpec.kt
+++ b/src/main/java/com/squareup/kotlinpoet/FunSpec.kt
@@ -115,7 +115,7 @@ class FunSpec private constructor(builder: Builder) {
       codeWriter.emitCode("%L", escapeIfKeyword(name))
     }
 
-    parameters.emit(codeWriter, wrappable = true) { param ->
+    parameters.emit(codeWriter) { param ->
       param.emit(codeWriter, includeType = name != SETTER)
     }
 
diff --git a/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt b/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt
index 229bda68cd..2613921e6d 100644
--- a/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt
+++ b/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt
@@ -65,7 +65,7 @@ class LambdaTypeName internal constructor(
       out.emitCode("%T.", it)
     }
 
-    parameters.emit(out)
+    parameters.emit(out, wrap = false)
     out.emitCode(" -> %T", returnType)
 
     if (nullable) {
diff --git a/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt b/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt
index 837a0e4a02..97ab52e8ca 100644
--- a/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt
+++ b/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt
@@ -145,15 +145,15 @@ class ParameterSpec private constructor(builder: ParameterSpec.Builder) {
 
 internal fun List<ParameterSpec>.emit(
   codeWriter: CodeWriter,
-  wrappable: Boolean = false,
+  wrap: Boolean = true,
   emitBlock: (ParameterSpec) -> Unit = { it.emit(codeWriter) }
 ) = with(codeWriter) {
   emit("(")
-  if (wrappable) codeWriter.openWrappingGroup()
+  if (wrap) codeWriter.openWrappingGroup()
   forEachIndexed { index, parameter ->
-    if (index > 0) if (wrappable) emitCode(",%W") else emit(", ")
+    if (index > 0) if (wrap) emitCode(",%W") else emit(", ")
     emitBlock(parameter)
   }
-  if (wrappable) codeWriter.closeWrappingGroup()
+  if (wrap) codeWriter.closeWrappingGroup()
   emit(")")
 }
diff --git a/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt b/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt
index ba614dc4f4..c443c141bd 100644
--- a/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt
+++ b/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt
@@ -115,7 +115,7 @@ class TypeSpec private constructor(builder: TypeSpec.Builder) {
             codeWriter.emit("constructor")
           }
 
-          it.parameters.emit(codeWriter, wrappable = true) { param ->
+          it.parameters.emit(codeWriter) { param ->
             val property = constructorProperties[param.name]
             if (property != null) {
               property.emit(codeWriter, setOf(PUBLIC), withInitializer = false, inline = true)