Skip to content

Fix popup not init in EDT for remote #5045

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 8 commits into from
Nov 6, 2024
Merged

Fix popup not init in EDT for remote #5045

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f8bfc15
Fix popup not init in EDT for remote
andrewyuq Nov 5, 2024
554a7dd
Update plugins/amazonq/codewhisperer/jetbrains-community/src/software…
andrewyuq Nov 5, 2024
a74c5b4
change log
andrewyuq Nov 5, 2024
c4a6a7d
Merge branch 'main' into auto-trigger-review
andrewyuq Nov 5, 2024
1f4ad70
Merge branch 'main' into auto-trigger-review
andrewyuq Nov 6, 2024
6e20467
Merge branch 'main' into auto-trigger-review
andrewyuq Nov 6, 2024
4bdb58c
Merge branch 'main' into auto-trigger-review
andrewyuq Nov 6, 2024
d2731df
Merge branch 'main' into auto-trigger-review
andrewyuq Nov 6, 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
10 changes: 7 additions & 3 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 @@ -46,6 +46,7 @@ import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.info
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.core.coroutines.EDT
import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
Expand Down Expand Up @@ -206,9 +207,12 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
invokeCodeWhispererInBackground(requestContext)
}

internal fun invokeCodeWhispererInBackground(requestContext: RequestContext): Job {
val popup = CodeWhispererPopupManager.getInstance().initPopup()
Disposer.register(popup) { CodeWhispererInvocationStatus.getInstance().finishInvocation() }
internal suspend fun invokeCodeWhispererInBackground(requestContext: RequestContext): Job {
val popup = withContext(EDT) {
val it = CodeWhispererPopupManager.getInstance().initPopup()
Disposer.register(it) { CodeWhispererInvocationStatus.getInstance().finishInvocation() }
it
}

val workerContexts = mutableListOf<WorkerContext>()
// When popup is disposed we will cancel this coroutine. The only places popup can get disposed should be
Expand Down
Loading