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

Cleanup: apply redundant curly braces in string template inspection

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-02-17 15:26:07 +03:00
parent e37800d056
commit 1375267996
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+1 -1
View File
@@ -211,7 +211,7 @@ object KotlinCompilerClient {
val unrecognized = it.trimQuotes().split(",").filterExtractProps(opts.mappers, "")
if (unrecognized.any())
throw IllegalArgumentException(
"Unrecognized client options passed via property ${COMPILE_DAEMON_OPTIONS_PROPERTY}: " + unrecognized.joinToString(" ") +
"Unrecognized client options passed via property $COMPILE_DAEMON_OPTIONS_PROPERTY: " + unrecognized.joinToString(" ") +
"\nSupported options: " + opts.mappers.joinToString(", ", transform = { it.names.first() }))
}
return opts
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
+3 -3
View File
@@ -277,8 +277,8 @@ fun configureDaemonJVMOptions(opts: DaemonJVMOptions,
opts.jvmParams.addAll(additionalParams)
if (inheritAdditionalProperties) {
System.getProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY)?.let { opts.jvmParams.add("D${COMPILE_DAEMON_LOG_PATH_PROPERTY}=\"$it\"") }
System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY)?.let { opts.jvmParams.add("D${KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY}") }
System.getProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY)?.let { opts.jvmParams.add("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"$it\"") }
System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY)?.let { opts.jvmParams.add("D$KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY") }
}
return opts
}
@@ -299,7 +299,7 @@ fun configureDaemonOptions(opts: DaemonOptions): DaemonOptions {
val unrecognized = it.trimQuotes().split(",").filterExtractProps(opts.mappers, "")
if (unrecognized.any())
throw IllegalArgumentException(
"Unrecognized daemon options passed via property ${COMPILE_DAEMON_OPTIONS_PROPERTY}: " + unrecognized.joinToString(" ") +
"Unrecognized daemon options passed via property $COMPILE_DAEMON_OPTIONS_PROPERTY: " + unrecognized.joinToString(" ") +
"\nSupported options: " + opts.mappers.joinToString(", ", transform = { it.names.first() }))
}
System.getProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY)?.let { opts.verbose = true }
compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt
+1 -1
View File
@@ -66,7 +66,7 @@ object KotlinCompileDaemon {
"java.util.logging.FileHandler.limit = ${if (fileIsGiven) 0 else (1 shl 20)}\n" + // if file is provided - disabled, else - 1Mb
"java.util.logging.FileHandler.count = ${if (fileIsGiven) 1 else 3}\n" +
"java.util.logging.FileHandler.append = $fileIsGiven\n" +
"java.util.logging.FileHandler.pattern = ${if (fileIsGiven) logPath else (logPath + File.separator + "${COMPILE_DAEMON_DEFAULT_FILES_PREFIX}.$logTime.%u%g.log")}\n" +
"java.util.logging.FileHandler.pattern = ${if (fileIsGiven) logPath else (logPath + File.separator + "$COMPILE_DAEMON_DEFAULT_FILES_PREFIX.$logTime.%u%g.log")}\n" +
"java.util.logging.SimpleFormatter.format = %1\$tF %1\$tT.%1\$tL [%3\$s] %4\$s: %5\$s%n\n"
LogManager.getLogManager().readConfiguration(cfg.byteInputStream())
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+1 -1
View File
@@ -447,7 +447,7 @@ class LazyJavaClassMemberScope(
null
assert(setterMethod?.let { it.modality == getterMethod.modality } ?: true) {
"Different accessors modalities when creating overrides for $overriddenProperty in ${ownerDescriptor}" +
"Different accessors modalities when creating overrides for $overriddenProperty in $ownerDescriptor" +
"for getter is ${getterMethod.modality}, but for setter is ${setterMethod?.modality}"
}
core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClassFinder.kt
+1 -1
View File
@@ -48,5 +48,5 @@ class ReflectKotlinClassFinder(private val classLoader: ClassLoader) : KotlinCla
private fun ClassId.toRuntimeFqName(): String {
val className = relativeClassName.asString().replace('.', '$')
return if (packageFqName.isRoot) className else "${packageFqName}.$className"
return if (packageFqName.isRoot) className else "$packageFqName.$className"
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
+1 -1
View File
@@ -56,7 +56,7 @@ private fun PsiElement.getModuleInfo(onFailure: (String) -> IdeaModuleInfo?): Id
val doNotAnalyze = containingJetFile?.doNotAnalyze
if (doNotAnalyze != null) {
return onFailure(
"Should not analyze element: ${text} in file ${containingJetFile?.name ?: " <no file>"}\n$doNotAnalyze"
"Should not analyze element: $text in file ${containingJetFile?.name ?: " <no file>"}\n$doNotAnalyze"
)
}
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
+1 -1
View File
@@ -125,7 +125,7 @@ class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectMo
if (hasJsExecution && jsDependencies.isEmpty()) {
holder.createProblem(kotlinPlugin.artifactId.createStableCopy(),
HighlightSeverity.WARNING,
"Kotlin JavaScript compiler configured but no ${MAVEN_JS_STDLIB_ID} dependency",
"Kotlin JavaScript compiler configured but no $MAVEN_JS_STDLIB_ID dependency",
FixAddStdlibLocalFix(domFileElement.file, MAVEN_JS_STDLIB_ID, kotlinPlugin.version.rawText))
}
}
idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
+1 -1
View File
@@ -126,7 +126,7 @@ class KotlinCoverageExtension : JavaCoverageEngineExtension() {
result.partiallyCoveredLineCount += classInfo.partiallyCoveredLineCount
}
else {
LOG.debug("Found no coverage for ${it}")
LOG.debug("Found no coverage for $it")
}
}
return result
idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceMathMethodsWithKotlinNativeMethodsIntention.kt
+1 -1
View File
@@ -40,5 +40,5 @@ abstract class ReplaceMathMethodsWithKotlinNativeMethodsIntention(
override fun isApplicableTo(element: KtCallExpression) =
element.calleeExpression?.text == mathMethodName &&
element.valueArguments.size == 2 &&
element.isMethodCall("java.lang.Math.${mathMethodName}")
element.isMethodCall("java.lang.Math.$mathMethodName")
}
idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+2 -2
View File
@@ -141,7 +141,7 @@ object KDocRenderer {
if (tags.isEmpty()) {
return
}
to.append("<dl><dt><b>${title}:</b></dt>")
to.append("<dl><dt><b>$title:</b></dt>")
tags.forEach {
to.append("<dd><code>${it.getSubjectName()}</code> - ${markdownToHtml(it.getContent().trimStart())}</dd>")
}
@@ -150,7 +150,7 @@ object KDocRenderer {
private fun renderTag(tag: KDocTag?, title: String, to: StringBuilder) {
if (tag != null) {
to.append("<dl><dt><b>${title}:</b></dt>")
to.append("<dl><dt><b>$title:</b></dt>")
to.append("<dd>${markdownToHtml(tag.getContent())}</dd>")
to.append("</dl>\n")
}
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt
+2 -2
View File
@@ -44,7 +44,7 @@ object JsCallDataTextRenderer : JsCallDataRenderer() {
override fun format(data: JsCallDataWithCode): String {
val codeRange = data.codeRange
val code = data.code.underlineAsText(codeRange.startOffset, codeRange.endOffset)
return "${data.message} in code:\n${code}"
return "${data.message} in code:\n$code"
}
}
@@ -52,7 +52,7 @@ object JsCallDataHtmlRenderer : JsCallDataRenderer() {
override fun format(data: JsCallDataWithCode): String {
val codeRange = data.codeRange
val code = data.code.underlineAsHtml(codeRange.startOffset, codeRange.endOffset)
return "${data.message} in code:<br><pre>${code}</pre>"
return "${data.message} in code:<br><pre>$code</pre>"
}
}