feat(amazonq): support in editor chat

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -29,10 +29,6 @@
 
     <actions>
         <action id="aws.toolkit.open.q.window" class="software.aws.toolkits.jetbrains.services.amazonq.QRefreshPanelAction"/>
-        <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat" class="software.aws.toolkits.jetbrains.services.cwc.inline.OpenChatInputAction">
-            <keyboard-shortcut first-keystroke="meta I" keymap="$default"/>
-            <keyboard-shortcut first-keystroke="control I" keymap="$default"/>
-        </action>
         <group id="aws.q.toolwindow.titleBar" popup="false" compact="true">
             <reference id="aws.toolkit.open.q.window"/>
         </group>
@@ -83,6 +79,13 @@
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />
             </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat"
+                    class="software.aws.toolkits.jetbrains.services.cwc.inline.OpenChatInputAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="$default" first-keystroke="control I"/>
+            </action>
         </group>
     </actions>
 </idea-plugin>

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

@@ -217,7 +217,7 @@ class ChatController private constructor(
 
                     editor.document.insertString(offset, message.code)
 
-                    ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project)
+                    ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project, null)
 
                     CodeWhispererUserModificationTracker.getInstance(context.project).enqueue(
                         InsertedCodeModificationEntry(

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

@@ -9,11 +9,12 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Reference
 import software.amazon.awssdk.services.codewhispererruntime.model.Span
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
+import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 
 object ReferenceLogController {
-    fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project) {
+    fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project, inlineChatStartPosition: CaretPosition?) {
         codeReferences?.let { references ->
             val cwReferences = references.map { reference ->
                 Reference.builder()
@@ -36,7 +37,7 @@ object ReferenceLogController {
                 originalCode,
                 cwReferences,
                 editor,
-                CodeWhispererEditorUtil.getCaretPosition(editor),
+                inlineChatStartPosition ?: CodeWhispererEditorUtil.getCaretPosition(editor),
                 null,
             )
         }

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

@@ -155,13 +155,12 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
         numSuggestionAddLines: Int?,
         numSuggestionDelChars: Int?,
         numSuggestionDelLines: Int?,
-        charactersAdded: Int?,
-        charactersRemoved: Int?,
+        programmingLanguage: String?,
     ) {
         CodeWhispererClientAdaptor.getInstance(project).sendInlineChatTelemetry(
             requestId, inputLength, numSelectedLines, codeIntent, userDecision,
             responseStartLatency, responseEndLatency, numSuggestionAddChars, numSuggestionAddLines, numSuggestionDelChars, numSuggestionDelLines,
-            charactersAdded, charactersRemoved
+            programmingLanguage
         )
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/FileContextExtractor.kt

@@ -22,7 +22,7 @@ class FileContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter?, pr
         } ?: return null
 
         val fileLanguage = computeOnEdt {
-            languageExtractor.extractLanguageNameFromCurrentFile(editor, project)
+            languageExtractor.extractLanguageNameFromCurrentFile(editor)
         }
         val fileText = computeOnEdt {
             editor.document.text

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/util/LanguageExtractor.kt

@@ -3,18 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.editor.context.file.util
 
-import com.intellij.openapi.application.runReadAction
-import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiFile
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 
 class LanguageExtractor {
-    fun extractLanguageNameFromCurrentFile(editor: Editor, project: Project): String? =
-        runReadAction {
-            val doc: Document = editor.document
-            val psiFile: PsiFile? = PsiDocumentManager.getInstance(project).getPsiFile(doc)
-            psiFile?.fileType?.name?.lowercase()
-        }
+    fun extractLanguageNameFromCurrentFile(editor: Editor): String = editor.virtualFile.programmingLanguage().languageId
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt

@@ -106,7 +106,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
 
         // Retrieve <codeNames> from  trimmedFileText
         val fileLanguage = computeOnEdt {
-            languageExtractor.extractLanguageNameFromCurrentFile(editor, project)
+            languageExtractor.extractLanguageNameFromCurrentFile(editor)
         }
         val fileText = editor.document.text
         val fileName = FileEditorManager.getInstance(project).selectedFiles.first().name
@@ -141,7 +141,8 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
             val requestString = ChatController.objectMapper.writeValueAsString(extractNamesRequest)
 
             codeNames = try {
-                fqnWebviewAdapter?.let { ChatController.objectMapper.readValue(it.extractNames(requestString), CodeNamesImpl::class.java)
+                fqnWebviewAdapter?.let {
+                    ChatController.objectMapper.readValue(it.extractNames(requestString), CodeNamesImpl::class.java)
                 } ?: CodeNamesImpl(simpleNames = emptyList(), fullyQualifiedNames = FullyQualifiedNames(used = emptyList()))
             } catch (e: Exception) {
                 getLogger<FocusAreaContextExtractor>().warn(e) { "Failed to extract names from file" }