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

Use of List's instead of Array's

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-26 19:19:42 +03:00
parent 343604bce0
commit bce79906ef
11 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
+8 -8
View File
@@ -50,7 +50,7 @@ public object KotlinNameSuggester {
* *
* @return possible names
*/
public fun suggestNamesByExpressionAndType(expression: JetExpression, validator: (String) -> Boolean, defaultName: String?): Array<String> {
public fun suggestNamesByExpressionAndType(expression: JetExpression, validator: (String) -> Boolean, defaultName: String?): List<String> {
val result = ArrayList<String>()
val bindingContext = expression.analyze(BodyResolveMode.FULL)
@@ -64,10 +64,10 @@ public object KotlinNameSuggester {
result.addName(defaultName, validator)
}
return ArrayUtil.toStringArray(result)
return result
}
public fun suggestNamesByType(type: JetType, validator: (String) -> Boolean, defaultName: String? = null): Array<String> {
public fun suggestNamesByType(type: JetType, validator: (String) -> Boolean, defaultName: String? = null): List<String> {
val result = ArrayList<String>()
result.addNamesByType(type, validator)
@@ -76,10 +76,10 @@ public object KotlinNameSuggester {
result.addName(defaultName, validator)
}
return ArrayUtil.toStringArray(result)
return result
}
public fun suggestNamesByExpressionOnly(expression: JetExpression, validator: (String) -> Boolean, defaultName: String? = null): Array<String> {
public fun suggestNamesByExpressionOnly(expression: JetExpression, validator: (String) -> Boolean, defaultName: String? = null): List<String> {
val result = ArrayList<String>()
result.addNamesByExpression(expression, validator)
@@ -88,17 +88,17 @@ public object KotlinNameSuggester {
result.addName(defaultName, validator)
}
return ArrayUtil.toStringArray(result)
return result
}
private val COMMON_TYPE_PARAMETER_NAMES = listOf("T", "U", "V", "W", "X", "Y", "Z")
public fun suggestNamesForTypeParameters(count: Int, validator: (String) -> Boolean): Array<String> {
public fun suggestNamesForTypeParameters(count: Int, validator: (String) -> Boolean): List<String> {
val result = ArrayList<String>()
for (i in 0..count - 1) {
result.add(suggestNameByMultipleNames(COMMON_TYPE_PARAMETER_NAMES, validator))
}
return ArrayUtil.toStringArray(result)
return result
}
/**