From f9aeefa86a25b789178eb4bc68fcd60c784607c6 Mon Sep 17 00:00:00 2001 From: Felix Ding Date: Thu, 21 Nov 2024 16:38:24 -0800 Subject: [PATCH 1/3] Fixes logic for checking if user has typed ahead --- .../toolkits/eclipse/amazonq/util/QInlineInputListener.java | 2 -- .../toolkits/eclipse/amazonq/util/QInvocationSession.java | 6 +----- 2 files changed, 1 insertion(+), 7 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 index b53276fe..3e7c6a0e 100644 --- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java +++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineInputListener.java @@ -317,8 +317,6 @@ public void documentChanged(final DocumentEvent event) { } } - session.setHasBeenTypedahead(currentOffset - session.getInvocationOffset() > 0); - boolean isOutOfBounds = distanceTraversed + input.length() >= currentSuggestion.length() || distanceTraversed < 0; if (isOutOfBounds || !isInputAMatch(currentSuggestion, distanceTraversed, input)) { diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java index 1d50df23..aa1eded1 100644 --- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java +++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java @@ -407,12 +407,8 @@ public void incrementCurentSuggestionIndex() { } } - public void setHasBeenTypedahead(final boolean hasBeenTypedahead) { - this.hasBeenTypedahead = hasBeenTypedahead; - } - public boolean hasBeenTypedahead() { - return hasBeenTypedahead; + return getInvocationOffset() != getViewer().getTextWidget().getCaretOffset(); } public void executeCallbackForCodeReference() { From ad0e0328a51a1a7efdb7192d32ac6edbe4677878 Mon Sep 17 00:00:00 2001 From: Felix Ding Date: Thu, 21 Nov 2024 16:47:12 -0800 Subject: [PATCH 2/3] Removes unused variable --- .../aws/toolkits/eclipse/amazonq/util/QInvocationSession.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java index aa1eded1..44774aff 100644 --- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java +++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java @@ -50,7 +50,6 @@ public final class QInvocationSession extends QResource { private QInlineInputListener inputListener = null; private QInlineTerminationListener terminationListener = null; private int[] headOffsetAtLine = new int[500]; - private boolean hasBeenTypedahead = false; private boolean isTabOnly = false; private Consumer unsetVerticalIndent; private ConcurrentHashMap> unresolvedTasks = new ConcurrentHashMap<>(); From fc866738016cf3d363296067e17c2924d50d960a Mon Sep 17 00:00:00 2001 From: Felix Ding Date: Thu, 21 Nov 2024 16:51:50 -0800 Subject: [PATCH 3/3] Removes unused variable from cleanup routine --- .../aws/toolkits/eclipse/amazonq/util/QInvocationSession.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java index 44774aff..9088abf5 100644 --- a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java +++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInvocationSession.java @@ -504,7 +504,6 @@ public void dispose() { inlineTextFont = null; inlineTextFontBold = null; caretMovementReason = CaretMovementReason.UNEXAMINED; - hasBeenTypedahead = false; unresolvedTasks.forEach((uuid, task) -> { boolean cancelled = task.cancel(true); if (cancelled) {