@@ -10,17 +10,21 @@ import com.intellij.openapi.module.Module
10
10
import com.intellij.openapi.module.ModuleManager
11
11
import com.intellij.openapi.project.ModuleListener
12
12
import com.intellij.openapi.project.Project
13
- import com.intellij.openapi.projectRoots.ProjectJdkTable
14
- import com.intellij.openapi.projectRoots.Sdk
13
+ import com.intellij.openapi.projectRoots.*
14
+ import com.intellij.openapi.projectRoots.impl.JavaHomeFinder
15
+ import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
15
16
import com.intellij.openapi.roots.ModuleRootModificationUtil
16
17
import com.intellij.openapi.roots.ProjectRootManager
18
+ import com.intellij.openapi.vfs.VirtualFileManager
17
19
import com.intellij.util.application
18
20
import kotlinx.coroutines.GlobalScope
19
21
import kotlinx.coroutines.future.await
20
22
import kotlinx.coroutines.launch
23
+ import java.nio.file.Path
21
24
import java.util.concurrent.CompletableFuture
22
25
23
26
27
+ @Suppress(" UnstableApiUsage" , " OPT_IN_USAGE" )
24
28
class GitpodProjectManager (
25
29
private val project : Project
26
30
) {
@@ -29,20 +33,37 @@ class GitpodProjectManager(
29
33
configureSdks()
30
34
}
31
35
32
- /* *
33
- * It is a workaround for https://youtrack.jetbrains.com/issue/GTW-88
34
- */
35
36
private fun configureSdks () {
36
37
if (application.isHeadlessEnvironment) {
37
38
return
38
39
}
39
40
val pendingSdk = CompletableFuture <Sdk >()
40
41
application.invokeLaterOnWriteThread {
41
42
application.runWriteAction {
43
+ val jdkTable = ProjectJdkTable .getInstance()
44
+
42
45
try {
43
- ProjectJdkTable .getInstance().preconfigure()
44
- pendingSdk.complete(ProjectJdkTable .getInstance().allJdks.firstOrNull())
46
+ var sdk: Sdk ? = null
47
+ val javaHome = JavaHomeFinder .getFinder().findExistingJdks().firstOrNull()
48
+ val sdkType = SdkType .findByName(jdkTable.defaultSdkType.name)
49
+
50
+ if (javaHome != = null && sdkType != null && JdkUtil .checkForJdk(javaHome)) {
51
+ val javaHomeVirtualFile = VirtualFileManager .getInstance().findFileByNioPath(Path .of(javaHome))
52
+
53
+ if (javaHomeVirtualFile != null ) {
54
+ sdk = SdkConfigurationUtil .setupSdk(jdkTable.allJdks, javaHomeVirtualFile, sdkType, false , null , null )
55
+ }
56
+ }
57
+
58
+ if (sdk != null && jdkTable.findJdk(sdk.name) == null ) {
59
+ jdkTable.addJdk(sdk)
60
+ pendingSdk.complete(sdk)
61
+ } else {
62
+ application.invokeAndWait { jdkTable.preconfigure() }
63
+ pendingSdk.complete(jdkTable.allJdks.firstOrNull())
64
+ }
45
65
} catch (t: Throwable ) {
66
+ application.invokeAndWait { jdkTable.preconfigure() }
46
67
pendingSdk.completeExceptionally(t)
47
68
}
48
69
}
@@ -58,24 +79,23 @@ class GitpodProjectManager(
58
79
configureSdk(sdk)
59
80
}
60
81
}
61
-
62
82
private fun configureSdk (sdk : Sdk ) {
63
83
application.invokeLaterOnWriteThread {
64
84
application.runWriteAction {
65
85
val projectRootManager = ProjectRootManager .getInstance(project)
66
- if (projectRootManager.projectSdk == null ) {
86
+ if (projectRootManager.projectSdk != sdk ) {
67
87
projectRootManager.projectSdk = sdk
68
88
thisLogger().warn(" gitpod: '${project.name} ' project: SDK was auto preconfigured: $sdk " )
69
89
}
70
90
}
71
91
}
72
92
for (module in ModuleManager .getInstance(project).modules) {
73
93
ModuleRootModificationUtil .updateModel(module) { m ->
74
- if (m.sdk == null ) {
94
+ if (m.sdk != sdk ) {
75
95
m.sdk = sdk
76
96
thisLogger().warn(" gitpod: '${module.name} ' module: SDK was auto preconfigured: $sdk " )
77
97
}
78
98
}
79
99
}
80
100
}
81
- }
101
+ }
0 commit comments