Merge branch 'main' into rli/fix-mockk-cleanup

Author: rli

.changes/next-release/bugfix-213273c1-12a5-47d1-b973-499d25e1d68e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where users are unable to login to Amazon Q if they have previously authenticated (#5214)"
+}

.changes/next-release/bugfix-3e9ee812-d817-4c0d-9389-7b32d4049441.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix incorrect text shown while updating documentation in /doc"
+}

.changes/next-release/bugfix-58a31adb-0d87-4a2d-ac83-9b5846e023e6.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: use correct doc link in SQL conversion help message"
+}

.changes/next-release/bugfix-6a2d9629-1cc1-4143-8950-cfd117fcabe3.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+}

.changes/next-release/bugfix-8c6afa32-afe4-41f2-a216-10d8bf5e2486.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /test: Test generation fails for files outside the project"
+}

.changes/next-release/bugfix-acc81345-73b6-4f71-856e-76d8e0d451de.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix incorrect accept and reject buttons shows up while hovering over the generated file"
+}

.changes/next-release/bugfix-b6572d91-e5b4-4b2d-bb43-6a331aacc79c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Prevent customization override if user has manually selected a customization"
+}

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.284"
+telemetryGenerator = "1.0.293"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -512,6 +512,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isFileInWorkspace = true,
                     isSupportedLanguage = true,
                     credentialStartUrl = getStartUrl(project),
                     jobGroup = session.testGenerationJobGroupName,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -12,6 +12,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
@@ -22,6 +23,7 @@ import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
+import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.Position
 import software.amazon.awssdk.services.codewhispererruntime.model.Range
 import software.amazon.awssdk.services.codewhispererruntime.model.Reference
@@ -87,6 +89,7 @@ import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.UiTelemetry
+import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -184,7 +187,7 @@ class CodeTestChatController(
             message.tabId,
             false
         )
-        if (isLanguageSupported(fileInfo.fileLanguage.languageId)) {
+        if (fileInfo.fileInWorkspace && isLanguageSupported(fileInfo.fileLanguage.languageId)) {
             // Send Capability card to chat
             codeTestChatHelper.addNewMessage(
                 CodeTestChatMessageContent(informationCard = true, message = null, type = ChatMessageType.Answer, canBeVoted = false),
@@ -230,9 +233,15 @@ class CodeTestChatController(
                 }
                 .build()
 
-            val messageContent = "<span style=\"color: #EE9D28;\">&#9888;<b> ${fileInfo.fileLanguage.languageId} is not a " +
-                "language I support specialized unit test generation for at the moment.</b><br></span>The languages " +
-                "I support now are Python and Java. I can still provide examples, instructions and code suggestions."
+            val messageContent = if (fileInfo.fileInWorkspace) {
+                "<span style=\"color: #EE9D28;\">&#9888;<b> ${fileInfo.fileLanguage.languageId} is not a " +
+                    "language I support specialized unit test generation for at the moment.</b><br></span>The languages " +
+                    "I support now are Python and Java. I can still provide examples, instructions and code suggestions."
+            } else {
+                "<span style=\"color: #EE9D28;\">&#9888;<b> I can't generate tests for ${fileInfo.fileName}" +
+                    " because it's outside the project directory.</b><br></span> " +
+                    "I can still provide examples, instructions and code suggestions."
+            }
 
             codeTestChatHelper.addNewMessage(
                 CodeTestChatMessageContent(
@@ -287,7 +296,8 @@ class CodeTestChatController(
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
-                    isSupportedLanguage = false,
+                    isFileInWorkspace = fileInfo.fileInWorkspace,
+                    isSupportedLanguage = isLanguageSupported(fileInfo.fileLanguage.languageId),
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
@@ -571,6 +581,7 @@ class CodeTestChatController(
                     session.testGenerationJob,
                     session.testGenerationJobGroupName,
                     session.programmingLanguage,
+                    IdeCategory.JETBRAINS,
                     session.numberOfUnitTestCasesGenerated,
                     session.numberOfUnitTestCasesGenerated,
                     session.linesOfCodeGenerated,
@@ -588,6 +599,7 @@ class CodeTestChatController(
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isFileInWorkspace = true,
                     isSupportedLanguage = true,
                     credentialStartUrl = getStartUrl(project = context.project),
                     jobGroup = session.testGenerationJobGroupName,
@@ -766,6 +778,7 @@ class CodeTestChatController(
                     session.testGenerationJob,
                     session.testGenerationJobGroupName,
                     session.programmingLanguage,
+                    IdeCategory.JETBRAINS,
                     session.numberOfUnitTestCasesGenerated,
                     0,
                     session.linesOfCodeGenerated,
@@ -782,6 +795,7 @@ class CodeTestChatController(
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isFileInWorkspace = true,
                     isSupportedLanguage = true,
                     credentialStartUrl = getStartUrl(project = context.project),
                     jobGroup = session.testGenerationJobGroupName,
@@ -1111,6 +1125,7 @@ class CodeTestChatController(
         val filePath: String,
         val fileName: String,
         val fileLanguage: CodeWhispererProgrammingLanguage,
+        val fileInWorkspace: Boolean = true,
     )
 
     private suspend fun updateUIState() {
@@ -1142,6 +1157,9 @@ class CodeTestChatController(
             val fileEditorManager = FileEditorManager.getInstance(project)
             val activeEditor = fileEditorManager.selectedEditor
             val activeFile = fileEditorManager.selectedFiles.firstOrNull()
+            val projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run {
+                project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
+            }
 
             if (activeEditor == null || activeFile == null) {
                 handleInvalidFileState(message.tabId)
@@ -1156,6 +1174,7 @@ class CodeTestChatController(
                 filePath = activeFile.path,
                 fileName = activeFile.name,
                 fileLanguage = programmingLanguage,
+                fileInWorkspace = activeFile.path.startsWith(projectRoot.path)
             )
         } catch (e: Exception) {
             LOG.debug { "Error checking active file: $e" }
@@ -1169,6 +1188,8 @@ class CodeTestChatController(
         }
     }
 
+    private fun File.toVirtualFile() = LocalFileSystem.getInstance().findFileByIoFile(this)
+
     /* UTG Tab Chat input use cases:
      * 1. If User exits the flow and want to start a new generate unit test cycle.
      * 2. If User clicks on Modify build command option and can enter the build command from chat input