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

Compiler&plugin deprecations cleanup: string operations.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-06-25 23:46:18 +03:00
parent 35166f44ae
commit 6d4e48ab9a
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+2 -2
View File
@@ -163,7 +163,7 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<JetExpressi
val parent = element.getParent()
val array = element.getArrayExpression()!!.getText()
val indices = element.getIndicesNode()
val indicesText = indices.getText()?.trim("[","]") ?: throw AssertionError("Indices node of ArrayExpression shouldn't be null: JetArrayAccessExpression = ${element.getText()}")
val indicesText = indices.getText()?.removeSurrounding("[","]") ?: throw AssertionError("Indices node of ArrayExpression shouldn't be null: JetArrayAccessExpression = ${element.getText()}")
val transformation : String
val replaced : JetElement
@@ -185,7 +185,7 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<JetExpressi
private fun convertCall(element: JetCallExpression): JetExpression {
val callee = element.getCalleeExpression()!!
val arguments = element.getValueArgumentList()
val argumentString = arguments?.getText()?.trim("(", ")")
val argumentString = arguments?.getText()?.removeSurrounding("(", ")")
val funcLitArgs = element.getFunctionLiteralArguments()
val calleeText = callee.getText()
val transformation = "$calleeText.${OperatorConventions.INVOKE.asString()}" +
idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt
+1 -1
View File
@@ -88,7 +88,7 @@ public class CreateIncrementalCompilationBackup: AnAction("Create backup for deb
for (rev in revisions) {
val label = rev.getLabel()
if (label != null && label.startsWith(HISTORY_LABEL_PREFIX)) {
val patchFile = File(patchesDir, label.trimLeading(HISTORY_LABEL_PREFIX) + ".patch")
val patchFile = File(patchesDir, label.removePrefix(HISTORY_LABEL_PREFIX) + ".patch")
indicator.setText("Creating patch $patchFile")
indicator.setFraction(PATCHES_FRACTION * patchesCreated / PATCHES_TO_CREATE)
idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+1 -1
View File
@@ -72,7 +72,7 @@ object KDocRenderer {
}
to.append("<dl><dt><b>${title}:</b></dt>")
tags.forEach {
to.append("<dd><code>${it.getSubjectName()}</code> - ${markdownToHtml(it.getContent().trimLeading())}</dd>")
to.append("<dd><code>${it.getSubjectName()}</code> - ${markdownToHtml(it.getContent().trimStart())}</dd>")
}
to.append("</dl>\n")
}
idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt
+1 -1
View File
@@ -49,7 +49,7 @@ public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFix
val info = expression.analyze().getDataFlowInfo(expression)
val allValues = (info.getCompleteTypeInfo().keySet() + info.getCompleteNullabilityInfo().keySet()).toSet()
val actual = allValues.map { renderDataFlowValue(it) }.filterNotNull().sort().makeString("\n")
val actual = allValues.map { renderDataFlowValue(it) }.filterNotNull().sort().joinToString("\n")
JetTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual)
}