Derives which line to unset vertical indent during typing mismatch (#250

)
aws · Nov 21, 2024 · ef66134 · ef66134
1 parent 4c62409
commit ef66134
Showing 1 changed file with 7 additions and 4 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
@@ -188,8 +188,7 @@ public void beforeRemoval() {
                         currentOffset);
                 int lineNumber = doc.getLineOfOffset(expandedCurrentOffset);
                 int startLineOffset = doc.getLineOffset(lineNumber);
-                int invocationOffset = session.getInvocationOffset();
-                int curLineInDoc = widget.getLineAtOffset(invocationOffset);
+                int curLineInDoc = widget.getLineAtOffset(currentOffset);
                 int lineIdx = expandedCurrentOffset - startLineOffset;
                 String contentInLine = widget.getLine(curLineInDoc) + widget.getLineDelimiter();
                 String currentRightCtx = "\n";
@@ -323,9 +322,13 @@ public void documentChanged(final DocumentEvent event) {
         boolean isOutOfBounds = distanceTraversed + input.length() >= currentSuggestion.length()
                 || distanceTraversed < 0;
         if (isOutOfBounds || !isInputAMatch(currentSuggestion, distanceTraversed, input)) {
-            distanceTraversed++;
-            session.transitionToDecisionMade();
+            distanceTraversed += input.length();
             event.getDocument().removeDocumentListener(this);
+            StyledText widget = session.getViewer().getTextWidget();
+            int caretLine = widget.getLineAtOffset(widget.getCaretOffset());
+            int linesOfInput = input.split(widget.getLineDelimiter()).length;
+            int lineToUnsetIndent = caretLine + linesOfInput;
+            session.transitionToDecisionMade(lineToUnsetIndent);
             Display.getCurrent().asyncExec(() -> {
                 if (session.isActive()) {
                     session.end();