Skip to content

Commit 61a827c

Browse files
committed
Fix #40: ProhibitedAnalysisException when moving Kotlin files.
Version 1.24.13.
1 parent 08b076d commit 61a827c

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.24.13
2+
* Fix [#40](https://github.com/BlueBoxWare/LibGDXPlugin/issues/40): ProhibitedAnalysisException.
3+
14
### 1.24.12
25
* Fix [#39](https://github.com/BlueBoxWare/LibGDXPlugin/issues/39): Error when opening project.
36

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
21
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43

54
plugins {
65
id("java")
76
id("maven-publish")
8-
id("org.jetbrains.kotlin.jvm") version "2.0.0"
7+
id("org.jetbrains.kotlin.jvm") version "2.1.20"
98
id("com.github.blueboxware.tocme") version "1.8"
109
id("org.jetbrains.intellij.platform") version "2.6.0"
1110
}
@@ -80,7 +79,7 @@ tasks {
8079

8180
named<KotlinCompile>("compileTestKotlin") {
8281
compilerOptions {
83-
freeCompilerArgs.add("-opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction")
82+
optIn.set(listOf("org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction"))
8483
}
8584
}
8685

gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginGroup = com.gmail.blueboxware
22
pluginName = LibGDX
3-
pluginVersion = 1.24.12
3+
pluginVersion = 1.24.13
44

55
pluginSinceBuild = 243.21565.193
66

@@ -14,4 +14,5 @@ platformBundledPlugins = com.intellij.java, org.jetbrains.kotlin, org.intellij.g
1414

1515
kotlin.stdlib.default.dependency = false
1616

17-
kotlin.daemon.jvmargs=-Xmx2000m
17+
kotlin.daemon.jvmargs=-Xmx4g
18+
org.gradle.jvmargs=-Xmx4g

src/main/kotlin/com/gmail/blueboxware/libgdxplugin/utils/PsiUtils.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import com.intellij.psi.util.PsiTreeUtil
1616
import com.intellij.psi.util.TypeConversionUtil
1717
import com.intellij.util.PathUtil
1818
import org.jetbrains.kotlin.analysis.api.analyze
19+
import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisFromWriteAction
1920
import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
2021
import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
2122
import org.jetbrains.kotlin.analysis.api.types.KaClassType
@@ -243,6 +244,10 @@ internal fun PsiMethodCallExpression.resolveCallToStrings(): Pair<String, String
243244

244245
private val RESOLVED_CALL_KEY = key<CachedValue<Pair<ClassId, String>?>>("resolved_call")
245246

247+
@OptIn(
248+
KaAllowAnalysisOnEdt::class,
249+
KaAllowAnalysisFromWriteAction::class
250+
)
246251
internal fun KtQualifiedExpression.resolveCall(): Pair<ClassId, String>? {
247252

248253
return getCachedValue(RESOLVED_CALL_KEY) {

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<change-notes><![CDATA[
3333
<ul>
34-
<li>Fix <a href="https://github.com/BlueBoxWare/LibGDXPlugin/issues/39">#39</a>: errors on opening project.</li>
34+
<li>Fix <a href="https://github.com/BlueBoxWare/LibGDXPlugin/issues/40">#40</a>: ProhibitedAnalysisException.</li>
3535
</ul>
3636
]]>
3737
</change-notes>

0 commit comments

Comments
 (0)