File tree Expand file tree Collapse file tree 4 files changed +23
-24
lines changed
src/org/elixir_lang/sdk/elixir Expand file tree Collapse file tree 4 files changed +23
-24
lines changed Original file line number Diff line number Diff line change 35
35
run : ./gradlew --stacktrace releaseQuoter
36
36
- name : Test with Gradle
37
37
run : ./gradlew --stacktrace test
38
- runPluginVerifier :
38
+ verifyPlugin :
39
39
runs-on : ubuntu-latest
40
40
41
41
steps :
48
48
- name : Grant execute permission for gradlew
49
49
run : chmod +x gradlew
50
50
- name : Run Plugin Verifier
51
- run : ./gradlew --stacktrace runPluginVerifier
51
+ run : ./gradlew --stacktrace verifyPlugin
52
52
release :
53
- needs : [ test, runPluginVerifier ]
53
+ needs : [ test, verifyPlugin ]
54
54
runs-on : ubuntu-latest
55
55
56
56
steps :
Original file line number Diff line number Diff line change 42
42
run : ./gradlew --stacktrace releaseQuoter
43
43
- name : Test with Gradle
44
44
run : ./gradlew --stacktrace test
45
- runPluginVerifier :
45
+ verifyPlugin :
46
46
runs-on : ubuntu-latest
47
47
48
48
steps :
Original file line number Diff line number Diff line change 1
1
elixir 1.13.4-otp-24
2
2
erlang 24.3.4.6
3
3
4
- # 17 .0.12 +7 / Azul Zulu: 17.52 .17
5
- # GitHub actions uses JBR 17
4
+ # 21 .0.4 +7 / Azul Zulu: 21.36 .17
5
+ # GitHub actions uses JBR 21
6
6
# If using mise, you can change below to use JBR as well by doing (if version is 17.xxx)
7
- # mise link java@jbrsdk_jcef-17.0.11-b1312.2-2024.2 /path/to/jbrsdk_jcef-17.0.11-xxx-xxx-b1207.24/Contents/Home
8
- # Then setting it to `java jbrsdk_jcef-17.0.11-b1312.2-2024.2`
9
- java zulu-17.52.17
7
+ # mac:
8
+ # mise link java@jbrsdk_jcef-21.0.3-b509.4-2024.2 /path/to/jbrsdk_jcef-21.0.3-xxx-xxx-b509.4/Contents/Home
9
+ # Then setting it to `java jbrsdk_jcef-21.0.3-b509.4-2024.2`
10
+ java zulu-21.36.17
Original file line number Diff line number Diff line change @@ -531,23 +531,21 @@ ELIXIR_SDK_HOME
531
531
return if (! project.isDisposed) {
532
532
/* ModuleUtilCore.findModuleForPsiElement can fail with NullPointerException if the
533
533
ProjectFileIndex.SERVICE.getInstance(Project) returns {@code null}, so check that the
534
- ProjectFileIndex is available first
535
- */
534
+ ProjectFileIndex is available first */
536
535
if (ProjectFileIndex .SERVICE .getInstance(project) != null ) {
537
- ApplicationManager .getApplication().executeOnPooledThread(Callable {
538
- ReadAction .compute<Sdk ?, Throwable > {
539
- try {
540
- val module = ModuleUtilCore .findModuleForPsiElement(psiElement)
541
- if (module != null ) {
542
- mostSpecificSdk(module)
543
- } else {
544
- mostSpecificSdk(project)
545
- }
546
- } catch (_: AlreadyDisposedException ) {
547
- null
548
- }
536
+ val module = try {
537
+ ReadAction .compute<Module , Throwable > {
538
+ ModuleUtilCore .findModuleForPsiElement(psiElement)
549
539
}
550
- }).get()
540
+ } catch (_: AlreadyDisposedException ) {
541
+ null
542
+ }
543
+
544
+ if (module != null ) {
545
+ mostSpecificSdk(module)
546
+ } else {
547
+ mostSpecificSdk(project)
548
+ }
551
549
} else {
552
550
mostSpecificSdk(project)
553
551
}
You can’t perform that action at this time.
0 commit comments