From 23397d17dc350b135ee20ec4c7ed33be3b8b62e0 Mon Sep 17 00:00:00 2001
From: Denis Mekhanikov <dmekhanikov@gmail.com>
Date: Tue, 14 Oct 2014 18:42:48 +0400
Subject: [PATCH] stdlib: simplify File.recurse and File.extension functions

---
 libraries/stdlib/src/kotlin/io/Files.kt | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/io/Files.kt b/libraries/stdlib/src/kotlin/io/Files.kt
index a276d91edfe..dfe7c9bf6ee 100644
--- a/libraries/stdlib/src/kotlin/io/Files.kt
+++ b/libraries/stdlib/src/kotlin/io/Files.kt
@@ -9,12 +9,7 @@ import java.util.*
  */
 public fun File.recurse(block: (File) -> Unit): Unit {
     block(this)
-    val children = listFiles()
-    if (children != null) {
-        for (child in children) {
-            child.recurse(block)
-        }
-    }
+    listFiles()?.forEach { it.recurse(block) }
 }
 
 /**
@@ -46,13 +41,7 @@ public val File.path: String
  */
 public val File.extension: String
     get() {
-        val text = name
-        val idx = text.lastIndexOf('.')
-        return if (idx >= 0) {
-            text.substring(idx + 1)
-        } else {
-            ""
-        }
+        return name.substringAfterLast('.', "")
     }
 
 /**