From abdac27b6146eaae5eff4efcdee6202b9cea8f9f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 24 Mar 2015 21:23:26 +0300 Subject: [PATCH] Modify split(String) usages within stdlib. --- libraries/stdlib/src/kotlin/dom/DomJVM.kt | 2 +- libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt index ecdbe945c79..1f73a9cf193 100644 --- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt +++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt @@ -121,7 +121,7 @@ public fun Node.previousElements(): List = previousSiblings().filterIsI public var Element.classSet: MutableSet get() { val answer = LinkedHashSet() - val array = this.classes.split("""\s""") + val array = this.classes.split("""\s""".toRegex()) for (s in array) { if (s.length() > 0) { answer.add(s) diff --git a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt index 16ce99396f0..d94f7125720 100644 --- a/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt +++ b/libraries/stdlib/src/kotlin/io/files/FilePathComponents.kt @@ -95,7 +95,7 @@ public fun File.filePathComponents(): FilePathComponents { // Split not only by / or \, but also by //, ///, \\, \\\, etc. val list = if (rootName.length() > 0 && subPath.isEmpty()) listOf() else // Looks awful but we split just by /+ or \+ depending on OS - subPath.split("""\Q${File.separatorChar}\E+""").toList().map { it -> File(it) } + subPath.split("""\Q${File.separatorChar}\E+""".toRegex()).toList().map { it -> File(it) } return FilePathComponents(rootName, list) }