From 48287694499c72b5bd798d423ae63ae26bb9c19e Mon Sep 17 00:00:00 2001 From: Ekaterina Chernikova Date: Tue, 15 Apr 2025 14:56:09 +0200 Subject: [PATCH] DBE-21310: Support floating toolbar for SQL code editing (cherry picked from commit ff90e0c16dfba0a9c0ddeca2b2a0d8ac34353cdc) IJ-CR-160832 GitOrigin-RevId: 81a46f6d4be6821d32d467fb5da045be49b346ba --- .../ui/codeFloatingToolbar/FloatingToolbarCustomizer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/codeFloatingToolbar/FloatingToolbarCustomizer.kt b/platform/platform-impl/src/com/intellij/ui/codeFloatingToolbar/FloatingToolbarCustomizer.kt index 4a24106ff118..39984c4f5f0f 100644 --- a/platform/platform-impl/src/com/intellij/ui/codeFloatingToolbar/FloatingToolbarCustomizer.kt +++ b/platform/platform-impl/src/com/intellij/ui/codeFloatingToolbar/FloatingToolbarCustomizer.kt @@ -21,7 +21,7 @@ private val EP: ExtensionPointName = ExtensionPoint private const val FLOATING_CODE_TOOLBAR_GROUP_ID = "Floating.CodeToolbar" private fun forLanguage(language: Language): FloatingToolbarLanguageBean? { - return EP.extensionList.firstOrNull { bean -> bean.language == language.id } + return EP.extensionList.firstOrNull { bean -> bean.language == language.id || bean.language == language.baseLanguage?.id } } internal fun findActionGroupFor(language: Language): String? {