[IJ Plugin] Pass arguments to rover (#6303)

Author: BoD

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/gradle/GradleToolingModelService.kt

@@ -9,12 +9,12 @@ import com.apollographql.ijplugin.settings.ProjectSettingsState
 import com.apollographql.ijplugin.settings.projectSettingsState
 import com.apollographql.ijplugin.telemetry.telemetryService
 import com.apollographql.ijplugin.util.dispose
+import com.apollographql.ijplugin.util.executeOnPooledThread
 import com.apollographql.ijplugin.util.isNotDisposed
 import com.apollographql.ijplugin.util.logd
 import com.apollographql.ijplugin.util.logw
 import com.apollographql.ijplugin.util.newDisposable
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskId
@@ -144,7 +144,7 @@ class GradleToolingModelService(
       return
     }
 
-    fetchToolingModelsTask = FetchToolingModelsTask().also { ApplicationManager.getApplication().executeOnPooledThread(it) }
+    fetchToolingModelsTask = FetchToolingModelsTask().also { executeOnPooledThread { it.run() } }
   }
 
   private inner class FetchToolingModelsTask : Runnable {

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

@@ -0,0 +1,82 @@
+package com.apollographql.ijplugin.lsp
+
+import com.apollographql.ijplugin.settings.AppSettingsListener
+import com.apollographql.ijplugin.settings.AppSettingsState
+import com.apollographql.ijplugin.settings.ProjectSettingsListener
+import com.apollographql.ijplugin.settings.ProjectSettingsState
+import com.apollographql.ijplugin.settings.appSettingsState
+import com.apollographql.ijplugin.settings.projectSettingsState
+import com.apollographql.ijplugin.util.logd
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.runWriteAction
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx
+import com.intellij.openapi.project.Project
+import com.intellij.util.application
+
+@Service(Service.Level.APP)
+class ApolloLspAppService : Disposable {
+  init {
+    logd()
+    startObserveSettings()
+  }
+
+  private fun startObserveSettings() {
+    logd()
+    application.messageBus.connect(this).subscribe(AppSettingsListener.TOPIC, object : AppSettingsListener {
+      var lspModeEnabled = appSettingsState.lspModeEnabled
+      override fun settingsChanged(appSettingsState: AppSettingsState) {
+        val lspModeEnabledChanged = lspModeEnabled != appSettingsState.lspModeEnabled
+        lspModeEnabled = appSettingsState.lspModeEnabled
+        logd("lspModeEnabledChanged=$lspModeEnabledChanged")
+        if (lspModeEnabledChanged) {
+          runWriteAction {
+            FileTypeManagerEx.getInstanceEx().makeFileTypesChange("Apollo GraphQL file type change", {})
+          }
+          restartApolloLsp()
+        }
+      }
+    })
+  }
+
+  override fun dispose() {
+    logd()
+  }
+}
+
+@Service(Service.Level.PROJECT)
+class ApolloLspProjectService(private val project: Project) : Disposable {
+  init {
+    logd()
+    startObserveSettings()
+  }
+
+  private fun startObserveSettings() {
+    logd()
+    project.messageBus.connect(this).subscribe(ProjectSettingsListener.TOPIC, object : ProjectSettingsListener {
+      var lspPassPathToSuperGraphYaml = project.projectSettingsState.lspPassPathToSuperGraphYaml
+      var lspPathToSuperGraphYaml = project.projectSettingsState.lspPathToSuperGraphYaml
+      var lspPassAdditionalArguments = project.projectSettingsState.lspPassAdditionalArguments
+      var lspAdditionalArguments = project.projectSettingsState.lspAdditionalArguments
+
+      override fun settingsChanged(projectSettingsState: ProjectSettingsState) {
+        val lspPassPathToSuperGraphYamlChanged = lspPassPathToSuperGraphYaml != projectSettingsState.lspPassPathToSuperGraphYaml
+        val lspPathToSuperGraphYamlChanged = lspPathToSuperGraphYaml != projectSettingsState.lspPathToSuperGraphYaml
+        val lspPassAdditionalArgumentsChanged = lspPassAdditionalArguments != projectSettingsState.lspPassAdditionalArguments
+        val lspAdditionalArgumentsChanged = lspAdditionalArguments != projectSettingsState.lspAdditionalArguments
+        lspPassPathToSuperGraphYaml = projectSettingsState.lspPassPathToSuperGraphYaml
+        lspPathToSuperGraphYaml = projectSettingsState.lspPathToSuperGraphYaml
+        lspPassAdditionalArguments = projectSettingsState.lspPassAdditionalArguments
+        lspAdditionalArguments = projectSettingsState.lspAdditionalArguments
+        logd("lspPassPathToSuperGraphYamlChanged=$lspPassPathToSuperGraphYamlChanged lspPathToSuperGraphYamlChanged=$lspPathToSuperGraphYamlChanged lspPassAdditionalArgumentsChanged=$lspPassAdditionalArgumentsChanged lspAdditionalArgumentsChanged=$lspAdditionalArgumentsChanged")
+        if (lspPassPathToSuperGraphYamlChanged || lspPathToSuperGraphYamlChanged || lspPassAdditionalArgumentsChanged || lspAdditionalArgumentsChanged) {
+          restartApolloLsp()
+        }
+      }
+    })
+  }
+
+  override fun dispose() {
+    logd()
+  }
+}

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

@@ -7,7 +7,7 @@ import com.apollographql.ijplugin.icons.ApolloIcons
 import com.apollographql.ijplugin.rover.RoverHelper
 import com.apollographql.ijplugin.settings.appSettingsState
 import com.apollographql.ijplugin.settings.lsp.LspSettingsConfigurable
-import com.intellij.openapi.application.invokeLater
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.vfs.VirtualFile
@@ -36,16 +36,16 @@ internal class ApolloLspServerSupportProvider : LspServerSupportProvider {
 
 private class ApolloLspServerDescriptor(project: Project) : ProjectWideLspServerDescriptor(project, "Apollo") {
   override fun isSupportedFile(file: VirtualFile) = file.extension in ApolloGraphQLFileType.SUPPORTED_EXTENSIONS
-  override fun createCommandLine() = RoverHelper.getLspCommandLine()
+  override fun createCommandLine() = RoverHelper.getLspCommandLine(project)
 
   override fun getLanguageId(file: VirtualFile): String {
     return "graphql"
   }
 }
 
 fun restartApolloLsp() {
-  invokeLater {
-    for (project in ProjectManager.getInstance().getOpenProjects()) {
+  runInEdt {
+    for (project in ProjectManager.getInstance().openProjects) {
       LspServerManager.getInstance(project).stopAndRestartIfNeeded(ApolloLspServerSupportProvider::class.java)
     }
   }

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

@@ -3,7 +3,8 @@ package com.apollographql.ijplugin.project
 import com.apollographql.ijplugin.codegen.ApolloCodegenService
 import com.apollographql.ijplugin.gradle.GradleToolingModelService
 import com.apollographql.ijplugin.graphql.GraphQLConfigService
-import com.apollographql.ijplugin.lsp.ApolloLspService
+import com.apollographql.ijplugin.lsp.ApolloLspAppService
+import com.apollographql.ijplugin.lsp.ApolloLspProjectService
 import com.apollographql.ijplugin.lsp.isLspAvailable
 import com.apollographql.ijplugin.settings.ProjectSettingsService
 import com.apollographql.ijplugin.studio.fieldinsights.FieldInsightsService
@@ -32,7 +33,8 @@ internal class ApolloProjectManagerListener : ProjectManagerListener {
       project.service<FieldInsightsService>()
       project.service<TelemetryService>()
       if (isLspAvailable()) {
-        application.service<ApolloLspService>()
+        project.service<ApolloLspProjectService>()
+        application.service<ApolloLspAppService>()
       }
 
       project.apolloProjectService.isInitialized = true

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/project/ApolloProjectManagerListener.kt

@@ -11,7 +11,6 @@ import com.apollographql.ijplugin.util.logd
 import com.apollographql.ijplugin.util.logw
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
 import com.intellij.history.LocalHistory
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.externalSystem.service.execution.ProgressExecutionMode
 import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
@@ -27,6 +26,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.refactoring.BaseRefactoringProcessor
 import com.intellij.refactoring.ui.UsageViewDescriptorAdapter
 import com.intellij.usageView.UsageInfo
+import com.intellij.util.application
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -113,7 +113,7 @@ abstract class ApolloMigrationRefactoringProcessor(project: Project) : BaseRefac
       }
       return usageInfos.toTypedArray()
     } finally {
-      ApplicationManager.getApplication().invokeLater({ WriteAction.run<Throwable>(::finishMigration) }, myProject.disposed)
+      application.invokeLater({ WriteAction.run<Throwable>(::finishMigration) }, myProject.disposed)
     }
   }
 

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/refactoring/migration/ApolloMigrationRefactoringProcessor.kt

@@ -1,16 +1,34 @@
 package com.apollographql.ijplugin.rover
 
+import com.apollographql.ijplugin.settings.projectSettingsState
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.processTools.getResultStdoutStr
 import com.intellij.execution.processTools.mapFlat
+import com.intellij.openapi.project.Project
 import kotlinx.coroutines.runBlocking
 
 object RoverHelper {
   private fun getRoverBinDirectory() = "${System.getProperty("user.home")}/.rover/bin"
 
   private fun getRoverExecutablePath() = "${getRoverBinDirectory()}/rover"
 
-  fun getLspCommandLine() = object : GeneralCommandLine("rover", "lsp") {
+  fun getLspCommandLine(project: Project): GeneralCommandLine = RoverCommandLine(project)
+
+  private class RoverCommandLine(project: Project) : GeneralCommandLine() {
+    init {
+      setExePath(getRoverExecutablePath())
+      setWorkDirectory(getRoverBinDirectory())
+      getEnvironment().put("RUST_BACKTRACE", "full")
+      addParameter("lsp")
+      if (project.projectSettingsState.lspPassPathToSuperGraphYaml && project.projectSettingsState.lspPathToSuperGraphYaml.isNotBlank()) {
+        addParameter("--supergraph-config")
+        addParameter(project.projectSettingsState.lspPathToSuperGraphYaml)
+      }
+      if (project.projectSettingsState.lspPassAdditionalArguments && project.projectSettingsState.lspAdditionalArguments.isNotBlank()) {
+        addParameters(project.projectSettingsState.lspAdditionalArguments.split(' '))
+      }
+    }
+
     override fun createProcess(processBuilder: ProcessBuilder): Process {
       return try {
         super.createProcess(processBuilder)
@@ -23,9 +41,6 @@ object RoverHelper {
       }
     }
   }
-      .withExePath(getRoverExecutablePath())
-      .withWorkDirectory(getRoverBinDirectory())
-      .withEnvironment("RUST_BACKTRACE", "full")
 
   sealed interface RoverStatus {
     data object NotInstalled : RoverStatus

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/rover/RoverHelper.kt

@@ -1,11 +1,11 @@
 package com.apollographql.ijplugin.settings
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
+import com.intellij.util.application
 import com.intellij.util.xmlb.XmlSerializerUtil
 
 /**
@@ -16,7 +16,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil
     name = "com.apollographql.ijplugin.settings.AppSettingsState",
     storages = [Storage("apollo.xml")]
 )
-class AppSettingsStateService : PersistentStateComponent<AppSettingsStateImpl>, AppSettingsState {
+class AppSettingsService : PersistentStateComponent<AppSettingsStateImpl>, AppSettingsState {
   private val _state = AppSettingsStateImpl()
 
   override fun getState(): AppSettingsStateImpl {
@@ -53,7 +53,7 @@ class AppSettingsStateService : PersistentStateComponent<AppSettingsStateImpl>,
   private fun notifySettingsChanged() {
     if (lastNotifiedState != _state) {
       lastNotifiedState = _state.copy()
-      ApplicationManager.getApplication().messageBus.syncPublisher(AppSettingsListener.TOPIC).settingsChanged(_state)
+      application.messageBus.syncPublisher(AppSettingsListener.TOPIC).settingsChanged(_state)
     }
   }
 }
@@ -70,4 +70,4 @@ data class AppSettingsStateImpl(
     override var lspModeEnabled: Boolean = false,
 ) : AppSettingsState
 
-val appSettingsState get(): AppSettingsState = service<AppSettingsStateService>()
+val appSettingsState get(): AppSettingsState = service<AppSettingsService>()

intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/AppSettingsStateService.kt renamed to intellij-plugin/src/main/kotlin/com/apollographql/ijplugin/settings/AppSettingsService.kt

@@ -1,5 +1,6 @@
 package com.apollographql.ijplugin.settings
 
+import com.android.tools.idea.concurrency.executeOnPooledThread
 import com.apollographql.ijplugin.gradle.ApolloKotlinService
 import com.intellij.credentialStore.CredentialAttributes
 import com.intellij.credentialStore.generateServiceName
@@ -12,6 +13,7 @@ import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.StoragePathMacros
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
 import com.intellij.util.xmlb.XmlSerializerUtil
 import com.intellij.util.xmlb.annotations.Attribute
 import com.intellij.util.xmlb.annotations.Transient
@@ -77,6 +79,34 @@ class ProjectSettingsService(private val project: Project) : PersistentStateComp
       _state.apolloKotlinServices = value
     }
 
+  override var lspPassPathToSuperGraphYaml: Boolean
+    get() = _state.lspPassPathToSuperGraphYaml
+    set(value) {
+      _state.lspPassPathToSuperGraphYaml = value
+      notifySettingsChanged()
+    }
+
+  override var lspPathToSuperGraphYaml: String
+    get() = _state.lspPathToSuperGraphYaml
+    set(value) {
+      _state.lspPathToSuperGraphYaml = value
+      notifySettingsChanged()
+    }
+
+  override var lspPassAdditionalArguments: Boolean
+    get() = _state.lspPassAdditionalArguments
+    set(value) {
+      _state.lspPassAdditionalArguments = value
+      notifySettingsChanged()
+    }
+
+  override var lspAdditionalArguments: String
+    get() = _state.lspAdditionalArguments
+    set(value) {
+      _state.lspAdditionalArguments = value
+      notifySettingsChanged()
+    }
+
   private var lastNotifiedState: ProjectSettingsState? = null
 
   private fun notifySettingsChanged() {
@@ -96,6 +126,17 @@ class ProjectSettingsService(private val project: Project) : PersistentStateComp
     if (telemetryInstanceId.isEmpty()) {
       telemetryInstanceId = UUID.randomUUID().toString()
     }
+
+    if (lspPathToSuperGraphYaml.isEmpty()) {
+      executeOnPooledThread {
+        val superGraphYamlFilePath = project.guessProjectDir()?.findChild("supergraph.yaml")?.path
+        if (superGraphYamlFilePath != null) {
+          lspPathToSuperGraphYaml = superGraphYamlFilePath
+        } else {
+          lspPassPathToSuperGraphYaml = false
+        }
+      }
+    }
   }
 }
 
@@ -111,6 +152,10 @@ interface ProjectSettingsState {
    * @see com.apollographql.ijplugin.gradle.GradleToolingModelService
    */
   var apolloKotlinServices: List<ApolloKotlinService>
+  var lspPassPathToSuperGraphYaml: Boolean
+  var lspPathToSuperGraphYaml: String
+  var lspPassAdditionalArguments: Boolean
+  var lspAdditionalArguments: String
 }
 
 /**
@@ -150,6 +195,10 @@ data class ProjectSettingsStateImpl(
     override var apolloKotlinServiceConfigurations: List<ApolloKotlinServiceConfiguration> = emptyList(),
     override var telemetryInstanceId: String = "",
     override var apolloKotlinServices: List<ApolloKotlinService> = emptyList(),
+    override var lspPassPathToSuperGraphYaml: Boolean = true,
+    override var lspPathToSuperGraphYaml: String = "",
+    override var lspPassAdditionalArguments: Boolean = false,
+    override var lspAdditionalArguments: String = "",
 ) : ProjectSettingsState