Use Java SDK defined on JAVA_HOME by default on JetBrains IDEs

Author: felladrin

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodProjectManager.kt

@@ -10,8 +10,9 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.ModuleListener
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.projectRoots.ProjectJdkTable
-import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.projectRoots.*
+import com.intellij.openapi.projectRoots.impl.JavaHomeFinder
+import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.roots.ModuleRootModificationUtil
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.util.application
@@ -21,6 +22,7 @@ import kotlinx.coroutines.launch
 import java.util.concurrent.CompletableFuture
 
 
+@Suppress("UnstableApiUsage", "OPT_IN_USAGE")
 class GitpodProjectManager(
         private val project: Project
 ) {
@@ -40,8 +42,11 @@ class GitpodProjectManager(
         application.invokeLaterOnWriteThread {
             application.runWriteAction {
                 try {
-                    ProjectJdkTable.getInstance().preconfigure()
-                    pendingSdk.complete(ProjectJdkTable.getInstance().allJdks.firstOrNull())
+                    val jdkTable = ProjectJdkTable.getInstance()
+                    JavaHomeFinder.getFinder().findExistingJdks().forEach { javaHome ->
+                        SdkConfigurationUtil.createAndAddSDK(javaHome, SdkType.findByName(jdkTable.defaultSdkType.name)!!)
+                    }
+                    pendingSdk.complete(jdkTable.allJdks.firstOrNull())
                 } catch (t: Throwable) {
                     pendingSdk.completeExceptionally(t)
                 }
@@ -58,24 +63,23 @@ class GitpodProjectManager(
             configureSdk(sdk)
         }
     }
-
     private fun configureSdk(sdk: Sdk) {
         application.invokeLaterOnWriteThread {
             application.runWriteAction {
                 val projectRootManager = ProjectRootManager.getInstance(project)
-                if (projectRootManager.projectSdk == null) {
+                if (projectRootManager.projectSdk != sdk) {
                     projectRootManager.projectSdk = sdk
                     thisLogger().warn("gitpod: '${project.name}' project: SDK was auto preconfigured: $sdk")
                 }
             }
         }
         for (module in ModuleManager.getInstance(project).modules) {
             ModuleRootModificationUtil.updateModel(module) { m ->
-                if (m.sdk == null) {
+                if (m.sdk != sdk) {
                     m.sdk = sdk
                     thisLogger().warn("gitpod: '${module.name}' module: SDK was auto preconfigured: $sdk")
                 }
             }
         }
     }
-}
+}