User: rednesto
Date: 10 Aug 24 15:01
Revision: cd57fa6b82e1a643fb37bc3db80ea52c949572c6
Summary:
Merge branch '2024.1' into 2024.2


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

Index: .gitignore
===================================================================
--- .gitignore	(revision e4376bf08b305a14975af9dc4cb5fef22833925a)
+++ .gitignore	(revision cd57fa6b82e1a643fb37bc3db80ea52c949572c6)
@@ -26,6 +26,8 @@
 **/.gradle/
 .intellijPlatform/
 .sandbox/
+.intellijPlatform/
+.kotlin/
 
 /gen/
 
Index: gradle.properties
===================================================================
--- gradle.properties	(revision e4376bf08b305a14975af9dc4cb5fef22833925a)
+++ gradle.properties	(revision cd57fa6b82e1a643fb37bc3db80ea52c949572c6)
@@ -24,7 +24,7 @@
 ideaVersion = 2024.2
 ideaVersionName = 2024.2
 
-coreVersion = 1.8.0
+coreVersion = 1.8.1
 org.jetbrains.intellij.platform.downloadSources=true
 
 # Silences a build-time warning because we are bundling our own kotlin library
Index: src/main/kotlin/creator/custom/CreatorContext.kt
===================================================================
--- src/main/kotlin/creator/custom/CreatorContext.kt	(revision e4376bf08b305a14975af9dc4cb5fef22833925a)
+++ src/main/kotlin/creator/custom/CreatorContext.kt	(revision cd57fa6b82e1a643fb37bc3db80ea52c949572c6)
@@ -54,4 +54,7 @@
      * A general purpose scope dependent of the main creator scope, cancelled when the creator is closed.
      */
     fun childScope(name: String): CoroutineScope = scope.childScope(name)
+
+    @Suppress("UNCHECKED_CAST")
+    fun <T> property(name: String): CreatorProperty<T> = properties[name] as CreatorProperty<T>
 }
Index: src/main/kotlin/platform/mixin/inspection/injector/InvalidInjectorMethodSignatureInspection.kt
===================================================================
--- src/main/kotlin/platform/mixin/inspection/injector/InvalidInjectorMethodSignatureInspection.kt	(revision e4376bf08b305a14975af9dc4cb5fef22833925a)
+++ src/main/kotlin/platform/mixin/inspection/injector/InvalidInjectorMethodSignatureInspection.kt	(revision cd57fa6b82e1a643fb37bc3db80ea52c949572c6)
@@ -32,6 +32,7 @@
 import com.demonwav.mcdev.platform.mixin.util.isConstructor
 import com.demonwav.mcdev.platform.mixin.util.isMixinExtrasSugar
 import com.demonwav.mcdev.util.Parameter
+import com.demonwav.mcdev.util.findKeyword
 import com.demonwav.mcdev.util.fullQualifiedName
 import com.demonwav.mcdev.util.invokeLater
 import com.demonwav.mcdev.util.synchronize
@@ -133,7 +134,7 @@
                         } else if (!shouldBeStatic && modifiers.hasModifierProperty(PsiModifier.STATIC)) {
                             reportedStatic = true
                             holder.registerProblem(
-                                identifier,
+                                modifiers.findKeyword(PsiModifier.STATIC) ?: identifier,
                                 "Method must not be static",
                                 QuickFixFactory.getInstance().createModifierListFix(
                                     modifiers,