User: rednesto
Date: 08 Jun 25 22:46
Revision: 0649022ea7495569c4a54abfea2d1d6df86dc219
Summary:
Merge branch '2024.3' into 2025.1


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=10067&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision e5e74064a776186dd18004bbfaabf74979edaca1)
+++ build.gradle.kts	(revision 0649022ea7495569c4a54abfea2d1d6df86dc219)
@@ -123,7 +123,6 @@
         pluginVerifier()
     }
 
-    testLibs(libs.test.mockJdk)
     testLibs(libs.test.mixin)
     testLibs(libs.test.spigotapi)
     testLibs(libs.test.bungeecord)
Index: gradle.properties
===================================================================
--- gradle.properties	(revision e5e74064a776186dd18004bbfaabf74979edaca1)
+++ gradle.properties	(revision 0649022ea7495569c4a54abfea2d1d6df86dc219)
@@ -23,7 +23,7 @@
 
 ideaVersionName = 2025.1
 
-coreVersion = 1.8.4
+coreVersion = 1.8.5
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
Index: gradle/libs.versions.toml
===================================================================
--- gradle/libs.versions.toml	(revision e5e74064a776186dd18004bbfaabf74979edaca1)
+++ gradle/libs.versions.toml	(revision 0649022ea7495569c4a54abfea2d1d6df86dc219)
@@ -57,7 +57,6 @@
 fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" }
 
 # Testing
-test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50"
 test-mixin = "org.spongepowered:mixin:0.8.5"
 test-spigotapi = "org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT"
 test-bungeecord = "net.md-5:bungeecord-api:1.21-R0.3-SNAPSHOT"
Index: src/main/kotlin/util/psi-utils.kt
===================================================================
--- src/main/kotlin/util/psi-utils.kt	(revision e5e74064a776186dd18004bbfaabf74979edaca1)
+++ src/main/kotlin/util/psi-utils.kt	(revision 0649022ea7495569c4a54abfea2d1d6df86dc219)
@@ -31,6 +31,7 @@
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.module.ModuleUtilCore
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.ProjectFileIndex
@@ -53,6 +54,7 @@
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiKeyword
 import com.intellij.psi.PsiLanguageInjectionHost
+import com.intellij.psi.PsiManager
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiMethodReferenceExpression
@@ -62,11 +64,13 @@
 import com.intellij.psi.PsiNameValuePair
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiParameterList
+import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiReference
 import com.intellij.psi.PsiReferenceExpression
 import com.intellij.psi.PsiType
 import com.intellij.psi.ResolveResult
 import com.intellij.psi.filters.ElementFilter
+import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.CachedValue
 import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
@@ -278,6 +282,14 @@
     return normalized
 }
 
+fun PsiType.toObjectType(project: Project): PsiType =
+    when (val normalized = normalize()) {
+        is PsiPrimitiveType ->
+            normalized.getBoxedType(PsiManager.getInstance(project), GlobalSearchScope.allScope(project))
+                ?: normalized
+        else -> normalized
+    }
+
 val PsiMethod.nameAndParameterTypes: String
     get() = "$name(${parameterList.parameters.joinToString(", ") { it.type.presentableText }})"