Skip to content

Fix EDT issue on CodeWhispererEditorListener #4934

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 2 commits into from
Oct 4, 2024
Merged

Fix EDT issue on CodeWhispererEditorListener #4934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d9562d
Fix EDT issue on CodeWhispererEditorListener
rli Oct 3, 2024
fb93555
virtualfile
rli Oct 3, 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-c7239939-2067-469a-809e-594d2c95594b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix 'Slow operations are prohibited on EDT.' when Amazon Q is determining if a file supports inline suggestions (#4823)"
}
44 changes: 21 additions & 23 deletions ...tware/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.intellij.openapi.editor.event.DocumentEvent
import com.intellij.openapi.editor.event.EditorFactoryEvent
import com.intellij.openapi.editor.event.EditorFactoryListener
import com.intellij.openapi.editor.impl.EditorImpl
import com.intellij.psi.PsiDocumentManager
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus
Expand All @@ -17,27 +16,26 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhis
class CodeWhispererEditorListener : EditorFactoryListener {
override fun editorCreated(event: EditorFactoryEvent) {
val editor = (event.editor as? EditorImpl) ?: return
editor.project?.let { project ->
PsiDocumentManager.getInstance(project).getPsiFile(editor.document)?.programmingLanguage() ?. let { language ->
// If language is not supported by CodeWhisperer, no action needed
if (!language.isCodeCompletionSupported()) return
// If language is supported, install document listener for CodeWhisperer service
editor.document.addDocumentListener(
object : BulkAwareDocumentListener {
// TODO: Track only deletion changes within the current 5-min interval which will give
// the most accurate code percentage data.
override fun documentChanged(event: DocumentEvent) {
if (!isCodeWhispererEnabled(project)) return
CodeWhispererInvocationStatus.getInstance().documentChanged()
CodeWhispererCodeCoverageTracker.getInstance(project, language).apply {
activateTrackerIfNotActive()
documentChanged(event)
}
}
},
editor.disposable
)
}
}
val project = editor.project ?: return

val language = editor.virtualFile.programmingLanguage()
// If language is not supported by CodeWhisperer, no action needed
if (!language.isCodeCompletionSupported()) return
// If language is supported, install document listener for CodeWhisperer service
editor.document.addDocumentListener(
object : BulkAwareDocumentListener {
// TODO: Track only deletion changes within the current 5-min interval which will give
// the most accurate code percentage data.
override fun documentChanged(event: DocumentEvent) {
if (!isCodeWhispererEnabled(project)) return
CodeWhispererInvocationStatus.getInstance().documentChanged()
CodeWhispererCodeCoverageTracker.getInstance(project, language).apply {
activateTrackerIfNotActive()
documentChanged(event)
}
}
},
editor.disposable
)
}
}
Loading