[IJ Plugin] Move Rover settings to own section and add note about needing v0.27.0+

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/lsp/ApolloLspServerSupportProvider.kt

@@ -5,8 +5,8 @@ package com.apollographql.ijplugin.lsp
 import com.apollographql.ijplugin.file.ApolloGraphQLFileType
 import com.apollographql.ijplugin.icons.ApolloIcons
 import com.apollographql.ijplugin.rover.RoverHelper
-import com.apollographql.ijplugin.settings.SettingsConfigurable
 import com.apollographql.ijplugin.settings.appSettingsState
+import com.apollographql.ijplugin.settings.lsp.LspSettingsConfigurable
 import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
@@ -29,7 +29,7 @@ internal class ApolloLspServerSupportProvider : LspServerSupportProvider {
         lspServer = lspServer,
         currentFile = currentFile,
         icon = ApolloIcons.StatusBar.Apollo,
-        settingsPageClass = SettingsConfigurable::class.java,
+        settingsPageClass = LspSettingsConfigurable::class.java,
     )
   }
 }

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/SettingsComponent.kt

@@ -1,11 +1,8 @@
 package com.apollographql.ijplugin.settings
 
 import com.apollographql.ijplugin.ApolloBundle
-import com.apollographql.ijplugin.lsp.isLspAvailable
 import com.apollographql.ijplugin.project.apolloProjectService
-import com.apollographql.ijplugin.settings.lsp.lspGroup
 import com.apollographql.ijplugin.settings.studio.ApiKeyDialog
-import com.intellij.openapi.observable.properties.GraphProperty
 import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.project.Project
 import com.intellij.ui.AddEditRemovePanel
@@ -16,13 +13,11 @@ import javax.swing.JCheckBox
 import javax.swing.JComponent
 import javax.swing.JPanel
 
-
 class SettingsComponent(private val project: Project) {
   private val propertyGraph = PropertyGraph()
   private val automaticCodegenTriggeringProperty = propertyGraph.property(false)
   private val contributeConfigurationToGraphqlPluginProperty = propertyGraph.property(false)
   private val telemetryEnabledProperty = propertyGraph.property(false)
-  private val lspModeEnabledProperty: GraphProperty<Boolean> = propertyGraph.property(false)
 
   var automaticCodegenTriggering: Boolean by automaticCodegenTriggeringProperty
   var contributeConfigurationToGraphqlPlugin: Boolean by contributeConfigurationToGraphqlPluginProperty
@@ -32,7 +27,6 @@ class SettingsComponent(private val project: Project) {
       addEditRemovePanel?.data = value.toMutableList()
     }
   var telemetryEnabled: Boolean by telemetryEnabledProperty
-  var lspModeEnabled: Boolean by lspModeEnabledProperty
 
   private lateinit var chkAutomaticCodegenTriggering: JCheckBox
   private var addEditRemovePanel: AddEditRemovePanel<ApolloKotlinServiceConfiguration>? = null
@@ -106,10 +100,6 @@ class SettingsComponent(private val project: Project) {
       }
     }
 
-    if (isLspAvailable()) {
-      lspGroup(lspModeEnabledProperty)
-    }
-
     group(ApolloBundle.message("settings.telemetry.telemetryEnabled.title")) {
       row {
         checkBox(ApolloBundle.message("settings.telemetry.telemetryEnabled.text"))

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/SettingsConfigurable.kt

@@ -19,24 +19,21 @@ class SettingsConfigurable(private val project: Project) : Configurable {
     return settingsComponent!!.automaticCodegenTriggering != project.projectSettingsState.automaticCodegenTriggering ||
         settingsComponent!!.contributeConfigurationToGraphqlPlugin != project.projectSettingsState.contributeConfigurationToGraphqlPlugin ||
         settingsComponent!!.apolloKotlinServiceConfigurations != project.projectSettingsState.apolloKotlinServiceConfigurations ||
-        settingsComponent!!.telemetryEnabled != appSettingsState.telemetryEnabled ||
-        settingsComponent!!.lspModeEnabled != appSettingsState.lspModeEnabled
+        settingsComponent!!.telemetryEnabled != appSettingsState.telemetryEnabled
   }
 
   override fun apply() {
     project.projectSettingsState.automaticCodegenTriggering = settingsComponent!!.automaticCodegenTriggering
     project.projectSettingsState.contributeConfigurationToGraphqlPlugin = settingsComponent!!.contributeConfigurationToGraphqlPlugin
     project.projectSettingsState.apolloKotlinServiceConfigurations = settingsComponent!!.apolloKotlinServiceConfigurations
     appSettingsState.telemetryEnabled = settingsComponent!!.telemetryEnabled
-    appSettingsState.lspModeEnabled = settingsComponent!!.lspModeEnabled
   }
 
   override fun reset() {
     settingsComponent!!.automaticCodegenTriggering = project.projectSettingsState.automaticCodegenTriggering
     settingsComponent!!.contributeConfigurationToGraphqlPlugin = project.projectSettingsState.contributeConfigurationToGraphqlPlugin
     settingsComponent!!.apolloKotlinServiceConfigurations = project.projectSettingsState.apolloKotlinServiceConfigurations
     settingsComponent!!.telemetryEnabled = appSettingsState.telemetryEnabled
-    settingsComponent!!.lspModeEnabled = appSettingsState.lspModeEnabled
   }
 
   override fun getPreferredFocusedComponent() = settingsComponent!!.preferredFocusedComponent

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/lsp/LspSettingsPanel.kt → intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/lsp/LspSettingsComponent.kt

@@ -2,42 +2,45 @@ package com.apollographql.ijplugin.settings.lsp
 
 import com.apollographql.ijplugin.ApolloBundle
 import com.apollographql.ijplugin.rover.RoverHelper
-import com.intellij.icons.AllIcons
+import com.apollographql.ijplugin.settings.ApolloKotlinServiceConfiguration
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.observable.properties.GraphProperty
-import com.intellij.ui.components.JBLabel
+import com.intellij.openapi.observable.properties.PropertyGraph
+import com.intellij.openapi.project.Project
+import com.intellij.ui.AddEditRemovePanel
 import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.Cell
-import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.Row
 import com.intellij.ui.dsl.builder.bindSelected
-import com.intellij.ui.scale.JBUIScale
+import com.intellij.ui.dsl.builder.panel
+import javax.swing.JCheckBox
 import javax.swing.JLabel
-import javax.swing.SwingConstants
+import javax.swing.JPanel
 
-fun Panel.lspGroup(lspModeEnabledProperty: GraphProperty<Boolean>) {
-  var roverVersionLabel: Cell<JLabel>? = null
-  var installationInstructionsLink: Row? = null
-  group(JBLabel(ApolloBundle.message("settings.rover.title")).apply {
-    setHorizontalTextPosition(SwingConstants.LEFT)
-    setIconTextGap(JBUIScale.scale(8))
-    setIcon(AllIcons.General.Beta)
-  }) {
+class LspSettingsComponent(private val project: Project) {
+  private val propertyGraph = PropertyGraph()
+  private val lspModeEnabledProperty: GraphProperty<Boolean> = propertyGraph.property(false)
+
+  var lspModeEnabled: Boolean by lspModeEnabledProperty
+
+  private lateinit var chkAutomaticCodegenTriggering: JCheckBox
+  private var addEditRemovePanel: AddEditRemovePanel<ApolloKotlinServiceConfiguration>? = null
+
+  val panel: JPanel = panel {
+    var roverVersionLabel: Cell<JLabel>? = null
+    var installationInstructionsLink: Row? = null
     row {
       text(ApolloBundle.message("settings.rover.intro"))
     }
-
     row {
       roverVersionLabel = label(ApolloBundle.message("settings.rover.checking"))
           .align(AlignX.FILL)
     }
-
     installationInstructionsLink =
       row {
         text(ApolloBundle.message("settings.rover.notInstalled.instructions"))
       }
           .visible(false)
-
     buttonsGroup {
       row {
         radioButton(ApolloBundle.message("settings.rover.lsp.disabled"), null)
@@ -55,22 +58,23 @@ fun Panel.lspGroup(lspModeEnabledProperty: GraphProperty<Boolean>) {
             .bindSelected(lspModeEnabledProperty)
       }
     }
-  }
-  ApplicationManager.getApplication().executeOnPooledThread {
-    val roverStatus = RoverHelper.getRoverStatus()
-    when (roverStatus) {
-      is RoverHelper.RoverStatus.Installed -> {
-        if (!roverStatus.hasLsp) {
-          roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.installed.noLsp", roverStatus.version)
-          installationInstructionsLink!!.visible(true)
-        } else {
-          roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.installed.withLsp", roverStatus.version)
+
+    ApplicationManager.getApplication().executeOnPooledThread {
+      val roverStatus = RoverHelper.getRoverStatus()
+      when (roverStatus) {
+        is RoverHelper.RoverStatus.Installed -> {
+          if (!roverStatus.hasLsp) {
+            roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.installed.noLsp", roverStatus.version)
+            installationInstructionsLink!!.visible(true)
+          } else {
+            roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.installed.withLsp", roverStatus.version)
+          }
         }
-      }
 
-      is RoverHelper.RoverStatus.NotInstalled -> {
-        roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.notInstalled")
-        installationInstructionsLink!!.visible(true)
+        is RoverHelper.RoverStatus.NotInstalled -> {
+          roverVersionLabel!!.component.text = ApolloBundle.message("settings.rover.notInstalled")
+          installationInstructionsLink!!.visible(true)
+        }
       }
     }
   }

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/lsp/LspSettingsConfigurable.kt

@@ -0,0 +1,35 @@
+package com.apollographql.ijplugin.settings.lsp
+
+import com.apollographql.ijplugin.ApolloBundle
+import com.apollographql.ijplugin.settings.appSettingsState
+import com.intellij.openapi.options.Configurable
+import com.intellij.openapi.project.Project
+import javax.swing.JComponent
+
+class LspSettingsConfigurable(private val project: Project) : Configurable, Configurable.Beta {
+  private var settingsComponent: LspSettingsComponent? = null
+
+  override fun getDisplayName() = ApolloBundle.message("settings.rover.title")
+
+  override fun createComponent(): JComponent {
+    val settingsComponent = LspSettingsComponent(project)
+    this.settingsComponent = settingsComponent
+    return settingsComponent.panel
+  }
+
+  override fun isModified(): Boolean {
+    return settingsComponent!!.lspModeEnabled != appSettingsState.lspModeEnabled
+  }
+
+  override fun apply() {
+    appSettingsState.lspModeEnabled = settingsComponent!!.lspModeEnabled
+  }
+
+  override fun reset() {
+    settingsComponent!!.lspModeEnabled = appSettingsState.lspModeEnabled
+  }
+
+  override fun disposeUIResources() {
+    settingsComponent = null
+  }
+}

intellij-plugin/src/main/resources/META-INF/com.apollographql.ijplugin-ultimate.xml

@@ -25,5 +25,16 @@
         implementation="com.apollographql.ijplugin.lsp.ApolloLspServerSupportProvider"
     />
 
+    <!-- Note: the value of `parentId` corresponds to the settings `id` of the JS GraphQL plugin -->
+    <!-- See https://github.com/JetBrains/js-graphql-intellij-plugin/blob/396770c293a57f4903acdf427ba5136db6a79d0b/resources/META-INF/plugin.xml#L151 -->
+    <projectConfigurable
+        id="com.apollographql.ijplugin.settings.lsp.LspSettingsConfigurable"
+        parentId="settings.jsgraphql"
+        instance="com.apollographql.ijplugin.settings.lsp.LspSettingsConfigurable"
+        key="settings.rover.title"
+        nonDefaultProject="true"
+        bundle="messages.ApolloBundle"
+    />
+
   </extensions>
 </idea-plugin>

intellij-plugin/src/main/resources/messages/ApolloBundle.properties

@@ -121,7 +121,7 @@ settings.rover.checking=Checking for Rover...
 settings.rover.installed.withLsp=<html>Rover <b>{0}</b> is installed. ✅
 settings.rover.installed.noLsp=<html><font color="#FF8080">Rover <b>{0}</b> is installed, please install version <b>0.27.0</b> or more recent.
 settings.rover.notInstalled=<html><font color="#FF8080">Rover doesn\'t seem to be installed.
-settings.rover.notInstalled.instructions=Please refer to the <a href=\"https://www.apollographql.com/docs/rover/getting-started\">installation instructions</a>.
+settings.rover.notInstalled.instructions=Please refer to the <a href=\"https://www.apollographql.com/docs/rover/getting-started\">installation instructions</a>. Please make sure to install version <b>0.27.0</b> or more recent.
 settings.rover.lsp.disabled=Disabled
 settings.rover.lsp.disabled.help=Disable the Rover integration. The schema editing experience will rely on the GraphQL plugin's implementation. Recommended for Apollo Kotlin users.
 settings.rover.lsp.enabled=Enabled