diff --git a/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt b/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt index aa51b6277f2..24cb0348d0d 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/ModulesDependenciesTest.kt @@ -55,7 +55,7 @@ class ModulesDependenciesTest : TestCase() { TestCase.assertTrue("Number of modules have dependencies to module $COMPILER_TESTS_MODULE_NAME. Such dependencies can cause multiple " + "tests execution on teamcity when running configuration with 'Search tests across module dependencies' enabled:\n" + - "${badModulesList.joinToString(separator = "\n")}", + badModulesList.joinToString(separator = "\n"), badModulesList.isEmpty()) } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt index c1e17e6f139..be702e9e938 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt @@ -249,7 +249,7 @@ abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { companion object { fun formatSignature(header: String, jvmSignature: String?, genericSignature: String): String { return listOf( - "$header", + header, jvmSignature?.let { "jvm signature: $it" }, "generic signature: $genericSignature" ).filterNotNull().joinToString("\n") { "// $it" } diff --git a/generators/infrastructure/increment-version.kts b/generators/infrastructure/increment-version.kts index f9d6e6f0b4a..06368fe0237 100644 --- a/generators/infrastructure/increment-version.kts +++ b/generators/infrastructure/increment-version.kts @@ -40,7 +40,7 @@ fun main(args: Array) { println("prefix=$versionPrefix incrementPart=$incrementPart result=$result filePath=$filePath") - File("$filePath").writeText("$result") + File(filePath).writeText(result) } main(args) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt index 78a6b4126bd..2de901bd436 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt @@ -54,7 +54,7 @@ class KotlinSuppressIntentionAction private constructor( when (suppressAt) { is KtModifierListOwner -> suppressAt.addAnnotation(KotlinBuiltIns.FQ_NAMES.suppress.toSafe(), - "$id", + id, whiteSpaceText = if (kind.newLineNeeded) "\n" else " ", addToExistingAnnotation = { entry -> addArgumentToSuppressAnnotation(entry, id) diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/CommandExecutor.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/CommandExecutor.kt index dbf34a67f86..b3021c7be0e 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/CommandExecutor.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/CommandExecutor.kt @@ -51,11 +51,11 @@ class CommandExecutor(private val runner: KotlinConsoleRunner) { val processInputOS = processHandler.processInput ?: return logError(javaClass, "

Broken process stream

") val charset = (processHandler as? BaseOSProcessHandler)?.charset ?: Charsets.UTF_8 - val xmlRes = "$XML_PREAMBLE" + + val xmlRes = XML_PREAMBLE + "" + - "${StringUtil.escapeXml( + StringUtil.escapeXml( StringUtil.replace(command, SOURCE_CHARS, XML_REPLACEMENTS) - )}" + + ) + "" val bytes = ("$xmlRes\n").toByteArray(charset) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementRenderingUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementRenderingUtils.kt index 3ca6c6f053f..a5537a06065 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementRenderingUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementRenderingUtils.kt @@ -76,13 +76,13 @@ fun KtElement.renderTrimmed(): String { } override fun visitPrefixExpression(expression: KtPrefixExpression) { - builder.append("${expression.operationReference.getReferencedName()}") + builder.append(expression.operationReference.getReferencedName()) expression.baseExpression?.accept(this) } override fun visitPostfixExpression(expression: KtPostfixExpression) { expression.baseExpression?.accept(this) - builder.append("${expression.operationReference.getReferencedName()}") + builder.append(expression.operationReference.getReferencedName()) } override fun visitBinaryExpression(expression: KtBinaryExpression) {