cleanup

Author: rli

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

@@ -119,7 +119,7 @@ class CodeTestChatController(
 
         ApplicationManager.getApplication().invokeAndWait {
             selectionRange = ApplicationManager.getApplication().runReadAction<Range?> {
-                val editor = FileEditorManager.getInstance(project).selectedTextEditor
+                val editor = FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
                 editor?.let {
                     val selectionModel = it.selectionModel
                     val startOffset = selectionModel.selectionStart

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -191,7 +191,7 @@ class FeatureDevController(
         logger.debug { "$FEATURE_NAME: Processing InsertCodeAtCursorPosition: $message" }
 
         withContext(EDT) {
-            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
+            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditorWithRemotes.firstOrNull() ?: return@withContext
 
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset

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

@@ -216,7 +216,7 @@ class ChatController private constructor(
 
     override suspend fun processInsertCodeAtCursorPosition(message: IncomingCwcMessage.InsertCodeAtCursorPosition) {
         withContext(EDT) {
-            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
+            val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditorWithRemotes.firstOrNull() ?: return@withContext
 
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset

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

@@ -3,13 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.editor.context.file
 
-import com.intellij.idea.AppMode
 import com.intellij.openapi.application.runReadAction
-import com.intellij.openapi.client.ClientKind
-import com.intellij.openapi.client.sessions
-import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Document
-import com.intellij.openapi.fileEditor.ClientFileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
@@ -22,13 +17,9 @@ import software.aws.toolkits.jetbrains.utils.computeOnEdt
 class FileContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter?, private val project: Project) {
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FileContext? {
-        val editor = if (AppMode.isRemoteDevHost()) {
-            project.sessions(ClientKind.REMOTE).firstOrNull()?.service<ClientFileEditorManager>()?.getSelectedTextEditor() ?: return null
-        } else {
-            computeOnEdt {
-                FileEditorManager.getInstance(project).selectedTextEditor
-            } ?: return null
-        }
+        val editor = computeOnEdt {
+            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
+        } ?: return null
 
         val fileLanguage = computeOnEdt {
             languageExtractor.extractLanguageNameFromCurrentFile(editor)

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

@@ -3,14 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.editor.context.focusArea
 
-import com.intellij.idea.AppMode
-import com.intellij.openapi.client.ClientKind
-import com.intellij.openapi.client.sessions
-import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.SelectionModel
-import com.intellij.openapi.fileEditor.ClientFileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
@@ -30,13 +25,10 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
 
     private val languageExtractor: LanguageExtractor = LanguageExtractor()
     suspend fun extract(): FocusAreaContext? {
-        val editor = if (AppMode.isRemoteDevHost()) {
-            project.sessions(ClientKind.REMOTE).firstOrNull()?.service<ClientFileEditorManager>()?.getSelectedTextEditor() ?: return null
-        } else {
-            computeOnEdt {
-                FileEditorManager.getInstance(project).selectedTextEditor
-            } ?: return null
-        }
+        val editor = computeOnEdt {
+            FileEditorManager.getInstance(project).selectedTextEditorWithRemotes.firstOrNull()
+        } ?: return null
+
         if (editor.document.text.isBlank()) return null
 
         // Get 10k characters around the cursor

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatFileListener.kt

@@ -18,7 +18,7 @@ class InlineChatFileListener(project: Project, private val controller: InlineCha
     private var selectionListener: InlineChatSelectionListener? = null
 
     init {
-        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditor }
+        val editor = project.let { FileEditorManager.getInstance(it).selectedTextEditorWithRemotes.firstOrNull() }
         if (editor != null) {
             setupListenersForEditor(editor)
             currentEditor = editor