From 17b0b7704f08d4a93c413f94aa5bd734a96a885d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 26 Jan 2017 13:09:14 +0300 Subject: [PATCH] JS: minor, drop obsolete VFS_PROTOCOL --- .../kotlin/utils/KotlinJavascriptMetadataUtils.kt | 1 - .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index 3429c2c4d5f..2c2653362dd 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -57,7 +57,6 @@ class JsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { object KotlinJavascriptMetadataUtils { const val JS_EXT: String = ".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_PATTERN = "\\.kotlin_module_metadata\\(".toPattern() diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index c5ea466adb5..b329ce89e8d 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -28,7 +28,6 @@ import java.io.File import java.util.ArrayList object JpsJsModuleUtils { - fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { val result = ArrayList() getLibraryFiles(target, result) @@ -40,11 +39,7 @@ object JpsJsModuleUtils { val libraries = JpsUtils.getAllDependencies(target).libraries for (library in libraries) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) { - val path = JpsPathUtil.urlToPath(root.url) - // ignore files, added only for IDE support (stubs and indexes) - if (!path.startsWith(KotlinJavascriptMetadataUtils.VFS_PROTOCOL + "://")) { - result.add(path) - } + result.add(JpsPathUtil.urlToPath(root.url)) } } }