User: joe
Date: 06 Apr 26 16:55
Revision: 7ae58e127042132c89f443d2405321b5911e6330
Summary:
Merge branch '2025.3' into 2026.1

# Conflicts:
#	src/main/kotlin/facet/MinecraftFacet.kt


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10478&personal=false

Index: src/main/kotlin/facet/MinecraftFacet.kt
===================================================================
--- src/main/kotlin/facet/MinecraftFacet.kt	(revision 90ec4b099575785984e30b731ff8b63b9aaf135e)
+++ src/main/kotlin/facet/MinecraftFacet.kt	(revision 7ae58e127042132c89f443d2405321b5911e6330)
@@ -32,10 +32,10 @@
 import com.google.common.collect.HashMultimap
 import com.intellij.facet.Facet
 import com.intellij.facet.FacetManager
-import com.intellij.facet.FacetType
 import com.intellij.facet.FacetTypeId
 import com.intellij.facet.FacetTypeRegistry
 import com.intellij.ide.projectView.ProjectView
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModuleRootManager
@@ -75,7 +75,15 @@
         roots.clear()
     }
 
-    fun refresh() = runWriteActionAndWait {
+    fun refresh() {
+        refreshWritePhase()
+        // Refresh the project view separately to not hold the write lock
+        ApplicationManager.getApplication().invokeLater {
+            ProjectView.getInstance(module.project).refresh()
+        }
+    }
+
+    private fun refreshWritePhase() = runWriteActionAndWait {
         if (module.isDisposed) {
             return@runWriteActionAndWait
         }
@@ -116,8 +124,6 @@
 
         newlyEnabled.forEach(AbstractModule::init)
         modules.forEach(AbstractModule::refresh)
-
-        ProjectView.getInstance(module.project).refresh()
     }
 
     private fun updateRoots() = runWriteAction {
Index: src/main/kotlin/platform/mcp/ct/CtCompletionContributor.kt
===================================================================
--- src/main/kotlin/platform/mcp/ct/CtCompletionContributor.kt	(revision 90ec4b099575785984e30b731ff8b63b9aaf135e)
+++ src/main/kotlin/platform/mcp/ct/CtCompletionContributor.kt	(revision 7ae58e127042132c89f443d2405321b5911e6330)
@@ -111,7 +111,9 @@
             "mutable",
             "transitive-mutable",
             "inject-interface",
-            "transitive-inject-interface"
+            "transitive-inject-interface",
+            "extend-enum",
+            "transitive-extend-enum",
         ).map { LookupElementBuilder.create(it).withInsertHandler { ctx, _ -> insertWhitespace(ctx) } }
         result.addAllElements(elements)
     }