From 44a95f72c346607127e435c935e73b390b49f3d2 Mon Sep 17 00:00:00 2001
From: "Maxim.Kolmakov" <maxim.kolmakov@jetbrains.com>
Date: Thu, 3 Jul 2025 14:32:22 +0200
Subject: [PATCH] [mcpServer] Move link to the checkbox row

GitOrigin-RevId: b1353e3aef4378de6347ad8022d28e8ba5a18b85
---
 .../messages/McpServerBundle.properties       |  2 +-
 .../settings/McpServerSettingsConfigurable.kt | 40 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/plugins/mcp-server/resources/messages/McpServerBundle.properties b/plugins/mcp-server/resources/messages/McpServerBundle.properties
index 3325fd541d9d..98fca3c2e3d2 100644
--- a/plugins/mcp-server/resources/messages/McpServerBundle.properties
+++ b/plugins/mcp-server/resources/messages/McpServerBundle.properties
@@ -12,8 +12,8 @@ tab.title.mcp.command=MCP Command
 text.note.you.can.enable.brave.mode.in.settings.to.skip.this.confirmation=Note: You can enable 'Brave Mode' in settings to skip this confirmation.
 text.warning.enabling.brave.mode.will.allow.terminal.commands.to.execute.without.confirmation.use.with.caution=Enabling Brave Mode will allow terminal commands to execute without confirmation. Use with caution.
 enable.mcp.server=Enable MCP Server
+enable.mcp.server.when.enabled=Enable MCP Server:
 mcp.server.configurable.name=MCP Server
-mcp.server.is.running.on=SSE transport is running on
 copy.mcp.server.sse.configuration.json.to.clipboard=Copy sse server configuration JSON to clipboard
 copy.mcp.server.stdio.configuration.json.to.clipboard=Copy stdio server configuration JSON to clipboard
 json.configuration.copied.to.clipboard=JSON configuration copied to clipboard
diff --git a/plugins/mcp-server/src/com/intellij/mcpserver/settings/McpServerSettingsConfigurable.kt b/plugins/mcp-server/src/com/intellij/mcpserver/settings/McpServerSettingsConfigurable.kt
index d744043a6370..6bcb760bf9d4 100644
--- a/plugins/mcp-server/src/com/intellij/mcpserver/settings/McpServerSettingsConfigurable.kt
+++ b/plugins/mcp-server/src/com/intellij/mcpserver/settings/McpServerSettingsConfigurable.kt
@@ -16,6 +16,8 @@ import com.intellij.openapi.ui.MessageDialogBuilder
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.ui.dsl.builder.MutableProperty
+import com.intellij.ui.dsl.builder.RightGap
+import com.intellij.ui.dsl.builder.SpacingConfiguration
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.layout.ComponentPredicate
@@ -47,7 +49,13 @@ class McpServerSettingsConfigurable : SearchableConfigurable {
 
     val panel = panel {
       row {
-        val checkboxWithValidation = CheckboxWithValidation(McpServerBundle.message("enable.mcp.server"), ConsentValidator)
+        val checkboxWithValidation = CheckboxWithValidation(
+          if (McpServerService.getInstance().isRunning) {
+            McpServerBundle.message("enable.mcp.server.when.enabled")
+          }
+          else {
+            McpServerBundle.message("enable.mcp.server")
+          }, ConsentValidator)
         cell(checkboxWithValidation).bind(
           componentGet = { it.isValidatedSelected },
           componentSet = { component, value -> component.isValidatedSelected = value },
@@ -55,34 +63,26 @@ class McpServerSettingsConfigurable : SearchableConfigurable {
             getter = { settings.state.enableMcpServer },
             setter = { settings.state.enableMcpServer = it }
           )
-        )
+        ).gap(RightGap.SMALL)
         enabledCheckboxState = ValueComponentPredicate(checkboxWithValidation.isValidatedSelected).also { predicate ->
           checkboxWithValidation.addPropertyChangeListener(CheckboxWithValidation.IS_VALIDATED_SELECTED_PROPERTY) { evt ->
             predicate.set(evt.newValue as Boolean)
           }
         }
-      }
-      panel {
 
-        fun getLabelText(): String = if (McpServerService.getInstance().isRunning) McpServerBundle.message("mcp.server.is.running.on") else ""
         fun getLinkText(): String = if (McpServerService.getInstance().isRunning) McpServerService.getInstance().serverSseUrl else ""
-
-        row {
-          val label = label(getLabelText())
-          val link = link(getLinkText()) {
-            BrowserUtil.browse(it.actionCommand!!)
-          }
-
-          enabledCheckboxState!!.addListener {
-            McpServerService.getInstance().settingsChanged(it)
-            val isServerRunning = McpServerService.getInstance().isRunning
-            label.component.text = if (isServerRunning) getLabelText() else ""
-            link.component.text = if (isServerRunning) McpServerService.getInstance().serverSseUrl else ""
-          }
+        val link = link(getLinkText()) {
+          BrowserUtil.browse(it.actionCommand!!)
         }
 
-
-
+        enabledCheckboxState!!.addListener {
+          McpServerService.getInstance().settingsChanged(it)
+          val isServerRunning = McpServerService.getInstance().isRunning
+          link.component.text = if (isServerRunning) McpServerService.getInstance().serverSseUrl else ""
+          checkboxWithValidation.text = if (isServerRunning) McpServerBundle.message("enable.mcp.server.when.enabled") else McpServerBundle.message("enable.mcp.server")
+        }
+      }
+      panel {
         McpClientDetector.detectGlobalMcpClients().forEach { mcpClient ->
           val isConfigured = ValueComponentPredicate(mcpClient.isConfigured() ?: false)
           val isPortCorrect = ValueComponentPredicate(mcpClient.isPortCorrect())