[CodeWhisperer] Make CodeWhispererEnterHandler override EnterHandler (#3251)

1. Currently it's overriding EditorActionHandler which doesn't have
access to the indents the EnterHandler makes afterwards, so override
the EnterHandler class.

Author: andrewyuq

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEnterHandler.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.editor
 
+import com.intellij.codeInsight.editorActions.EnterHandler
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
@@ -11,19 +12,11 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
 import software.aws.toolkits.telemetry.CodewhispererAutomatedTriggerType
 import software.aws.toolkits.telemetry.CodewhispererTriggerType
 
-class CodeWhispererEnterHandler(private val originalHandler: EditorActionHandler) :
-    EditorActionHandler(),
+class CodeWhispererEnterHandler(originalHandler: EditorActionHandler) :
+    EnterHandler(originalHandler),
     CodeWhispererAutoTriggerHandler {
-    override fun isEnabledForCaret(editor: Editor, caret: Caret, dataContext: DataContext?) =
-        originalHandler.isEnabled(editor, caret, dataContext)
-
-    override fun executeInCommand(editor: Editor, dataContext: DataContext?) =
-        originalHandler.executeInCommand(editor, dataContext)
-
-    override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext?) {
-        if (originalHandler.isEnabled(editor, caret, dataContext)) {
-            originalHandler.execute(editor, caret, dataContext)
-        }
+    override fun executeWriteAction(editor: Editor, caret: Caret?, dataContext: DataContext?) {
+        super.executeWriteAction(editor, caret, dataContext)
         if (!CodeWhispererService.getInstance().canDoInvocation(editor, CodewhispererTriggerType.AutoTrigger)) {
             return
         }

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestBase.kt

@@ -122,7 +122,7 @@ open class CodeWhispererTestBase {
         editorManager = CodeWhispererEditorManager.getInstance()
         settingsManager = CodeWhispererSettings.getInstance()
 
-        projectRule.fixture.configureByText(pythonFileName, pythonTestLeftContext)
+        setPrompt(pythonFileName, pythonTestLeftContext)
 
         originalExplorerActionState = stateManager.state
         originalSettings = settingsManager.state
@@ -139,10 +139,6 @@ open class CodeWhispererTestBase {
                 value[CodeWhispererConfigurationType.IsIncludeCodeWithReference] = true
             }
         )
-
-        runInEdtAndWait {
-            projectRule.fixture.editor.caretModel.primaryCaret.moveToOffset(projectRule.fixture.editor.document.textLength)
-        }
     }
 
     @After
@@ -181,4 +177,11 @@ open class CodeWhispererTestBase {
         val expected = message("codewhisperer.popup.recommendation_info", selected, total, POPUP_DIM_HEX)
         assertThat(actual).isEqualTo(expected)
     }
+
+    fun setPrompt(filename: String, prompt: String) {
+        projectRule.fixture.configureByText(filename, prompt)
+        runInEdtAndWait {
+            projectRule.fixture.editor.caretModel.primaryCaret.moveToOffset(projectRule.fixture.editor.document.textLength)
+        }
+    }
 }

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererUserActionsTest.kt

@@ -13,13 +13,18 @@ import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_SELECT_WORD_AT
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_TEXT_END_WITH_SELECTION
 import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_TEXT_START_WITH_SELECTION
 import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.testFramework.runInEdtAndWait
 import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.timeout
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
+import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonFileName
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonTestLeftContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 
 class CodeWhispererUserActionsTest : CodeWhispererTestBase() {
 
@@ -86,4 +91,28 @@ class CodeWhispererUserActionsTest : CodeWhispererTestBase() {
             }
         }
     }
+
+    @Test
+    fun `test hitting enter after non-whitespace characters should trigger CodeWhisperer`() {
+        testHittingEnterAfterWhitespaceCharsShouldTriggerCodeWhisperer(pythonTestLeftContext, 1)
+    }
+
+    @Test
+    fun `test hitting enter after whitespace characters should trigger CodeWhisperer`() {
+        testHittingEnterAfterWhitespaceCharsShouldTriggerCodeWhisperer("$pythonTestLeftContext ", 1)
+        testHittingEnterAfterWhitespaceCharsShouldTriggerCodeWhisperer("$pythonTestLeftContext\t", 2)
+        testHittingEnterAfterWhitespaceCharsShouldTriggerCodeWhisperer("$pythonTestLeftContext\n", 3)
+    }
+
+    private fun testHittingEnterAfterWhitespaceCharsShouldTriggerCodeWhisperer(prompt: String, times: Int) {
+        CodeWhispererExplorerActionManager.getInstance().setAutoEnabled(true)
+        setPrompt(pythonFileName, prompt)
+        projectRule.fixture.type('\n')
+        val popupCaptor = argumentCaptor<JBPopup>()
+        verify(popupManagerSpy, timeout(5000).atLeast(times))
+            .showPopup(any(), any(), any(), any(), any(), popupCaptor.capture(), any(), any())
+        runInEdtAndWait {
+            popupManagerSpy.closePopup(popupCaptor.lastValue)
+        }
+    }
 }