Skip to content

Fix potential deadlock when triggering project refresh while holding write lock #2595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
embeddedt wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix potential deadlock when triggering project refresh while holding write lock #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/main/kotlin/facet/MinecraftFacet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.intellij.facet.FacetManager
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.runReadAction
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.module.Module
Expand Down Expand Up @@ -77,7 +78,15 @@ class MinecraftFacet(
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
}
Expand Down Expand Up @@ -118,8 +127,6 @@ class MinecraftFacet(

newlyEnabled.forEach(AbstractModule::init)
modules.forEach(AbstractModule::refresh)

ProjectView.getInstance(module.project).refresh()
}

private fun updateRoots() = runWriteAction {
Expand Down
6 changes: 5 additions & 1 deletion src/main/kotlin/platform/mcp/McpModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import com.demonwav.mcdev.platform.mcp.util.McpConstants
import com.demonwav.mcdev.translations.TranslationFileListener
import com.demonwav.mcdev.util.runWriteTaskLater
import com.intellij.json.JsonFileType
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
import com.intellij.openapi.fileTypes.FileTypeManager
Expand Down Expand Up @@ -71,7 +72,10 @@ class McpModule(facet: MinecraftFacet) : AbstractModule(facet) {
}

if (requiresRefresh) {
ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))
// Schedule Gradle project refresh outside write lock
ApplicationManager.getApplication().invokeLater {
ExternalSystemUtil.refreshProjects(ImportSpecBuilder(project, GradleConstants.SYSTEM_ID))
}
}
}
}
Expand Down
Loading