From e8746f71c753e8f6a5c15a226ebffccf2a052d9e Mon Sep 17 00:00:00 2001 From: FalsePattern Date: Thu, 27 Mar 2025 23:04:16 +0100 Subject: [PATCH] backport: 24.0.1 --- CHANGELOG.md | 2 +- .../debugger/settings/ZigDebuggerToolchainConfigurableUi.kt | 6 +++--- .../zigbrains/project/settings/ZigProjectSettingsPanel.kt | 2 +- gradle.properties | 2 +- .../falsepattern/zigbrains/lsp/settings/ZLSSettingsPanel.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eae02ee..d1b5538a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Changelog structure reference: ## [Unreleased] -## [24.0.0] +## [24.0.1] ### Added diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/settings/ZigDebuggerToolchainConfigurableUi.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/settings/ZigDebuggerToolchainConfigurableUi.kt index 66b534f9..779c68b3 100644 --- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/settings/ZigDebuggerToolchainConfigurableUi.kt +++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/settings/ZigDebuggerToolchainConfigurableUi.kt @@ -89,7 +89,7 @@ class ZigDebuggerToolchainConfigurableUi : ZigDebuggerUiComponent { row(ZigDebugBundle.message("settings.debugger.toolchain.debugger.label")) { comment = cell(debuggerKindComboBox) .comment("", DEFAULT_COMMENT_WIDTH) { - zigCoroutineScope.launchWithEDT(ModalityState.any()) { + zigCoroutineScope.launchWithEDT(ModalityState.defaultModalityState()) { withModalProgress(ModalTaskOwner.component(debuggerKindComboBox), "Downloading debugger", TaskCancellation.cancellable()) { downloadDebugger() } @@ -97,7 +97,7 @@ class ZigDebuggerToolchainConfigurableUi : ZigDebuggerUiComponent { } .applyToComponent { whenItemSelected(null) { - zigCoroutineScope.launchWithEDT(ModalityState.any()) { + zigCoroutineScope.launchWithEDT(ModalityState.defaultModalityState()) { this@ZigDebuggerToolchainConfigurableUi.update() } } @@ -112,7 +112,7 @@ class ZigDebuggerToolchainConfigurableUi : ZigDebuggerUiComponent { cell(useClion) } } - zigCoroutineScope.launchWithEDT(ModalityState.any()) { + zigCoroutineScope.launchWithEDT(ModalityState.defaultModalityState()) { update() } } diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/settings/ZigProjectSettingsPanel.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/settings/ZigProjectSettingsPanel.kt index b0f60ca6..df1d9115 100644 --- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/settings/ZigProjectSettingsPanel.kt +++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/settings/ZigProjectSettingsPanel.kt @@ -97,7 +97,7 @@ class ZigProjectSettingsPanel(private val holder: ZigProjectConfigurationProvide } private fun dispatchAutodetect(force: Boolean) { - project.zigCoroutineScope.launchWithEDT(ModalityState.any()) { + project.zigCoroutineScope.launchWithEDT(ModalityState.defaultModalityState()) { withModalProgress(ModalTaskOwner.component(pathToToolchain), "Detecting Zig...", TaskCancellation.cancellable()) { autodetect(force) } diff --git a/gradle.properties b/gradle.properties index f2060c2f..e6e7efbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ pluginName=ZigBrains pluginRepositoryUrl=https://github.com/FalsePattern/ZigBrains -pluginVersion=24.0.0 +pluginVersion=24.0.1 pluginSinceBuild=242 pluginUntilBuild=242.* diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettingsPanel.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettingsPanel.kt index d44ba09f..2806228c 100644 --- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettingsPanel.kt +++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSSettingsPanel.kt @@ -279,7 +279,7 @@ class ZLSSettingsPanel(private val project: Project) : ZigProjectConfigurationPr } private fun dispatchAutodetect(force: Boolean) { - project.zigCoroutineScope.launchWithEDT(ModalityState.any()) { + project.zigCoroutineScope.launchWithEDT(ModalityState.defaultModalityState()) { withModalProgress(ModalTaskOwner.component(zlsPath), "Detecting ZLS...", TaskCancellation.cancellable()) { autodetect(force) }