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

Simplify adding Kotlin sdk by inlining internals of ProjectSdksModel

Browse Source 
Because of using cloning sdks inside ProjectSdksModel tests fail with sdk leaked errors.
This commit is contained in:
Nikolay Krasko
2019-12-27 16:49:03 +03:00
parent 70067bc9bf
commit c7d39b612c
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/framework/KotlinSdkType.kt
+13 -8
View File
@@ -9,7 +9,6 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.projectRoots.* import com.intellij.openapi.projectRoots.*
import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl
import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel
import com.intellij.util.Consumer import com.intellij.util.Consumer
import org.jdom.Element import org.jdom.Element
import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.KotlinIcons
@@ -28,13 +27,19 @@ class KotlinSdkType : SdkType("KotlinSDK") {
@JvmOverloads @JvmOverloads
fun setUpIfNeeded(checkIfNeeded: () -> Boolean = { true }) { fun setUpIfNeeded(checkIfNeeded: () -> Boolean = { true }) {
with(ProjectSdksModel()) { val projectSdks: Array<Sdk> = ProjectJdkTable.getInstance().allJdks
reset(null) if (projectSdks.any { it.sdkType is KotlinSdkType }) return
if (sdks.any { it.sdkType is KotlinSdkType }) return if (!checkIfNeeded()) return // do not create Kotlin SDK
if (!checkIfNeeded()) return //do not create Kotlin SDK
addSdk(INSTANCE, defaultHomePath, null) val newSdkName = SdkConfigurationUtil.createUniqueSdkName(INSTANCE, defaultHomePath, projectSdks.toList())
ApplicationManager.getApplication().invokeAndWait { val newJdk = ProjectJdkImpl(newSdkName, INSTANCE)
runWriteAction { apply(null, true) } newJdk.homePath = defaultHomePath
INSTANCE.setupSdkPaths(newJdk)
ApplicationManager.getApplication().invokeAndWait {
runWriteAction {
if (ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType }) return@runWriteAction
ProjectJdkTable.getInstance().addJdk(newJdk)
} }
} }
} }