Skip to content

Commit 12c01ef

Browse files
Alefasasedunov
authored andcommitted
Kotlin SDK auto-creation is disabled now #KT-23059 Fixed
(cherry picked from commit f5d8479)
1 parent 0f029d8 commit 12c01ef

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@
2525
import com.intellij.openapi.editor.event.DocumentAdapter;
2626
import com.intellij.openapi.editor.event.DocumentEvent;
2727
import com.intellij.openapi.fileEditor.FileDocumentManager;
28-
import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
2928
import com.intellij.openapi.updateSettings.impl.UpdateChecker;
3029
import com.intellij.openapi.vfs.VirtualFile;
3130
import com.intellij.psi.search.searches.IndexPatternSearch;
3231
import org.jetbrains.annotations.NotNull;
33-
import org.jetbrains.kotlin.idea.framework.KotlinSdkType;
3432
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTodoSearcher;
3533
import org.jetbrains.kotlin.utils.PathUtil;
3634

@@ -76,7 +74,8 @@ public void documentChanged(DocumentEvent e) {
7674

7775
ServiceManager.getService(IndexPatternSearch.class).registerExecutor(new KotlinTodoSearcher());
7876

79-
KotlinSdkType.Companion.setUpIfNeeded();
77+
//todo[Sedunov]: wait for fix in platform to avoid misunderstood from Java newbies (also ConfigureKotlinInTempDirTest)
78+
//KotlinSdkType.Companion.setUpIfNeeded();
8079
}
8180

8281
private static void registerPathVariable() {

idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,9 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
128128
val settings = myProject.getLanguageVersionSettings()
129129
Assert.assertEquals(ApiVersion.KOTLIN_1_1, settings.apiVersion)
130130
}
131+
132+
//todo[Sedunov]: wait for fix in platform to avoid misunderstood from Java newbies (also PluginStartupComponent)
133+
/*fun testKotlinSdkAdded() {
134+
Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType })
135+
}*/
131136
}

0 commit comments

Comments
 (0)