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

JS: minor, drop obsolete VFS_PROTOCOL

Browse Source
This commit is contained in:
Alexander Udalov
2017-01-26 13:09:14 +03:00
parent ef42e3e4aa
commit 17b0b7704f
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
-1
View File
@@ -57,7 +57,6 @@ class JsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
object KotlinJavascriptMetadataUtils { object KotlinJavascriptMetadataUtils {
const val JS_EXT: String = ".js" const val JS_EXT: String = ".js"
const val META_JS_SUFFIX: String = ".meta.js" const val META_JS_SUFFIX: String = ".meta.js"
const val VFS_PROTOCOL: String = "kotlin-js-meta"
private val KOTLIN_JAVASCRIPT_METHOD_NAME = "kotlin_module_metadata" private val KOTLIN_JAVASCRIPT_METHOD_NAME = "kotlin_module_metadata"
private val KOTLIN_JAVASCRIPT_METHOD_NAME_PATTERN = "\\.kotlin_module_metadata\\(".toPattern() private val KOTLIN_JAVASCRIPT_METHOD_NAME_PATTERN = "\\.kotlin_module_metadata\\(".toPattern()
jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+1 -6
View File
@@ -28,7 +28,6 @@ import java.io.File
import java.util.ArrayList import java.util.ArrayList
object JpsJsModuleUtils { object JpsJsModuleUtils {
fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List<String> { fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List<String> {
val result = ArrayList<String>() val result = ArrayList<String>()
getLibraryFiles(target, result) getLibraryFiles(target, result)
@@ -40,11 +39,7 @@ object JpsJsModuleUtils {
val libraries = JpsUtils.getAllDependencies(target).libraries val libraries = JpsUtils.getAllDependencies(target).libraries
for (library in libraries) { for (library in libraries) {
for (root in library.getRoots(JpsOrderRootType.COMPILED)) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) {
val path = JpsPathUtil.urlToPath(root.url) result.add(JpsPathUtil.urlToPath(root.url))
// ignore files, added only for IDE support (stubs and indexes)
if (!path.startsWith(KotlinJavascriptMetadataUtils.VFS_PROTOCOL + "://")) {
result.add(path)
}
} }
} }
} }