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