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

Minor: remove File?.readTextOrEmpty()

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-21 19:22:04 +03:00
parent d728a1a6c7
commit 6d5a65cac6
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt
-4
View File
@@ -18,10 +18,6 @@ package org.jetbrains.kotlin.utils.fileUtils
import java.io.File import java.io.File
// TODO: move to stdlib as:
// public fun File?.readTextOrEmpty(encoding: String = Charset.defaultCharset().name()): String = this?.readText(encoding) ?: ""
fun File?.readTextOrEmpty(): String = this?.readText() ?: ""
fun File.withReplacedExtensionOrNull(oldExt: String, newExt: String): File? { fun File.withReplacedExtensionOrNull(oldExt: String, newExt: String): File? {
if (name.endsWith(oldExt)) { if (name.endsWith(oldExt)) {
val path = path val path = path
js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt
+2 -3
View File
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import org.jetbrains.kotlin.utils.fileUtils.readTextOrEmpty
import java.io.File import java.io.File
import java.util.ArrayList import java.util.ArrayList
@@ -56,8 +55,8 @@ abstract class TranslationResult protected constructor(val diagnostics: Diagnost
} }
val code = getCode(output, sourceMapBuilder) val code = getCode(output, sourceMapBuilder)
val prefix = outputPrefixFile?.readTextOrEmpty() ?: "" val prefix = outputPrefixFile?.readText() ?: ""
val postfix = outputPostfixFile?.readTextOrEmpty() ?: "" val postfix = outputPostfixFile?.readText() ?: ""
val sourceFiles = files.map { val sourceFiles = files.map {
val virtualFile = it.originalFile.virtualFile val virtualFile = it.originalFile.virtualFile