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

Move: Do not consider type alias -> expect class change as a conflict

Browse Source 
Given they have the same fqname

 #KT-23594 Fixed
This commit is contained in:
Alexey Sedunov
2018-07-11 13:21:28 +03:00
parent 1c30a12d95
commit 5275e19c76
14 changed files with 154 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.kt
+17
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.roots.libraries.Library
import com.intellij.openapi.roots.libraries.PersistentLibraryKind
import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor
import com.intellij.openapi.vfs.VfsUtil
import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
import org.jetbrains.kotlin.idea.framework.JSLibraryKind
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -44,6 +45,7 @@ object ConfigLibraryUtil {
private val DEFAULT_JAVA_RUNTIME_LIB_NAME = "JAVA_RUNTIME_LIB_NAME"
private val DEFAULT_KOTLIN_TEST_LIB_NAME = "KOTLIN_TEST_LIB_NAME"
private val DEFAULT_KOTLIN_JS_STDLIB_NAME = "KOTLIN_JS_STDLIB_NAME"
private val DEFAULT_KOTLIN_COMMON_STDLIB_NAME = "KOTLIN_COMMON_STDLIB_NAME"
private fun getKotlinRuntimeLibEditor(libName: String, library: File): NewLibraryEditor {
val editor = NewLibraryEditor()
@@ -65,6 +67,17 @@ object ConfigLibraryUtil {
JSLibraryKind)
}
fun configureKotlinCommonRuntime(module: Module) {
addLibrary(
getKotlinRuntimeLibEditor(
DEFAULT_KOTLIN_COMMON_STDLIB_NAME,
File("dist/common/kotlin-stdlib-common.jar")
),
module,
CommonLibraryKind
)
}
fun configureKotlinRuntime(module: Module) {
addLibrary(getKotlinRuntimeLibEditor(DEFAULT_JAVA_RUNTIME_LIB_NAME, PathUtil.kotlinPathsForDistDirectory.stdlibPath), module)
addLibrary(getKotlinRuntimeLibEditor(DEFAULT_KOTLIN_TEST_LIB_NAME, PathUtil.kotlinPathsForDistDirectory.kotlinTestPath), module)
@@ -85,6 +98,10 @@ object ConfigLibraryUtil {
removeLibrary(module, DEFAULT_KOTLIN_JS_STDLIB_NAME)
}
fun unConfigureKotlinCommonRuntime(module: Module) {
removeLibrary(module, DEFAULT_KOTLIN_COMMON_STDLIB_NAME)
}
fun configureSdk(module: Module, sdk: Sdk) {
ApplicationManager.getApplication().runWriteAction {
val rootManager = ModuleRootManager.getInstance(module)