Kotlin SDK auto-creation is disabled now #KT-23059 Fixed

(cherry picked from commit f5d8479)
This commit is contained in:
Alexander Podkhalyuzin
2018-02-28 12:25:43 +03:00
committed by Alexey Sedunov
parent 0f029d8f51
commit 12c01ef80a
2 changed files with 7 additions and 3 deletions
@@ -25,12 +25,10 @@ import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.event.DocumentAdapter;
import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
import com.intellij.openapi.updateSettings.impl.UpdateChecker;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.searches.IndexPatternSearch;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.framework.KotlinSdkType;
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTodoSearcher;
import org.jetbrains.kotlin.utils.PathUtil;
@@ -76,7 +74,8 @@ public class PluginStartupComponent implements ApplicationComponent {
ServiceManager.getService(IndexPatternSearch.class).registerExecutor(new KotlinTodoSearcher());
KotlinSdkType.Companion.setUpIfNeeded();
//todo[Sedunov]: wait for fix in platform to avoid misunderstood from Java newbies (also ConfigureKotlinInTempDirTest)
//KotlinSdkType.Companion.setUpIfNeeded();
}
private static void registerPathVariable() {
@@ -128,4 +128,9 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() {
val settings = myProject.getLanguageVersionSettings()
Assert.assertEquals(ApiVersion.KOTLIN_1_1, settings.apiVersion)
}
//todo[Sedunov]: wait for fix in platform to avoid misunderstood from Java newbies (also PluginStartupComponent)
/*fun testKotlinSdkAdded() {
Assert.assertTrue(ProjectJdkTable.getInstance().allJdks.any { it.sdkType is KotlinSdkType })
}*/
}