diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt index 77c8e23e5f7..36611cbf8ba 100644 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt +++ b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/nodeJsUtil.kt @@ -6,18 +6,12 @@ package org.jetbrains.kotlin.idea.nodejs import com.intellij.execution.configuration.EnvironmentVariablesData -import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager -import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module import com.intellij.openapi.roots.CompilerModuleExtension import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.PathUtil import org.jetbrains.kotlin.idea.framework.isGradleModule import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.plugins.gradle.model.ExternalProject -import org.jetbrains.plugins.gradle.service.project.data.ExternalProjectDataCache -import org.jetbrains.plugins.gradle.util.GradleConstants import java.io.File import java.util.* @@ -37,23 +31,8 @@ private fun addSingleModulePaths(target: Module, result: MutableList) { result.addIfNotNull(compilerExtension.compilerOutputPathForTests?.let { "${it.path}/lib" }) } -private fun ExternalProject.findProjectById(id: String): ExternalProject? { - if (this.id == id) return this - for (childProject in childProjects.values) { - childProject.findProjectById(id)?.let { return it } - } - return null -} - private fun getNodeJsClasspath(module: Module): List { - if (module.isGradleModule()) { - val gradleProjectPath = ExternalSystemModulePropertyManager.getInstance(module).getRootProjectPath() - val projectCache = ExternalProjectDataCache.getInstance(module.project) - val rootProject = projectCache.getRootExternalProject(GradleConstants.SYSTEM_ID, File(gradleProjectPath)) ?: return listOf() - val externalProjectId = ExternalSystemApiUtil.getExternalProjectId(module) ?: return listOf() - val buildDir = rootProject.findProjectById(externalProjectId)?.buildDir ?: return listOf() - return listOfNotNull(PathUtil.toSystemIndependentName(buildDir.absolutePath) + "/nodejs_modules") - } + if (module.isGradleModule()) return emptyList() val result = ArrayList() ModuleRootManager.getInstance(module).orderEntries().recursively().forEachModule {