Skip to content

fix inline completion not supported language UI is rendered in background thread #4946

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
Oct 8, 2024
Merged

fix inline completion not supported language UI is rendered in background thread #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03060c5
fix inline completion not supported language UI is rendered in backgr…
Will-ShaoHua Oct 8, 2024
ae78050
changelog
Will-ShaoHua Oct 8, 2024
44ac996
Update bugfix-34500b24-b177-49b2-a740-3b89dfb1f702.json
rli Oct 8, 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-34500b24-b177-49b2-a740-3b89dfb1f702.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix error occuring when Amazon Q attempts to show UI hints on manually triggerred inline suggestion (#4929)"
}
18 changes: 10 additions & 8 deletions ...rc/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,8 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
if (requestContext.triggerTypeInfo.triggerType == CodewhispererTriggerType.OnDemand) {
// We should only show error hint when CodeWhisperer popup is not visible,
// and make it silent if CodeWhisperer popup is showing.
runInEdt {
if (!CodeWhispererInvocationStatus.getInstance().isPopupActive()) {
showCodeWhispererErrorHint(requestContext.editor, displayMessage)
}
if (!CodeWhispererInvocationStatus.getInstance().isPopupActive()) {
showCodeWhispererErrorHint(requestContext.editor, displayMessage)
}
}
}
Expand Down Expand Up @@ -754,12 +752,16 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
return true
}

fun showCodeWhispererInfoHint(editor: Editor, message: String) {
HintManager.getInstance().showInformationHint(editor, message, HintManager.UNDER)
private fun showCodeWhispererInfoHint(editor: Editor, message: String) {
runInEdt {
HintManager.getInstance().showInformationHint(editor, message, HintManager.UNDER)
}
}

fun showCodeWhispererErrorHint(editor: Editor, message: String) {
HintManager.getInstance().showErrorHint(editor, message, HintManager.UNDER)
private fun showCodeWhispererErrorHint(editor: Editor, message: String) {
runInEdt {
HintManager.getInstance().showErrorHint(editor, message, HintManager.UNDER)
}
}

override fun dispose() {}
Expand Down
Loading