Merge branch 'main' into rename

Will-ShaoHua · web-flow · commit 696c0a98282b · 2025-01-09T14:18:02.000-08:00
diff --git a/.changes/next-release/bugfix-213273c1-12a5-47d1-b973-499d25e1d68e.json b/.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)"
+}
diff --git a/.changes/next-release/bugfix-3e9ee812-d817-4c0d-9389-7b32d4049441.json b/.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"
+}
diff --git a/.changes/next-release/bugfix-8c6afa32-afe4-41f2-a216-10d8bf5e2486.json b/.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"
+}
diff --git a/.changes/next-release/bugfix-acc81345-73b6-4f71-856e-76d8e0d451de.json b/.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"
+}
diff --git a/gradle/libs.versions.toml b/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.291"
+telemetryGenerator = "1.0.293"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/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,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/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
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt
@@ -110,7 +110,7 @@ fun getIconForStep(targetStep: DocGenerationStep, currentStep: DocGenerationStep
     else -> checkIcons["wait"]
 }
 
-fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode): String {
+fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode?): String {
     val isCreationMode = mode == Mode.CREATE
     val baseLine = if (isCreationMode) message("amazonqDoc.progress_message.creating") else message("amazonqDoc.progress_message.updating")
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocGenerationState.kt
@@ -64,8 +64,8 @@ class DocGenerationState(
                 message = action.msg,
                 intent = Intent.DOC
             )
-
-            val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), token)
+            val mode = if (action.msg == message("amazonqDoc.session.create")) Mode.CREATE else null
+            val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), mode, token)
             numberOfReferencesGenerated = codeGenerationResult.references.size
             numberOfFilesGenerated = codeGenerationResult.newFiles.size
             codeGenerationRemainingIterationCount = codeGenerationResult.codeGenerationRemainingIterationCount
@@ -138,7 +138,7 @@ fun getFileSummaryPercentage(input: String): Double {
     return percentage
 }
 
-private suspend fun DocGenerationState.generateCode(codeGenerationId: String, token: CancellationTokenSource?): CodeGenerationResult {
+private suspend fun DocGenerationState.generateCode(codeGenerationId: String, mode: Mode?, token: CancellationTokenSource?): CodeGenerationResult {
     val pollCount = 180
     val requestDelay = 10000L
 
@@ -214,7 +214,7 @@ private suspend fun DocGenerationState.generateCode(codeGenerationId: String, to
                             } else {
                                 DocGenerationStep.GENERATING_ARTIFACTS
                             },
-                            mode = Mode.CREATE
+                            mode
                         )
                     )
                 }
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
@@ -27,6 +27,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.GenerateComple
 import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.GetTestGenerationResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.InlineChatUserDecision
 import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.ListFeatureEvaluationsResponse
@@ -199,6 +200,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         jobId: String,
         groupName: String,
         language: CodeWhispererProgrammingLanguage?,
+        ideCategory: IdeCategory?,
         numberOfUnitTestCasesGenerated: Int?,
         numberOfUnitTestCasesAccepted: Int?,
         linesOfCodeGenerated: Int?,
@@ -668,6 +670,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         jobId: String,
         groupName: String,
         language: CodeWhispererProgrammingLanguage?,
+        ideCategory: IdeCategory?,
         numberOfUnitTestCasesGenerated: Int?,
         numberOfUnitTestCasesAccepted: Int?,
         linesOfCodeGenerated: Int?,
@@ -682,6 +685,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
                 it.jobId(jobId)
                 it.groupName(groupName)
+                it.ideCategory(ideCategory)
                 it.numberOfUnitTestCasesGenerated(numberOfUnitTestCasesGenerated)
                 it.numberOfUnitTestCasesAccepted(numberOfUnitTestCasesAccepted)
                 it.linesOfCodeGenerated(linesOfCodeGenerated)
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/docChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/docChatConnector.ts
@@ -196,7 +196,6 @@ export class Connector {
 
     private processCodeResultMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
-            const actions = getActions([...messageData.filePaths, ...messageData.deletedFiles])
             const answer: ChatItem = {
                 type: ChatItemType.ANSWER,
                 relatedContent: undefined,
@@ -209,8 +208,7 @@ export class Connector {
                     fileTreeTitle: 'Documents ready',
                     rootFolderTitle: 'Generated documentation',
                     filePaths: (messageData.filePaths as DiffTreeFileInfo[]).map(path => path.zipFilePath),
-                    deletedFiles: (messageData.deletedFiles as DiffTreeFileInfo[]).map(path => path.zipFilePath),
-                    actions,
+                    deletedFiles: (messageData.deletedFiles as DiffTreeFileInfo[]).map(path => path.zipFilePath)
                 },
                 body: '',
             }
diff --git a/plugins/core/jetbrains-community/resources/telemetryOverride.json b/plugins/core/jetbrains-community/resources/telemetryOverride.json
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationStateUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationStateUtils.kt
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationDismissalStateTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/NotificationDismissalStateTest.kt

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix issue where users are unable to login to Amazon Q if they have previously authenticated (#5214)"
 +}
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ fun getIconForStep(targetStep: DocGenerationStep, currentStep: DocGenerationStep`
`110`	`110`	`else -> checkIcons["wait"]`
`111`	`111`	`}`
`112`	`112`
`113`		`-fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode): String {`
	`113`	`+fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode?): String {`
`114`	`114`	`val isCreationMode = mode == Mode.CREATE`
`115`	`115`	`val baseLine = if (isCreationMode) message("amazonqDoc.progress_message.creating") else message("amazonqDoc.progress_message.updating")`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ class DocGenerationState(`
`64`	`64`	`message = action.msg,`
`65`	`65`	`intent = Intent.DOC`
`66`	`66`	`)`
`67`		`-`
`68`		`- val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), token)`
	`67`	`+ val mode = if (action.msg == message("amazonqDoc.session.create")) Mode.CREATE else null`
	`68`	`+ val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), mode, token)`
`69`	`69`	`numberOfReferencesGenerated = codeGenerationResult.references.size`
`70`	`70`	`numberOfFilesGenerated = codeGenerationResult.newFiles.size`
`71`	`71`	`codeGenerationRemainingIterationCount = codeGenerationResult.codeGenerationRemainingIterationCount`
`@@ -138,7 +138,7 @@ fun getFileSummaryPercentage(input: String): Double {`
`138`	`138`	`return percentage`
`139`	`139`	`}`
`140`	`140`
`141`		`-private suspend fun DocGenerationState.generateCode(codeGenerationId: String, token: CancellationTokenSource?): CodeGenerationResult {`
	`141`	`+private suspend fun DocGenerationState.generateCode(codeGenerationId: String, mode: Mode?, token: CancellationTokenSource?): CodeGenerationResult {`
`142`	`142`	`val pollCount = 180`
`143`	`143`	`val requestDelay = 10000L`
`144`	`144`
`@@ -214,7 +214,7 @@ private suspend fun DocGenerationState.generateCode(codeGenerationId: String, to`
`214`	`214`	`} else {`
`215`	`215`	`DocGenerationStep.GENERATING_ARTIFACTS`
`216`	`216`	`},`
`217`		`- mode = Mode.CREATE`
	`217`	`+ mode`
`218`	`218`	`)`
`219`	`219`	`)`
`220`	`220`	`}`