Fix typeahead backspace cleanup (#293)

aws · Dec 9, 2024 · fffb6fc · fffb6fc
1 parent e07722f
commit fffb6fc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/JavaTypeaheadProcessor.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/JavaTypeaheadProcessor.java
@@ -32,7 +32,7 @@ public int getNewDistanceTraversedOnDeleteAndUpdateBracketState(final int inputL
             final int currentDistanceTraversed, final IQInlineBracket[] brackets) {
         int numCharDeleted = inputLength;
         int paddingLength = 0;
-        for (int i = 1; i <= numCharDeleted; i++) {
+        for (int i = 1; i <= numCharDeleted && i <= currentDistanceTraversed; i++) {
             var bracket = brackets[currentDistanceTraversed - i];
             if (bracket != null) {
                 if ((bracket instanceof QInlineSuggestionOpenBracketSegment)

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java
@@ -89,7 +89,7 @@ public void onNewSuggestion() {
         List<IQInlineSuggestionSegment> segments = IQInlineSuggestionSegmentFactory.getSegmentsFromSuggestion(session);
         brackets = new IQInlineBracket[session.getCurrentSuggestion().getInsertText().length()];
         if (lineIdx < contentInLine.length()) {
-            rightCtxBuf = contentInLine.substring(lineIdx) + delimiter;
+            rightCtxBuf = contentInLine.substring(lineIdx);
         }
         int normalSegmentNum = 0;
         for (var segment : segments) {
@@ -174,32 +174,31 @@ public void beforeRemoval() {
             }
         }
         toAppend += rightCtxBuf;
-        if (rightCtxBuf.isEmpty()) {
-            toAppend += widget.getLineDelimiter();
-        }
-
         suggestionSegments.stream().forEach((segment) -> segment.cleanUp());
-
+        final String toAppendFinal = toAppend;
         int idx = distanceTraversed;
         if (!toAppend.isEmpty()) {
-            try {
-                int currentOffset = session.getInvocationOffset() + idx;
-                int expandedCurrentOffset = QEclipseEditorUtils.getOffsetInFullyExpandedDocument(session.getViewer(),
-                        currentOffset);
-                int lineNumber = doc.getLineOfOffset(expandedCurrentOffset);
-                int startLineOffset = doc.getLineOffset(lineNumber);
-                int curLineInDoc = widget.getLineAtOffset(currentOffset);
-                int lineIdx = expandedCurrentOffset - startLineOffset;
-                String contentInLine = widget.getLine(curLineInDoc) + widget.getLineDelimiter();
-                String currentRightCtx = "\n";
-                if (lineIdx < contentInLine.length()) {
-                    currentRightCtx = contentInLine.substring(lineIdx);
+                try {
+                    int currentOffset = session.getInvocationOffset() + idx;
+                    int expandedCurrentOffset = QEclipseEditorUtils.getOffsetInFullyExpandedDocument(session.getViewer(),
+                            currentOffset);
+                    int lineNumber = doc.getLineOfOffset(expandedCurrentOffset);
+                    int startLineOffset = doc.getLineOffset(lineNumber);
+                    int curLineInDoc = widget.getLineAtOffset(currentOffset);
+                    int lineIdx = expandedCurrentOffset - startLineOffset;
+                    String contentInLine = widget.getLine(curLineInDoc);
+                    String currentRightCtx = contentInLine.substring(lineIdx);
+                    int distanceToNewLine = currentRightCtx.length();
+                    Display.getCurrent().asyncExec(() -> {
+                        try {
+                            doc.replace(expandedCurrentOffset, distanceToNewLine, toAppendFinal);
+                        } catch (BadLocationException e) {
+                            Activator.getLogger().error("Error appending right context", e);
+                        }
+                    });
+                } catch (BadLocationException e) {
+                    Activator.getLogger().error("Error retrieving line information for appending right context", e);
                 }
-                int distanceToNewLine = currentRightCtx.length();
-                doc.replace(expandedCurrentOffset, distanceToNewLine, toAppend);
-            } catch (BadLocationException e) {
-                Activator.getLogger().error(e.toString());
-            }
         }
     }
 

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java
@@ -527,14 +527,19 @@ public void dispose() {
         if (terminationListener != null) {
             widget.removeFocusListener(terminationListener);
         }
-        QInvocationSession.getInstance().getViewer().getTextWidget().redraw();
         if (paintListener != null) {
             paintListener.beforeRemoval();
             widget.removePaintListener(paintListener);
         }
         if (caretListener != null) {
             widget.removeCaretListener(caretListener);
         }
+        Display.getDefault().asyncExec(() -> {
+            if (!widget.isDisposed()) {
+                widget.redraw();
+                widget.update();
+            }
+        });
         paintListener = null;
         caretListener = null;
         inputListener = null;