Skip to content

fix(chat/inline workspace context): fix updating workspace index blocks UI thread #5297

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
Jan 27, 2025
Merged

fix(chat/inline workspace context): fix updating workspace index blocks UI thread #5297

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
2cb7339
fix updating workspace index blocks UI thread
Will-ShaoHua Jan 24, 2025
5bfb615
revert changes added accidentally
Will-ShaoHua Jan 24, 2025
1709e2e
changelog
Will-ShaoHua Jan 24, 2025
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-970b5a61-5646-4f40-b9fa-65c69ceda73f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix UI freeze caused by updating workspace index on non background context"
}
9 changes: 7 additions & 2 deletions .../src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ import com.intellij.openapi.vfs.newvfs.BulkFileListener
import com.intellij.openapi.vfs.newvfs.events.VFileCreateEvent
import com.intellij.openapi.vfs.newvfs.events.VFileDeleteEvent
import com.intellij.openapi.vfs.newvfs.events.VFileEvent
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.TimeoutCancellationException
import kotlinx.coroutines.launch
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
import java.util.concurrent.TimeoutException

@Service(Service.Level.PROJECT)
Expand All @@ -38,8 +40,10 @@ class ProjectContextController(private val project: Project, private val cs: Cor
val createdFiles = events.filterIsInstance<VFileCreateEvent>().mapNotNull { it.file?.path }
val deletedFiles = events.filterIsInstance<VFileDeleteEvent>().map { it.file.path }

updateIndex(createdFiles, IndexUpdateMode.ADD)
updateIndex(deletedFiles, IndexUpdateMode.REMOVE)
pluginAwareExecuteOnPooledThread {
updateIndex(createdFiles, IndexUpdateMode.ADD)
updateIndex(deletedFiles, IndexUpdateMode.REMOVE)
}
}
}
)
Expand Down Expand Up @@ -68,6 +72,7 @@ class ProjectContextController(private val project: Project, private val cs: Cor
emptyList()
}

@RequiresBackgroundThread
fun updateIndex(filePaths: List<String>, mode: IndexUpdateMode) {
try {
return projectContextProvider.updateIndex(filePaths, mode)
Expand Down
5 changes: 4 additions & 1 deletion .../software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextEditorListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.project
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.fileEditor.FileEditorManagerEvent
import com.intellij.openapi.fileEditor.FileEditorManagerListener
import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread

class ProjectContextEditorListener : FileEditorManagerListener {
override fun selectionChanged(event: FileEditorManagerEvent) {
Expand All @@ -19,6 +20,8 @@ class ProjectContextEditorListener : FileEditorManagerListener {
}

val project = event.manager.project
ProjectContextController.getInstance(project).updateIndex(listOf(oldFile.path), IndexUpdateMode.UPDATE)
pluginAwareExecuteOnPooledThread {
ProjectContextController.getInstance(project).updateIndex(listOf(oldFile.path), IndexUpdateMode.UPDATE)
}
}
}
Loading