Skip to content

Commit f107172

Browse files
committed
Some cleanup
1 parent 14acd91 commit f107172

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

src/main/kotlin/creator/custom/providers/RemoteTemplateProvider.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,14 @@ import com.demonwav.mcdev.creator.custom.TemplateDescriptor
2828
import com.demonwav.mcdev.creator.modalityState
2929
import com.demonwav.mcdev.creator.selectProxy
3030
import com.demonwav.mcdev.update.PluginUtil
31-
import com.demonwav.mcdev.util.asyncIO
3231
import com.demonwav.mcdev.util.capitalize
33-
import com.demonwav.mcdev.util.invokeAndWait
3432
import com.demonwav.mcdev.util.refreshSync
3533
import com.github.kittinunf.fuel.core.FuelManager
3634
import com.github.kittinunf.fuel.coroutines.awaitByteArrayResult
3735
import com.github.kittinunf.result.getOrNull
3836
import com.github.kittinunf.result.onError
3937
import com.intellij.ide.util.projectWizard.WizardContext
4038
import com.intellij.openapi.application.PathManager
41-
import com.intellij.openapi.application.readAction
42-
import com.intellij.openapi.application.writeAction
4339
import com.intellij.openapi.diagnostic.ControlFlowException
4440
import com.intellij.openapi.diagnostic.thisLogger
4541
import com.intellij.openapi.observable.properties.PropertyGraph
@@ -48,7 +44,6 @@ import com.intellij.openapi.observable.util.transform
4844
import com.intellij.openapi.observable.util.trim
4945
import com.intellij.openapi.progress.ProgressIndicator
5046
import com.intellij.openapi.progress.ProgressManager
51-
import com.intellij.openapi.progress.blockingContext
5247
import com.intellij.openapi.util.NlsContexts
5348
import com.intellij.openapi.vfs.JarFileSystem
5449
import com.intellij.ui.CollectionComboBoxModel
@@ -62,20 +57,17 @@ import com.intellij.ui.dsl.builder.bindText
6257
import com.intellij.ui.dsl.builder.columns
6358
import com.intellij.ui.dsl.builder.panel
6459
import com.intellij.ui.dsl.builder.textValidation
65-
import com.intellij.util.application
6660
import com.intellij.util.io.createDirectories
6761
import java.awt.Component
6862
import java.nio.file.Path
6963
import javax.swing.JComponent
7064
import javax.swing.JLabel
7165
import javax.swing.JList
7266
import javax.swing.ListCellRenderer
73-
import javax.swing.SwingUtilities
7467
import kotlin.io.path.absolutePathString
7568
import kotlin.io.path.exists
7669
import kotlin.io.path.writeBytes
7770
import kotlinx.coroutines.Dispatchers
78-
import kotlinx.coroutines.coroutineScope
7971
import kotlinx.coroutines.withContext
8072

8173
open class RemoteTemplateProvider : TemplateProvider {
@@ -172,9 +164,7 @@ open class RemoteTemplateProvider : TemplateProvider {
172164
?: return@withContext emptyList()
173165
val modalityState = context.modalityState
174166

175-
blockingContext {
176-
rootFile.refreshSync(modalityState)
177-
}
167+
rootFile.refreshSync(modalityState)
178168

179169
val innerPath = replaceVariables(rawInnerPath)
180170
val repoRoot = if (innerPath.isNotBlank()) {

src/main/kotlin/util/utils.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ fun tryWriteSafeContext(modalityState: ModalityState = ModalityState.defaultModa
132132
}
133133
}
134134

135-
// Coroutine version of `tryWriteSafeContext`
136-
suspend fun tryWriteSafeContextSuspend(modalityState: ModalityState = ModalityState.defaultModalityState(), func: () -> Unit) {
137-
blockingContext {
138-
tryWriteSafeContext(modalityState, func)
139-
}
140-
}
141-
142135
inline fun <T : Any?> PsiFile.runWriteAction(crossinline func: () -> T) =
143136
applyWriteAction { func() }
144137

0 commit comments

Comments
 (0)