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

J2K: Remove special conversion for String.format.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-02-03 06:03:09 +03:00
parent c243a2bdd5
commit 805410bb19
4 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/SpecialMethod.kt
-25
View File
@@ -355,31 +355,6 @@ enum class SpecialMethod(val qualifiedClassName: String?, val methodName: String
= MethodCallExpression.buildNotNull(codeConverter.convertExpression(qualifier), "toCharArray", codeConverter.convertExpressions(arguments.slice(listOf(2, 3, 0, 1))))
},
STRING_FORMAT_WITH_LOCALE(JAVA_LANG_STRING, "format", null) {
override fun matches(method: PsiMethod, superMethodsSearcher: SuperMethodsSearcher): Boolean
= super.matches(method, superMethodsSearcher) &&
method.parameterList.parametersCount == 3 &&
method.parameterList.parameters.let { it.first().type.canonicalText == "java.util.Locale" && it.last().isVarArgs }
override fun convertCall(qualifier: PsiExpression?, arguments: Array<PsiExpression>, typeArgumentsConverted: List<Type>, codeConverter: CodeConverter): Expression? {
if (arguments.size < 2) return null // incorrect call
return MethodCallExpression.build(codeConverter.convertExpression(arguments[1], true), "format", codeConverter.convertExpressions(listOf(arguments[0]) + arguments.drop(2)), emptyList(), false)
}
},
STRING_FORMAT(JAVA_LANG_STRING, "format", null) {
override fun matches(method: PsiMethod, superMethodsSearcher: SuperMethodsSearcher): Boolean {
return super.matches(method, superMethodsSearcher) &&
method.parameterList.parametersCount == 2 &&
method.parameterList.parameters.last().isVarArgs
}
override fun convertCall(qualifier: PsiExpression?, arguments: Array<PsiExpression>, typeArgumentsConverted: List<Type>, codeConverter: CodeConverter): Expression? {
if (arguments.isEmpty()) return null // incorrect call
return MethodCallExpression.build(codeConverter.convertExpression(arguments.first(), true), "format", codeConverter.convertExpressions(arguments.drop(1)), emptyList(), false)
}
},
STRING_VALUE_OF_CHAR_ARRAY(JAVA_LANG_STRING, "valueOf", null) {
override fun matches(method: PsiMethod, superMethodsSearcher: SuperMethodsSearcher): Boolean {
return super.matches(method, superMethodsSearcher)
j2k/testData/fileOrElement/methodCallExpression/parameterToReceiver.java
Vendored
-1
View File
@@ -1,6 +1,5 @@
//method
public static void adjust(String name, int maxLen) {
String.format("%-" + maxLen + "s", name);
String.valueOf(1 + 1);
"a".split("\\s+" + "\\s+", 2)
kotlinApi.KotlinApiKt.extensionFunction(1 + 1)
j2k/testData/fileOrElement/methodCallExpression/parameterToReceiver.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
fun adjust(name: String, maxLen: Int) {
("%-" + maxLen + "s").format(name)
(1 + 1).toString()
"a".split(("\\s+" + "\\s+").toRegex(), 2).toTypedArray()
(1 + 1).extensionFunction()
j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt
Vendored
+2 -2
View File
@@ -101,8 +101,8 @@ internal class A {
3.14.toString()
Object().toString()
"Je ne mange pas %d jours".format(Locale.FRENCH, 6)
"Operation completed with %s".format("success")
String.format(Locale.FRENCH, "Je ne mange pas %d jours", 6)
String.format("Operation completed with %s", "success")
val chars = charArrayOf('a', 'b', 'c')
String(chars)