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

Don't set KOTLIN_BUNDLED in unit tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-11-19 17:50:56 +03:00
parent 7396abf5a4
commit 1b559fe676
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinPluginMacros.kt
+5 -2
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea package org.jetbrains.kotlin.idea
import com.intellij.openapi.application.PathMacroContributor import com.intellij.openapi.application.PathMacroContributor
import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
/** /**
@@ -15,11 +16,13 @@ import org.jetbrains.kotlin.utils.PathUtil
*/ */
class KotlinPluginMacros : PathMacroContributor { class KotlinPluginMacros : PathMacroContributor {
override fun registerPathMacros(macros: MutableMap<String, String>, legacyMacros: MutableMap<String, String>) { override fun registerPathMacros(macros: MutableMap<String, String>, legacyMacros: MutableMap<String, String>) {
macros[KOTLIN_BUNDLED_PATH_VARIABLE] = PathUtil.kotlinPathsForIdeaPlugin.homePath.path if (!isUnitTestMode()) {
macros[KOTLIN_BUNDLED_PATH_VARIABLE] = PathUtil.kotlinPathsForIdeaPlugin.homePath.path
}
} }
companion object { companion object {
const val KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED" const val KOTLIN_BUNDLED_PATH_VARIABLE = "KOTLIN_BUNDLED"
} }
} }