-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:aws/amazon-q-eclipse into refactor-…
…input-listener-for-inline
- Loading branch information
Showing
17 changed files
with
367 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/model/InlineCompletionReference.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.lsp.model; | ||
|
|
||
| public class InlineCompletionReference { | ||
| private String referenceName; | ||
| private String referenceUrl; | ||
| private String licenseName; | ||
| private InlineCompletionReferencePosition position; | ||
|
|
||
| public final void setReferenceName(final String referenceName) { | ||
| this.referenceName = referenceName; | ||
| } | ||
|
|
||
| public final void setReferenceUrl(final String referenceUrl) { | ||
| this.referenceUrl = referenceUrl; | ||
| } | ||
|
|
||
| public final void setLicenseName(final String licenseName) { | ||
| this.licenseName = licenseName; | ||
| } | ||
|
|
||
| public final void setPosition(final InlineCompletionReferencePosition position) { | ||
| this.position = position; | ||
| } | ||
|
|
||
| public final String getReferenceName() { | ||
| return referenceName; | ||
| } | ||
|
|
||
| public final String getReferenceUrl() { | ||
| return referenceUrl; | ||
| } | ||
|
|
||
| public final String getLicenseName() { | ||
| return licenseName; | ||
| } | ||
|
|
||
| public final InlineCompletionReferencePosition getPosition() { | ||
| return position; | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...rc/software/aws/toolkits/eclipse/amazonq/lsp/model/InlineCompletionReferencePosition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.lsp.model; | ||
|
|
||
| public class InlineCompletionReferencePosition { | ||
| private int startCharacter; | ||
| private int endCharacter; | ||
|
|
||
| public final void setStartCharacter(final int startCharacter) { | ||
| this.startCharacter = startCharacter; | ||
| } | ||
|
|
||
| public final void setEndCharacter(final int endCharacter) { | ||
| this.endCharacter = endCharacter; | ||
| } | ||
|
|
||
| public final int getStartCharacter() { | ||
| return startCharacter; | ||
| } | ||
|
|
||
| public final int getEndCharacter() { | ||
| return endCharacter; | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
plugin/src/software/aws/toolkits/eclipse/amazonq/util/CodeReferenceAcceptanceCallback.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package software.aws.toolkits.eclipse.amazonq.util; | ||
|
|
||
| import software.aws.toolkits.eclipse.amazonq.lsp.model.InlineCompletionItem; | ||
|
|
||
| @FunctionalInterface | ||
| public interface CodeReferenceAcceptanceCallback { | ||
| void onCallback(InlineCompletionItem suggestionItem, int startLine); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 173 additions & 0 deletions
173
plugin/src/software/aws/toolkits/eclipse/amazonq/util/QInlineVerifyKeyListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
|
|
||
| package software.aws.toolkits.eclipse.amazonq.util; | ||
|
|
||
| import java.util.Stack; | ||
|
|
||
| import org.eclipse.core.runtime.preferences.IEclipsePreferences; | ||
| import org.eclipse.core.runtime.preferences.InstanceScope; | ||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.custom.StyledText; | ||
| import org.eclipse.swt.custom.VerifyKeyListener; | ||
| import org.eclipse.swt.events.VerifyEvent; | ||
|
|
||
| public final class QInlineVerifyKeyListener implements VerifyKeyListener { | ||
| private StyledText widget = null; | ||
|
|
||
| public QInlineVerifyKeyListener(final StyledText widget) { | ||
| this.widget = widget; | ||
| } | ||
|
|
||
| @Override | ||
| public void verifyKey(final VerifyEvent event) { | ||
| var qInvocationSessionInstance = QInvocationSession.getInstance(); | ||
| if (qInvocationSessionInstance == null || qInvocationSessionInstance.getState() != QInvocationSessionState.SUGGESTION_PREVIEWING) { | ||
| return; | ||
| } | ||
| // We need to provide the reason for the caret movement. This way we can perform | ||
| // subsequent actions accordingly: | ||
| // - If the caret has been moved due to traversals (i.e. arrow keys or mouse | ||
| // click) we would want to end the invocation session since that signifies the | ||
| // user no longer has the intent for text input at its original location. | ||
| // - And if the caret has been moved due to typing, we will need to determine if | ||
| // it's appropriate to perform a "typeahead". | ||
| // | ||
| // In effect, we would need to fulfill the following responsibilities. | ||
| // - We identify whether text is being entered and update a state that | ||
| // accessible by other listeners. | ||
| // - We shall also examine said text to see if it matches the beginning of the | ||
| // suggestion (if there is one) so we can fulfill "typeahead" functionality. | ||
| if (event.keyCode == SWT.ARROW_UP || event.keyCode == SWT.ARROW_DOWN || event.keyCode == SWT.ARROW_LEFT || event.keyCode == SWT.ARROW_RIGHT) { | ||
| System.out.println("Movement key registered"); | ||
| qInvocationSessionInstance.setCaretMovementReason(CaretMovementReason.MOVEMENT_KEY); | ||
| } else { | ||
| qInvocationSessionInstance.setCaretMovementReason(CaretMovementReason.TEXT_INPUT); | ||
|
|
||
| // Here we conduct typeahead logic | ||
| String currentSuggestion = qInvocationSessionInstance.getCurrentSuggestion().getInsertText().trim(); | ||
| int currentOffset = widget.getCaretOffset(); | ||
| qInvocationSessionInstance | ||
| .setHasBeenTypedahead(currentOffset - qInvocationSessionInstance.getInvocationOffset() > 0); | ||
| IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode("org.eclipse.jdt.ui"); | ||
| // This needs to be defaulted to true. This key is only present in the | ||
| // preference store if it is set to false. | ||
| // Therefore if you can't find it, it has been set to true. | ||
| boolean isAutoClosingEnabled = preferences.getBoolean("closeBrackets", true); | ||
|
|
||
| // We are deliberately leaving out curly braces here (i.e. '{') because eclipse | ||
| // does not auto close curly braces unless there is a new line entered. | ||
| boolean isInputClosingBracket = (event.character == ')' || event.character == ']' || event.character == '"' || event.character == '>'); | ||
| boolean isInputOpeningBracket = (event.character == '(' || event.character == '[' || event.character == '"' || event.character == '<'); | ||
| Stack<Character> closingBrackets = qInvocationSessionInstance.getClosingBrackets(); | ||
|
|
||
| if (isAutoClosingEnabled) { | ||
| if (closingBrackets == null) { | ||
| closingBrackets = new Stack<>(); | ||
| } | ||
| if (event.character == '(') { | ||
| closingBrackets.push(')'); | ||
| } else if (event.character == '[') { | ||
| closingBrackets.push(']'); | ||
| } else if (event.character == '"') { | ||
| closingBrackets.push('"'); | ||
| } else if (event.character == '<') { | ||
| closingBrackets.push('>'); | ||
| } else if (isInputClosingBracket) { | ||
| Character topClosingBracket = closingBrackets.pop(); | ||
| if (!topClosingBracket.equals(event.character)) { | ||
| System.out.println("Session terminated due to mismatching closing bracket"); | ||
| qInvocationSessionInstance.transitionToDecisionMade(); | ||
| qInvocationSessionInstance.end(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| int distanceAdjustedForAutoClosingBrackets = (isAutoClosingEnabled && (isInputOpeningBracket || isInputClosingBracket)) ? 1 : 0; | ||
| // Note that distanceTraversed here is the zero-based index | ||
| // We need to subtract from leading whitespace skipped the indent the editor had | ||
| // placed the caret after at the new line. | ||
| int newLineOffset = 0; | ||
| boolean isLastKeyNewLine = qInvocationSessionInstance.isLastKeyNewLine(); | ||
| int leadingWhitespaceSkipped = qInvocationSessionInstance.getLeadingWhitespaceSkipped(); | ||
| int invocationOffset = qInvocationSessionInstance.getInvocationOffset(); | ||
| if (isLastKeyNewLine) { | ||
| int currentLineInEditor = widget.getLineAtOffset(currentOffset); | ||
| newLineOffset = currentOffset - widget.getOffsetAtLine(currentLineInEditor); | ||
| leadingWhitespaceSkipped -= newLineOffset; | ||
| qInvocationSessionInstance.setLeadingWhitespaceSkipped(leadingWhitespaceSkipped); | ||
| qInvocationSessionInstance.setIsLastKeyNewLine(false); | ||
| } | ||
| int distanceTraversed = currentOffset - invocationOffset + leadingWhitespaceSkipped - distanceAdjustedForAutoClosingBrackets; | ||
|
|
||
| // If we are traversing backwards, we need to undo the adjustments we had done | ||
| // for the following items as we come across them: | ||
| // - whitespace | ||
| // - brackets (?) | ||
| if (event.keyCode == SWT.BS && distanceTraversed > 0 | ||
| && currentOffset - 1 <= qInvocationSessionInstance.getHeadOffsetAtLine(widget.getLineAtOffset(currentOffset)) | ||
| ) { | ||
| qInvocationSessionInstance.setLeadingWhitespaceSkipped(leadingWhitespaceSkipped - 1); | ||
| return; | ||
| } | ||
| // System.out.println("Distance traversed: " + distanceTraversed); | ||
| // System.out.println("Leading whitespace skipped: " + leadingWhitespaceSkipped); | ||
| // System.out.println("Distance adjusted for auto closing brackets: " + distanceAdjustedForAutoClosingBrackets); | ||
| // System.out.println("Character typed: " + event.character); | ||
| // System.out.println("Current caret offset: " + currentOffset); | ||
| // System.out.println("Is auto closing brackets enabled: " + isAutoClosingEnabled); | ||
|
|
||
| // Terminate the session under the right conditions. These are: | ||
| // - If what has been typed does not match what has been suggested (we are going | ||
| // to assume the user does not want the suggestion) | ||
| // We are excluding modifier keys that do not produce text on the screen (e.g. | ||
| // shift, ctrl, option). | ||
| // - If the caret position has exceeded the invocation offset leftwards. | ||
| // - If the caret position has exceeded that of the end of the suggestion. | ||
| // - If the user has typehead to the end of the suggest (we would not just | ||
| // terminate the | ||
| if (event.character == '\0' || event.keyCode == SWT.ESC) { | ||
| // We have ESC mapped to reject command. We'll let the command take care of it. | ||
| return; | ||
| } | ||
| if (distanceTraversed >= currentSuggestion.length() || distanceTraversed < 0) { | ||
| qInvocationSessionInstance.transitionToDecisionMade(); | ||
| qInvocationSessionInstance.end(); | ||
| return; | ||
| } | ||
|
|
||
| char currentCharInSuggestion = currentSuggestion.charAt(distanceTraversed); | ||
| if ((distanceTraversed <= 0 && event.keyCode == SWT.BS) || distanceTraversed > currentSuggestion.length() | ||
| || ((event.keyCode != SWT.BS && event.keyCode != SWT.CR) && currentCharInSuggestion != event.character) | ||
| || (event.keyCode == SWT.CR && (currentCharInSuggestion != '\n' && currentCharInSuggestion != '\r'))) { | ||
| qInvocationSessionInstance.transitionToDecisionMade(); | ||
| qInvocationSessionInstance.end(); | ||
| } | ||
|
|
||
| if (event.keyCode == SWT.CR) { | ||
| qInvocationSessionInstance.setIsLastKeyNewLine(true); | ||
| } | ||
|
|
||
| // We would also need to consider scenarios where the suggestion contains | ||
| // formatting whitespace. | ||
| // Should we come across them, we would need to do the following: | ||
| // - Examine if the last key registered was a CR, if it isn't we treat it as | ||
| // normal and examine the input verbatim | ||
| // - Otherwise, we shall skip ahead until the first non-whitespace character in | ||
| // the suggestion and increment `leadingWhitespaceSkipped` accordingly. | ||
| if (event.keyCode == SWT.CR && distanceTraversed < currentSuggestion.length() - 1 | ||
| && Character.isWhitespace(currentSuggestion.charAt(distanceTraversed + 1)) | ||
| && currentSuggestion.charAt(distanceTraversed + 1) != '\n' && currentSuggestion.charAt(distanceTraversed + 1) != '\r') { | ||
| int newWs = 0; | ||
| while (Character.isWhitespace(currentSuggestion.charAt(distanceTraversed + 1 + newWs))) { | ||
| newWs++; | ||
| if ((distanceTraversed + 1 + newWs) > currentSuggestion.length()) { | ||
| break; | ||
| } | ||
| } | ||
| leadingWhitespaceSkipped += newWs; | ||
| qInvocationSessionInstance.setLeadingWhitespaceSkipped(leadingWhitespaceSkipped); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.