Merge branch 'main' into fix/cancel-button

Author: aggagen

.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"
+}

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")
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocGenerationState.kt

@@ -60,8 +60,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
@@ -134,7 +134,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
 
@@ -192,7 +192,7 @@ private suspend fun DocGenerationState.generateCode(codeGenerationId: String, to
                             } else {
                                 DocGenerationStep.GENERATING_ARTIFACTS
                             },
-                            mode = Mode.CREATE
+                            mode
                         )
                     )
                 }