Merge pull request #67 from burntcookie90/vr/inheritance-fix

Inheritance should use :
square · May 18, 2017 · d309590 · d309590
2 parents 0f32b78 + 22254ff
commit d309590
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 28 deletions.
diff --git a/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt b/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt
@@ -118,24 +118,9 @@ class TypeSpec private constructor(builder: TypeSpec.Builder) {
           implementsTypes = superinterfaces
         }
 
-        if (!extendsTypes.isEmpty()) {
-          codeWriter.emit(" extends")
-          var firstType = true
-          for (type in extendsTypes) {
-            if (!firstType) codeWriter.emit(",")
-            codeWriter.emit(" %T", type)
-            firstType = false
-          }
-        }
-
-        if (!implementsTypes.isEmpty()) {
-          codeWriter.emit(" implements")
-          var firstType = true
-          for (type in implementsTypes) {
-            if (!firstType) codeWriter.emit(",")
-            codeWriter.emit(" %T", type)
-            firstType = false
-          }
+        (extendsTypes + implementsTypes).forEachIndexed { i, typeName ->
+          codeWriter.emit(if (i == 0)  " :" else ",")
+          codeWriter.emit(" %T", typeName)
         }
 
         codeWriter.emit(" {\n")

diff --git a/src/test/java/com/squareup/kotlinpoet/KotlinFileTest.kt b/src/test/java/com/squareup/kotlinpoet/KotlinFileTest.kt
@@ -471,8 +471,8 @@ class KotlinFileTest {
         |
         |import com.squareup.wire.Message
         |
-        |class Taco extends Message {
-        |  class Builder extends Message.Builder {
+        |class Taco : Message {
+        |  class Builder : Message.Builder {
         |  }
         |}
         |""".trimMargin())
@@ -534,7 +534,7 @@ class KotlinFileTest {
     assertThat(source.toString()).isEqualTo("""
         |package hello
         |
-        |class World implements Test {
+        |class World : Test {
         |}
         |""".trimMargin())
   }

diff --git a/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt b/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt
@@ -569,7 +569,7 @@ class TypeSpecTest {
         |import java.lang.UnsupportedOperationException
         |import kotlin.Int
         |
-        |class Location<T, P : Number> implements Comparable<P> {
+        |class Location<T, P : Number> : Comparable<P> {
         |  val label: T
         |
         |  val x: P
@@ -628,7 +628,7 @@ class TypeSpecTest {
         |import java.lang.Comparable
         |import java.util.AbstractSet
         |
-        |abstract class Taco extends AbstractSet<Food> implements Serializable, Comparable<Taco> {
+        |abstract class Taco : AbstractSet<Food>, Serializable, Comparable<Taco> {
         |}
         |""".trimMargin())
   }
@@ -647,7 +647,7 @@ class TypeSpecTest {
         |
         |import java.lang.Comparable
         |
-        |class Taco extends org.fish.taco.Taco implements Comparable<Taco>, com.taco.bell.Taco {
+        |class Taco : org.fish.taco.Taco, Comparable<Taco>, com.taco.bell.Taco {
         |}
         |""".trimMargin())
   }
@@ -669,7 +669,7 @@ class TypeSpecTest {
         |
         |import java.util.concurrent.Callable
         |
-        |class Outer extends Callable<Outer.Inner> {
+        |class Outer : Callable<Outer.Inner> {
         |  inner class Inner {
         |  }
         |}
@@ -689,7 +689,7 @@ class TypeSpecTest {
         |import java.io.Serializable
         |import java.lang.Cloneable
         |
-        |enum Food implements Serializable, Cloneable {
+        |enum Food : Serializable, Cloneable {
         |  LEAN_GROUND_BEEF,
         |
         |  SHREDDED_CHEESE
@@ -709,7 +709,7 @@ class TypeSpecTest {
         |import java.io.Serializable
         |import java.lang.Comparable
         |
-        |interface Taco extends Serializable, Comparable<Taco> {
+        |interface Taco : Serializable, Comparable<Taco> {
         |}
         |""".trimMargin())
   }
@@ -1684,7 +1684,7 @@ class TypeSpecTest {
         |import java.io.Serializable
         |import java.util.EventListener
         |
-        |class Taco implements Serializable, EventListener {
+        |class Taco : Serializable, EventListener {
         |}
         |""".trimMargin())
   }