From 6d5a65cac62c26752ef18db0d01986f8e7e43871 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 21 Jan 2016 19:22:04 +0300 Subject: [PATCH] Minor: remove File?.readTextOrEmpty() --- compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt | 4 ---- .../src/org/jetbrains/kotlin/js/facade/TranslationResult.kt | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt index 1834638cd4b..8147dceb864 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt @@ -18,10 +18,6 @@ package org.jetbrains.kotlin.utils.fileUtils 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? { if (name.endsWith(oldExt)) { val path = path diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt index 081dfb5c93e..b05fcc924d7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt @@ -31,7 +31,6 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils -import org.jetbrains.kotlin.utils.fileUtils.readTextOrEmpty import java.io.File import java.util.ArrayList @@ -56,8 +55,8 @@ abstract class TranslationResult protected constructor(val diagnostics: Diagnost } val code = getCode(output, sourceMapBuilder) - val prefix = outputPrefixFile?.readTextOrEmpty() ?: "" - val postfix = outputPostfixFile?.readTextOrEmpty() ?: "" + val prefix = outputPrefixFile?.readText() ?: "" + val postfix = outputPostfixFile?.readText() ?: "" val sourceFiles = files.map { val virtualFile = it.originalFile.virtualFile