azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve expect declarations in kotlin.text

Browse Source 
- Replace overloads with default parameters in expect declarations by suppressing errors
- Remove meaningless inline modifier
This commit is contained in:
Ilya Gorbunov
2017-12-22 07:22:51 +03:00
parent 824b506abe
commit b6595d661d
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/common/src/kotlin/TextH.kt
+24 -25
View File
@@ -25,7 +25,7 @@ expect interface Appendable {
expect class StringBuilder : Appendable, CharSequence { expect class StringBuilder : Appendable, CharSequence {
constructor() constructor()
constructor(capacity: Int) constructor(capacity: Int)
constructor(seq: CharSequence) constructor(content: CharSequence)
override val length: Int override val length: Int
override operator fun get(index: Int): Char override operator fun get(index: Int): Char
@@ -54,12 +54,12 @@ expect class Regex {
fun replaceFirst(input: CharSequence, replacement: String): String fun replaceFirst(input: CharSequence, replacement: String): String
// TODO: requires optional parameters // TODO: requires optional parameters
fun find(input: CharSequence): MatchResult? @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
fun find(input: CharSequence, startIndex: Int): MatchResult? fun find(input: CharSequence, startIndex: Int = 0): MatchResult?
fun findAll(input: CharSequence): Sequence<MatchResult> @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
fun findAll(input: CharSequence, startIndex: Int): Sequence<MatchResult> fun findAll(input: CharSequence, startIndex: Int = 0): Sequence<MatchResult>
fun split(input: CharSequence): List<String> @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
fun split(input: CharSequence, limit: Int): List<String> fun split(input: CharSequence, limit: Int = 0): List<String>
companion object { companion object {
fun fromLiteral(literal: String): Regex fun fromLiteral(literal: String): Regex
@@ -90,32 +90,30 @@ expect fun Char.isLowSurrogate(): Boolean
internal expect fun String.nativeIndexOf(str: String, fromIndex: Int): Int internal expect fun String.nativeIndexOf(str: String, fromIndex: Int): Int
internal expect fun String.nativeLastIndexOf(str: String, fromIndex: Int): Int internal expect fun String.nativeLastIndexOf(str: String, fromIndex: Int): Int
internal expect fun String.nativeStartsWith(s: String, position: Int): Boolean
internal expect fun String.nativeEndsWith(s: String): Boolean
public expect fun String.substring(startIndex: Int): String public expect fun String.substring(startIndex: Int): String
public expect fun String.substring(startIndex: Int, endIndex: Int): String public expect fun String.substring(startIndex: Int, endIndex: Int): String
public expect inline fun String.toUpperCase(): String public expect fun String.toUpperCase(): String
public expect inline fun String.toLowerCase(): String public expect fun String.toLowerCase(): String
public expect inline fun String.capitalize(): String public expect fun String.capitalize(): String
public expect inline fun String.decapitalize(): String public expect fun String.decapitalize(): String
public expect fun CharSequence.repeat(n: Int): String public expect fun CharSequence.repeat(n: Int): String
// TOOD: requires optional parameters (and named!) // TODO: requires optional parameters (and named!)
expect fun String.replace(oldChar: Char, newChar: Char): String @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun String.replace(oldChar: Char, newChar: Char, ignoreCase: Boolean): String expect fun String.replace(oldChar: Char, newChar: Char, ignoreCase: Boolean = false): String
expect fun String.replace(oldValue: String, newValue: String): String @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun String.replace(oldValue: String, newValue: String, ignoreCase: Boolean): String expect fun String.replace(oldValue: String, newValue: String, ignoreCase: Boolean = false): String
expect fun String.replaceFirst(oldChar: Char, newChar: Char): String @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun String.replaceFirst(oldChar: Char, newChar: Char, ignoreCase: Boolean): String expect fun String.replaceFirst(oldChar: Char, newChar: Char, ignoreCase: Boolean = false): String
expect fun String.replaceFirst(oldValue: String, newValue: String): String @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun String.replaceFirst(oldValue: String, newValue: String, ignoreCase: Boolean): String expect fun String.replaceFirst(oldValue: String, newValue: String, ignoreCase: Boolean = false): String
expect fun String?.equals(other: String?): Boolean @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun String?.equals(other: String?, ignoreCase: Boolean): Boolean expect fun String?.equals(other: String?, ignoreCase: Boolean = false): Boolean
// From stringsCode.kt // From stringsCode.kt
@@ -123,7 +121,8 @@ internal inline expect fun String.nativeIndexOf(ch: Char, fromIndex: Int): Int
internal inline expect fun String.nativeLastIndexOf(ch: Char, fromIndex: Int): Int internal inline expect fun String.nativeLastIndexOf(ch: Char, fromIndex: Int): Int
expect fun CharSequence.isBlank(): Boolean expect fun CharSequence.isBlank(): Boolean
expect fun CharSequence.regionMatches(thisOffset: Int, other: CharSequence, otherOffset: Int, length: Int, ignoreCase: Boolean): Boolean @Suppress("EXPECTED_DECLARATION_WITH_DEFAULT_PARAMETER")
expect fun CharSequence.regionMatches(thisOffset: Int, other: CharSequence, otherOffset: Int, length: Int, ignoreCase: Boolean = false): Boolean