From b2a989f5c3374bf1dd27dfd8298dfd1ae590fe34 Mon Sep 17 00:00:00 2001 From: kirillk Date: Tue, 2 Jun 2026 16:54:32 -0400 Subject: [PATCH] refactor(kilo-jetbrains): centralize settings EDT checks --- .../ai/kilocode/client/settings/base/BaseSettingsUi.kt | 2 +- .../ai/kilocode/client/settings/models/ModelsSettingsUi.kt | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/BaseSettingsUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/BaseSettingsUi.kt index efbf0ec2d5a..ebb7f1ed5ed 100644 --- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/BaseSettingsUi.kt +++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/base/BaseSettingsUi.kt @@ -143,7 +143,7 @@ internal abstract class BaseSettingsUi( fallback() } - protected fun checkEdt() { + private fun checkEdt() { check(ApplicationManager.getApplication().isDispatchThread) { "Settings UI updates must run on EDT" } } diff --git a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsUi.kt b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsUi.kt index 9815425415c..1f9a6e2b802 100644 --- a/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsUi.kt +++ b/packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/settings/models/ModelsSettingsUi.kt @@ -93,7 +93,6 @@ internal class ModelsSettingsUi( @RequiresEdt fun updateApp(state: KiloAppStateDto) { - checkEdt() appState = state if (state.status != KiloAppStatusDto.READY) { loading = false @@ -112,7 +111,6 @@ internal class ModelsSettingsUi( @RequiresEdt fun updateModelsWorkspace(state: ModelsWorkspaceDto) { - checkEdt() providers = state.providers agents = state.agents?.agents ?: emptyList() errors = state.errors @@ -125,7 +123,6 @@ internal class ModelsSettingsUi( @RequiresEdt fun updateModels(state: ai.kilocode.rpc.dto.ModelStateDto) { - checkEdt() syncContent() } @@ -151,7 +148,6 @@ internal class ModelsSettingsUi( @RequiresEdt private fun loadModels() { - checkEdt() val root = dir ?: return if (appState.status != KiloAppStatusDto.READY || loading || loaded) return loading = true @@ -165,7 +161,6 @@ internal class ModelsSettingsUi( @RequiresEdt override fun syncContent() { - checkEdt() allItems = items(false) val smallItems = items(true) val hasDir = dir != null || directory != null @@ -209,7 +204,6 @@ internal class ModelsSettingsUi( @RequiresEdt private fun syncModelBanner(state: ModelsStatus, login: Boolean) { - checkEdt() syncLoginBanner(login) { if ((saving || state == ModelsStatus.LOADING || state == ModelsStatus.SAVING) && top.isVisible) return@syncLoginBanner when (state) {