Merge remote-tracking branch 'origin/feature/q-lsp-chat' into rli/token-auth-noise

Author: rli

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQDiffVirtualFile.kt

@@ -0,0 +1,37 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+import com.intellij.diff.chains.SimpleDiffRequestChain
+import com.intellij.diff.editor.ChainDiffVirtualFile
+import com.intellij.diff.editor.DiffEditorTabFilesManager
+import com.intellij.diff.requests.SimpleDiffRequest
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
+import software.aws.toolkits.resources.message
+
+/**
+ * A virtual file that represents an AmazonQ diff view.
+ * This class allows us to identify diff files created by AmazonQ.
+ */
+class AmazonQDiffVirtualFile(
+    diffChain: SimpleDiffRequestChain,
+    name: String,
+) : ChainDiffVirtualFile(diffChain, name) {
+    companion object {
+        fun openDiff(project: Project, diffRequest: SimpleDiffRequest) {
+            // Find any existing AmazonQ diff files
+            val fileEditorManager = FileEditorManager.getInstance(project)
+            val existingDiffFiles = fileEditorManager.openFiles.filterIsInstance<AmazonQDiffVirtualFile>()
+
+            // Close existing diff files
+            existingDiffFiles.forEach { fileEditorManager.closeFile(it) }
+
+            // Create and open the new diff file
+            val diffChain = SimpleDiffRequestChain(diffRequest)
+            val diffVirtualFile = AmazonQDiffVirtualFile(diffChain, diffRequest.title ?: message("aws.q.lsp.client.diff_message"))
+            DiffEditorTabFilesManager.getInstance(project).showDiffFile(diffVirtualFile, true)
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -4,8 +4,6 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 import com.intellij.diff.DiffContentFactory
-import com.intellij.diff.DiffManager
-import com.intellij.diff.DiffManagerEx
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileChooser.FileChooserFactory
@@ -349,11 +347,12 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                             else -> "Modified"
                         }
                     )
-                    (DiffManager.getInstance() as DiffManagerEx).showDiffBuiltin(project, diffRequest)
+
+                    AmazonQDiffVirtualFile.openDiff(project, diffRequest)
                 } catch (e: Exception) {
                     LOG.warn { "Failed to open file diff: ${e.message}" }
                 } finally {
-                    // Clean up the temporary file
+                    // Clean up the temporary file used for syntax highlight
                     try {
                         tempPath?.let { Files.deleteIfExists(it) }
                     } catch (e: Exception) {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.roots.ModuleRootListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider.Companion.EP_NAME
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
-import java.util.concurrent.CompletableFuture
+import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 
 class DefaultModuleDependenciesService(
     private val project: Project,
@@ -34,10 +34,13 @@ class DefaultModuleDependenciesService(
         syncAllModules()
     }
 
-    override fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams): CompletableFuture<Unit> =
+    override fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams) {
         AmazonQLspService.executeIfRunning(project) { languageServer ->
-            languageServer.didChangeDependencyPaths(params)
-        }?.toCompletableFuture() ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running"))
+            pluginAwareExecuteOnPooledThread {
+                languageServer.didChangeDependencyPaths(params)
+            }
+        }
+    }
 
     private fun syncAllModules() {
         ModuleManager.getInstance(project).modules.forEach { module ->

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependenciesService.kt

@@ -4,8 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies
 
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
-import java.util.concurrent.CompletableFuture
 
 interface ModuleDependenciesService {
-    fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams): CompletableFuture<Unit>
+    fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams)
 }

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesServiceTest.kt

@@ -3,14 +3,13 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies
 
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.Application
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ModuleRootEvent
+import com.intellij.testFramework.ApplicationExtension
 import com.intellij.util.messages.MessageBus
 import com.intellij.util.messages.MessageBusConnection
 import io.mockk.every
@@ -23,19 +22,20 @@ import io.mockk.verify
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider.Companion.EP_NAME
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
 import java.util.concurrent.CompletableFuture
 import java.util.function.Consumer
 
+@ExtendWith(ApplicationExtension::class)
 class DefaultModuleDependenciesServiceTest {
     private lateinit var project: Project
     private lateinit var mockLanguageServer: AmazonQLanguageServer
     private lateinit var mockModuleManager: ModuleManager
     private lateinit var sut: DefaultModuleDependenciesService
-    private lateinit var mockApplication: Application
     private lateinit var mockDependencyProvider: ModuleDependencyProvider
 
     @BeforeEach
@@ -47,11 +47,6 @@ class DefaultModuleDependenciesServiceTest {
 
         every { mockLanguageServer.didChangeDependencyPaths(any()) } returns CompletableFuture<Unit>()
 
-        // Mock Application
-        mockApplication = mockk()
-        mockkStatic(ApplicationManager::class)
-        every { ApplicationManager.getApplication() } returns mockApplication
-
         // Mock message bus
         val messageBus = mockk<MessageBus>()
         every { project.messageBus } returns messageBus