User: rednesto
Date: 08 Feb 24 18:12
Revision: d839cd7162614eb3aa14d2467214a2da999b5aa6
Summary:
Merge branch '2023.2' into 2023.3


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

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision c90435bcde5562d227c14313fdf116a92cd05f4c)
+++ build.gradle.kts	(revision d839cd7162614eb3aa14d2467214a2da999b5aa6)
@@ -287,6 +287,7 @@
     style["bnf"] = HeaderStyle.BLOCK_COMMENT.format
 
     val endings = listOf("java", "kt", "kts", "groovy", "gradle.kts", "xml", "properties", "html", "flex", "bnf")
+    exclude("META-INF/plugin.xml") // https://youtrack.jetbrains.com/issue/IDEA-345026
     include(endings.map { "**/*.$it" })
 
     exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java")
Index: gradle.properties
===================================================================
--- gradle.properties	(revision c90435bcde5562d227c14313fdf116a92cd05f4c)
+++ gradle.properties	(revision d839cd7162614eb3aa14d2467214a2da999b5aa6)
@@ -24,7 +24,7 @@
 ideaVersion = 2023.3
 ideaVersionName = 2023.3
 
-coreVersion = 1.7.1
+coreVersion = 1.7.2
 downloadIdeaSources = true
 
 pluginTomlVersion = 233.11799.172
Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision c90435bcde5562d227c14313fdf116a92cd05f4c)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision d839cd7162614eb3aa14d2467214a2da999b5aa6)
@@ -27,7 +27,6 @@
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.util.SourceType
 import com.demonwav.mcdev.util.filterNotNull
-import com.demonwav.mcdev.util.invokeAndWait
 import com.demonwav.mcdev.util.mapFirstNotNull
 import com.google.common.collect.HashMultimap
 import com.intellij.facet.Facet
@@ -36,6 +35,7 @@
 import com.intellij.facet.FacetTypeRegistry
 import com.intellij.ide.projectView.ProjectView
 import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.application.runWriteActionAndWait
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleGrouper
@@ -77,9 +77,9 @@
         roots.clear()
     }
 
-    fun refresh() {
+    fun refresh() = runWriteActionAndWait {
         if (module.isDisposed) {
-            return
+            return@runWriteActionAndWait
         }
 
         // Don't allow parent types with child types in auto detected set
@@ -122,9 +122,9 @@
         ProjectView.getInstance(module.project).refresh()
     }
 
-    private fun updateRoots() = invokeAndWait {
+    private fun updateRoots() = runWriteAction {
         if (module.isDisposed) {
-            return@invokeAndWait
+            return@runWriteAction
         }
 
         roots.clear()
Index: src/main/kotlin/platform/mcp/actions/SrgActionBase.kt
===================================================================
--- src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision c90435bcde5562d227c14313fdf116a92cd05f4c)
+++ src/main/kotlin/platform/mcp/actions/SrgActionBase.kt	(revision d839cd7162614eb3aa14d2467214a2da999b5aa6)
@@ -37,6 +37,7 @@
 import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiReference
+import com.intellij.psi.util.createSmartPointer
 import com.intellij.ui.LightColors
 import com.intellij.ui.awt.RelativePoint
 import java.awt.Point
@@ -88,9 +89,10 @@
 
             val project = e.project ?: return
 
-            invokeLater {
-                val element = getDataFromActionEvent(e)?.element
+            val elementPointer = getDataFromActionEvent(e)?.element?.createSmartPointer()
-                val editor = getDataFromActionEvent(e)?.editor
+            val editor = getDataFromActionEvent(e)?.editor
+            invokeLater {
+                val element = elementPointer?.element
                 if (element != null && editor != null) {
                     val pos = editor.offsetToVisualPosition(element.textRange.endOffset - element.textLength / 2)
                     val at = RelativePoint(