Formatting

Author: svtk

src/i_introduction/_5_String_Templates/n05StringTemplates.kt

@@ -4,15 +4,15 @@ import util.TODO
 import util.doc5
 
 fun example1(a: Any, b: Any) =
-        "This is some text in which variables ($a, $b) appear."
+    "This is some text in which variables ($a, $b) appear."
 
 fun example2(a: Any, b: Any) =
-        "You can write it in a Java way as well. Like this: " + a + ", " + b + "!"
+    "You can write it in a Java way as well. Like this: " + a + ", " + b + "!"
 
 fun example3(c: Boolean, x: Int, y: Int) = "Any expression can be used: ${if (c) x else y}"
 
 fun example4() =
-        """
+    """
 You can use raw strings to write multiline text.
 There is no escaping here, so raw strings are useful for writing regex patterns,
 you don't need to escape a backslash by a backslash.

src/i_introduction/_7_Nullable_Types/n07NullableTypes.kt

@@ -23,13 +23,13 @@ fun todoTask7(client: Client?, message: String?, mailer: Mailer): Nothing = TODO
 )
 
 fun sendMessageToClient(
-        client: Client?, message: String?, mailer: Mailer
+    client: Client?, message: String?, mailer: Mailer
 ) {
     todoTask7(client, message, mailer)
 }
 
-class Client (val personalInfo: PersonalInfo?)
-class PersonalInfo (val email: String?)
+class Client(val personalInfo: PersonalInfo?)
+class PersonalInfo(val email: String?)
 
 interface Mailer {
     fun sendMessage(email: String, message: String)

src/i_introduction/_8_Smart_Casts/n08SmartCasts.kt

@@ -6,14 +6,15 @@ import util.doc8
 // 'sealed' modifier restricts the type hierarchy:
 // all the subclasses must be declared in the same file
 sealed class Expr
+
 class Num(val value: Int) : Expr()
 class Sum(val left: Expr, val right: Expr) : Expr()
 
 fun eval(e: Expr): Int =
-        when (e) {
-            is Num -> todoTask8(e)
-            is Sum -> todoTask8(e)
-        }
+    when (e) {
+        is Num -> todoTask8(e)
+        is Sum -> todoTask8(e)
+    }
 
 fun todoTask8(expr: Expr): Nothing = TODO(
     """

src/ii_collections/n16FlatMap.kt

@@ -7,12 +7,14 @@ fun example() {
     result == listOf('a', 'b', 'c', '1', '2')
 }
 
-val Customer.orderedProducts: Set<Product> get() {
-    // Return all products this customer has ordered
-    todoCollectionTask()
-}
+val Customer.orderedProducts: Set<Product>
+    get() {
+        // Return all products this customer has ordered
+        todoCollectionTask()
+    }
 
-val Shop.allOrderedProducts: Set<Product> get() {
-    // Return all products that were ordered by at least one customer
-    todoCollectionTask()
-}
+val Shop.allOrderedProducts: Set<Product>
+    get() {
+        // Return all products that were ordered by at least one customer
+        todoCollectionTask()
+    }

src/ii_collections/n22Fold.kt

@@ -8,14 +8,13 @@ fun example9() {
 // The same as
 fun whatFoldDoes(): Int {
     var result = 1
-    listOf(1, 2, 3, 4).forEach { element -> result = element * result}
+    listOf(1, 2, 3, 4).forEach { element -> result = element * result }
     return result
 }
 
 fun Shop.getSetOfProductsOrderedByEachCustomer(): Set<Product> {
     // Return the set of products that were ordered by each of the customers
-    return customers.fold(allOrderedProducts, {
-        orderedByAll, customer ->
+    return customers.fold(allOrderedProducts, { orderedByAll, customer ->
         todoCollectionTask()
     })
 }

src/ii_collections/n24ExtensionsOnCollections.kt

@@ -8,7 +8,7 @@ fun todoTask24(): Nothing = TODO(
         The function should do the same as '_24_JavaCode.doSomethingStrangeWithCollection'.
         Replace all invocations of 'todoTask24()' with the appropriate code.
     """,
-        references = { c: Collection<String> -> _24_JavaCode().doSomethingStrangeWithCollection(c) }
+    references = { c: Collection<String> -> _24_JavaCode().doSomethingStrangeWithCollection(c) }
 )
 
 fun doSomethingStrangeWithCollection(collection: Collection<String>): Collection<String>? {

src/ii_collections/todoUtil.kt

@@ -3,10 +3,10 @@ package ii_collections
 import util.TODO
 
 fun todoCollectionTask(): Nothing = TODO(
-        """
+    """
            Common task for working with collections.
            Look through the Shop API, which all the tasks are using.
            Each individual task is described in the function name and the comment.
         """,
-        references = { shop: Shop -> shop.customers }
+    references = { shop: Shop -> shop.customers }
 )

src/iii_conventions/MyDateUtil.kt

@@ -1,6 +1,6 @@
 package iii_conventions
 
-import iii_conventions.TimeInterval.*
+import iii_conventions.TimeInterval.DAY
 import java.util.*
 
 fun MyDate.nextDay() = addTimeIntervals(DAY, 1)

src/iii_conventions/n28ForLoop.kt

@@ -4,18 +4,22 @@ import util.TODO
 import util.doc28
 
 fun iterateOverCollection(collection: Collection<Int>) {
-    for (element in collection) {}
+    for (element in collection) {
+    }
 }
 
 fun iterateOverString() {
     // You can iterate over anything that has an 'iterator' method, member or extension.
-    for (c in "abcd") {}
+    for (c in "abcd") {
+    }
     "abcd".iterator() //library extension method
 }
 
 fun iterateOverRange() {
-    for (i in 1..10) {}
-    for (c in 'a'..'z') {}
+    for (i in 1..10) {
+    }
+    for (c in 'a'..'z') {
+    }
 }
 
 fun todoTask28(): Nothing = TODO(

src/iii_conventions/n29OperatorsOverloading.kt

@@ -1,7 +1,7 @@
 package iii_conventions
 
-import util.TODO
 import iii_conventions.TimeInterval.*
+import util.TODO
 
 fun todoTask29(): Nothing = TODO(
     """