From 1b559fe676103331ec00ad1a482f276ce6d60e03 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 19 Nov 2020 17:50:56 +0300 Subject: [PATCH] Don't set KOTLIN_BUNDLED in unit tests --- idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt index 189bbfc873e..c52fd71b3ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea import com.intellij.openapi.application.PathMacroContributor +import org.jetbrains.kotlin.idea.util.application.isUnitTestMode import org.jetbrains.kotlin.utils.PathUtil /** @@ -15,11 +16,13 @@ import org.jetbrains.kotlin.utils.PathUtil */ class KotlinPluginMacros : PathMacroContributor { override fun registerPathMacros(macros: MutableMap, legacyMacros: MutableMap) { - macros[KOTLIN_BUNDLED_PATH_VARIABLE] = PathUtil.kotlinPathsForIdeaPlugin.homePath.path + if (!isUnitTestMode()) { + macros[KOTLIN_BUNDLED_PATH_VARIABLE] = PathUtil.kotlinPathsForIdeaPlugin.homePath.path + } } companion object { const val KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED" } -} \ No newline at end of file +}