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

Fix split method usage: split temporary replaced with splitBy.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-03-31 15:40:43 +03:00
parent 907f402d30
commit 95c2a4fb29
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.util.PsiUtil
import org.jetbrains.kotlin.j2k.ast.* import org.jetbrains.kotlin.j2k.ast.*
import com.intellij.psi.util.PsiMethodUtil import com.intellij.psi.util.PsiMethodUtil
fun quoteKeywords(packageName: String): String = packageName.split("\\.").map { Identifier.toKotlin(it) }.joinToString(".") fun quoteKeywords(packageName: String): String = packageName.split('.').map { Identifier.toKotlin(it) }.joinToString(".")
fun PsiVariable.countWriteAccesses(searcher: ReferenceSearcher, scope: PsiElement?): Int fun PsiVariable.countWriteAccesses(searcher: ReferenceSearcher, scope: PsiElement?): Int
= if (scope != null) searcher.findVariableUsages(this, scope).count { PsiUtil.isAccessedForWriting(it) } else 0 = if (scope != null) searcher.findVariableUsages(this, scope).count { PsiUtil.isAccessedForWriting(it) } else 0
jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+4 -3
View File
@@ -207,11 +207,12 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
val result = HashMap<String, List<String>>() val result = HashMap<String, List<String>>()
for (line in dependenciesTxt.readLines()) { for (line in dependenciesTxt.readLines()) {
val split = line.split("->") val split = line.splitBy("->")
val module = split[0] val module = split[0]
val dependencies = if (split.size > 1) split[1].split(",") else array() val dependencies = if (split.size() > 1) split[1] else ""
val dependencyList = dependencies.splitBy(",").filterNot { it.isEmpty() }
result[module] = dependencies.toList() result[module] = dependencyList
} }
return result return result
js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt
+9 -8
View File
@@ -27,14 +27,14 @@ import java.util.LinkedHashMap
public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) { public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
private val MAIN_MODULE_NAME: String = "main" private val MAIN_MODULE_NAME: String = "main"
private var dependencies: Map<String, Array<String>>? = null private var dependencies: Map<String, List<String>>? = null
override fun checkFooBoxIsOkByPath(filePath: String) { override fun checkFooBoxIsOkByPath(filePath: String) {
val dirName = getTestName(true) val dirName = getTestName(true)
dependencies = readModuleDependencies(filePath) dependencies = readModuleDependencies(filePath)
for ((moduleName, dependencies) in dependencies) { for ((moduleName, dependencies) in dependencies) {
translateModule(dirName, filePath, moduleName, *dependencies) translateModule(dirName, filePath, moduleName, dependencies)
} }
val filename = getInputFilePath(getModuleDirectoryName(dirName, MAIN_MODULE_NAME) + File.separator + MAIN_MODULE_NAME + ".kt") val filename = getInputFilePath(getModuleDirectoryName(dirName, MAIN_MODULE_NAME) + File.separator + MAIN_MODULE_NAME + ".kt")
@@ -47,7 +47,7 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m
runRhinoTests(moduleDirectoryName, BasicTest.DEFAULT_ECMA_VERSIONS, RhinoFunctionResultChecker(MAIN_MODULE_NAME, packageName, functionName, expectedResult)) runRhinoTests(moduleDirectoryName, BasicTest.DEFAULT_ECMA_VERSIONS, RhinoFunctionResultChecker(MAIN_MODULE_NAME, packageName, functionName, expectedResult))
} }
private fun translateModule(dirName: String, pathToDir: String, moduleName: String, vararg dependencies: String) { private fun translateModule(dirName: String, pathToDir: String, moduleName: String, dependencies: List<String>) {
val moduleDirectoryName = getModuleDirectoryName(dirName, moduleName) val moduleDirectoryName = getModuleDirectoryName(dirName, moduleName)
val fullFilePaths = getAllFilesInDir(pathToDir + File.separator + moduleName) val fullFilePaths = getAllFilesInDir(pathToDir + File.separator + moduleName)
val libraries = ArrayList<String>() val libraries = ArrayList<String>()
@@ -72,17 +72,18 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m
return result return result
} }
private fun readModuleDependencies(testDataDir: String): Map<String, Array<String>> { private fun readModuleDependencies(testDataDir: String): Map<String, List<String>> {
val dependenciesTxt = File(testDataDir, "dependencies.txt") val dependenciesTxt = File(testDataDir, "dependencies.txt")
assert(dependenciesTxt.exists(), "moduleDependencies should not be null") assert(dependenciesTxt.exists(), "moduleDependencies should not be null")
val result = LinkedHashMap<String, Array<String>>() val result = LinkedHashMap<String, List<String>>()
for (line in dependenciesTxt.readLines()) { for (line in dependenciesTxt.readLines()) {
val split = line.split("->") val split = line.splitBy("->")
val module = split[0] val module = split[0]
val dependencies = if (split.size() > 1) split[1].split(",") else array() val dependencies = if (split.size() > 1) split[1] else ""
val dependencyList = dependencies.splitBy(",").filterNot { it.isEmpty() }
result[module] = dependencies//.toList() result[module] = dependencyList
} }
return result return result