Fixes merging error

aws · Sep 25, 2024 · ae140be · ae140be
1 parent b079720
commit ae140be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 175 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java
@@ -57,7 +57,7 @@ public void verifyKey(final VerifyEvent event) {
 		// Here we examine all other relevant keystrokes that may be relevant to the preview's lifetime: 
 		// - CR (new line)
 		// - BS (backspace)
-		String currentSuggestion = qInvocationSessionInstance.getCurrentSuggestion().trim();
+		String currentSuggestion = qInvocationSessionInstance.getCurrentSuggestion().getInsertText().trim();
 		switch (event.keyCode) {
 		case SWT.CR:
             if (lastKeyStrokeType == LastKeyStrokeType.OPEN_CURLY && isAutoClosingEnabled) {
@@ -190,7 +190,7 @@ public void verifyText(final VerifyEvent event) {
             return;
         }
 
-		String currentSuggestion = qInvocationSessionInstance.getCurrentSuggestion().trim();
+		String currentSuggestion = qInvocationSessionInstance.getCurrentSuggestion().getInsertText().trim();
 		int currentOffset = widget.getCaretOffset();
 		qInvocationSessionInstance
 				.setHasBeenTypedahead(currentOffset - qInvocationSessionInstance.getInvocationOffset() > 0);

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineVerifyKeyListener.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineVerifyKeyListener.java