Merge main into feature/cw-proactive-scan

Author: aws-toolkit-automation

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -21,6 +21,7 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.FollowUp
 import software.aws.toolkits.jetbrains.services.cwc.messages.RecommendationContentSpan
 import software.aws.toolkits.jetbrains.services.cwc.messages.Suggestion
 import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionInfo
+import software.aws.toolkits.jetbrains.utils.convertMarkdownToHTML
 
 class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
 
@@ -33,16 +34,15 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
     private var statusCode: Int = 0
 
     companion object {
-        val CODE_BLOCK_REGEX: Regex = Regex("^```", RegexOption.MULTILINE)
+        private val CODE_BLOCK_PATTERN = Regex("<pre>\\s*<code")
     }
 
     private fun countTotalNumberOfCodeBlocks(message: StringBuilder): Int {
         if (message.isEmpty()) {
             return 0
         }
-        val countOfCodeBlocks = CODE_BLOCK_REGEX.findAll(message)
-        val numberOfTripleBackTicksInMarkdown = countOfCodeBlocks.count()
-        return numberOfTripleBackTicksInMarkdown / 2
+        val htmlInString = convertMarkdownToHTML(message.toString())
+        return CODE_BLOCK_PATTERN.findAll(htmlInString).count()
     }
 
     fun handle(