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

Cleanup in compiler modules

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-26 12:49:22 +03:00
parent 911adfd04d
commit 80916d5ed7
132 changed files with 322 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt
+5 -5
View File
@@ -29,7 +29,7 @@ import java.util.jar.Manifest
import java.util.zip.ZipFile
public object LibraryUtils {
private val LOG = Logger.getInstance(javaClass<LibraryUtils>())
private val LOG = Logger.getInstance(LibraryUtils::class.java)
public val KOTLIN_JS_MODULE_NAME: String = "Kotlin-JS-Module-Name"
private var TITLE_KOTLIN_JAVASCRIPT_STDLIB: String
@@ -43,7 +43,7 @@ public object LibraryUtils {
var jsStdLib = ""
var jsLib = ""
val manifestProperties = javaClass<LibraryUtils>().getResourceAsStream("/kotlinManifest.properties")
val manifestProperties = LibraryUtils::class.java.getResourceAsStream("/kotlinManifest.properties")
if (manifestProperties != null) {
try {
val properties = Properties()
@@ -157,7 +157,7 @@ public object LibraryUtils {
processDirectory(dir, action)
}
catch (ex: IOException) {
LOG.error("Could not read files from directory ${dir.getName()}: ${ex.getMessage()}")
LOG.error("Could not read files from directory ${dir.getName()}: ${ex.message}")
}
}
@@ -185,7 +185,7 @@ public object LibraryUtils {
}
}
catch (ex: IOException) {
LOG.error("Could not extract files from archive ${file.getName()}: ${ex.getMessage()}")
LOG.error("Could not extract files from archive ${file.getName()}: ${ex.message}")
}
finally {
zipFile.close()
@@ -196,7 +196,7 @@ public object LibraryUtils {
val systemIndependentPath = FileUtil.toSystemIndependentName(path)
if (systemIndependentPath.startsWith(METAINF)) {
if (systemIndependentPath.startsWith(METAINF_RESOURCES)) {
return path.substring(METAINF_RESOURCES.length())
return path.substring(METAINF_RESOURCES.length)
}
return null
}
compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt
+1 -1
View File
@@ -25,7 +25,7 @@ public fun File?.readTextOrEmpty(): String = this?.readText() ?: ""
public fun File.withReplacedExtensionOrNull(oldExt: String, newExt: String): File? {
if (getName().endsWith(oldExt)) {
val path = getPath()
val pathWithoutExt = path.substring(0, path.length() - oldExt.length())
val pathWithoutExt = path.substring(0, path.length - oldExt.length)
val pathWithNewExt = pathWithoutExt + newExt
return File(pathWithNewExt)
}
compiler/util/src/org/jetbrains/kotlin/utils/strings.kt
+2 -2
View File
@@ -24,10 +24,10 @@ private val END_MARKER = "<~END~>"
public fun CharSequence.substringWithContext(beginIndex: Int, endIndex: Int, range: Int): String {
val start = Math.max(0, beginIndex - range)
val end = Math.min(this.length(), endIndex + range)
val end = Math.min(this.length, endIndex + range)
val notFromBegin = start != 0
val notToEnd = end != this.length()
val notToEnd = end != this.length
val updatedStart = beginIndex - start
val updatedEnd = endIndex - start