Skip to content

fix(amazonq): better location for inline chat editor hint #5057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 7, 2024
Merged

fix(amazonq): better location for inline chat editor hint #5057

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9021fc
fix(amazonq): better location for inline chat editor hint
zixlin7 Nov 6, 2024
cea4047
Merge branch 'main' into improveHint
zixlin7 Nov 7, 2024
344f03a
Merge branch 'main' into improveHint
zixlin7 Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-1b531ca4-5b80-48d9-89e7-ac88adc77ad5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Improve the position that inline chat shortcut hint is shown in editor"
}
11 changes: 7 additions & 4 deletions ...community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatEditorHint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,26 @@ import javax.swing.JPanel

class InlineChatEditorHint {
private val hint = createHint()
private val hintXOffset = 20
Copy link
Contributor

@rli rli Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you double check what happens when the UI is scaled really big?

Copy link
Contributor Author

@zixlin7 zixlin7 Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checked on both small window size and big monitor, it looks fine


private fun getHintLocation(editor: Editor): Point {
val range = editor.calculateVisibleRange()
val document = editor.document
val selectionEnd = editor.selectionModel.selectionEnd
val isOneLineSelection = isOneLineSelection(editor)
val isBelow = editor.offsetToXY(selectionEnd) !in editor.scrollingModel.visibleArea
val offset = document.getLineEndOffset(document.getLineNumber(selectionEnd))
val offsetXy = editor.offsetToXY(offset)
val potentialXy = Point(offsetXy.x + hintXOffset, offsetXy.y)
val isBelow = potentialXy !in editor.scrollingModel.visibleArea
val areEdgesOutsideOfVisibleArea = editor.selectionModel.selectionStart !in range && editor.selectionModel.selectionEnd !in range
val offsetForHint = when {
isOneLineSelection -> selectionEnd
areEdgesOutsideOfVisibleArea -> document.getLineEndOffset(getLineByVisualStart(editor, editor.caretModel.offset, true))
isBelow -> document.getLineEndOffset(getLineByVisualStart(editor, selectionEnd, true))
else -> document.getLineEndOffset(getLineByVisualStart(editor, selectionEnd, false))
}
val visualPosition = editor.offsetToVisualPosition(offsetForHint)
val hintPoint = HintManagerImpl.getHintPosition(hint, editor, visualPosition, HintManager.RIGHT)
hintPoint.translate(0, if (isBelow) editor.lineHeight else 0)
val hintPoint = HintManagerImpl.getHintPosition(hint, editor, visualPosition, HintManager.RIGHT_UNDER)
hintPoint.translate(if (!isBelow) hintXOffset else 0, if (!isOneLineSelection || isBelow) editor.lineHeight else 0)
return hintPoint
}

Expand Down
Loading