Skip to content

Fix write-unsafe VFS refresh when loading templates #2593

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
morfidon wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −17
Open

Fix write-unsafe VFS refresh when loading templates #2593

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
2 changes: 1 addition & 1 deletion src/main/kotlin/creator/custom/providers/TemplateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ interface TemplateProvider {

try {
return file.refreshSync(modalityState)
?.inputStream?.reader()?.use { TemplateResourceBundle(it, parent) }
.inputStream.reader().use { TemplateResourceBundle(it, parent) }
} catch (t: Throwable) {
if (t is ControlFlowException) {
return parent
Expand Down
25 changes: 9 additions & 16 deletions src/main/kotlin/util/files.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ package com.demonwav.mcdev.util

import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.application.writeAction
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.newvfs.RefreshQueue
import java.io.File
import java.io.IOException
import java.nio.file.Path
Expand Down Expand Up @@ -79,18 +77,13 @@ val VirtualFile.mcDomainAndPath: Pair<String, String>?
operator fun Manifest.get(attribute: String): String? = mainAttributes.getValue(attribute)
operator fun Manifest.get(attribute: Attributes.Name): String? = mainAttributes.getValue(attribute)

suspend fun VirtualFile.refreshSync(modalityState: ModalityState): VirtualFile? {
fun refresh() {
RefreshQueue.getInstance().refresh(false, this.isDirectory, null, modalityState, this)
}

if (ApplicationManager.getApplication().isWriteAccessAllowed) {
refresh()
} else {
writeAction {
refresh()
}
}

return this.parent?.findOrCreateChildData(this, this.name)
suspend fun VirtualFile.refreshSync(modalityState: ModalityState): VirtualFile {
val file = this
ApplicationManager.getApplication().invokeAndWait(
{
file.refresh(false, true)
},
modalityState
)
return file
}
Loading