Skip to content

fix(amazonq): do not call didChangeDependencyPaths on EDT #5714

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
May 14, 2025
Merged

fix(amazonq): do not call didChangeDependencyPaths on EDT #5714

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
6a60792
fix(amazonq): do not call didChangeDependencyPaths on EDT
rli May 13, 2025
7771fbd
tst
rli May 13, 2025
aa20bdb
lint
rli May 14, 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
11 changes: 7 additions & 4 deletions .../toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider.Companion.EP_NAME
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
import java.util.concurrent.CompletableFuture
import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread

class DefaultModuleDependenciesService(
private val project: Project,
Expand All @@ -34,10 +34,13 @@
syncAllModules()
}

override fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams): CompletableFuture<Unit> =
override fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams) {
AmazonQLspService.executeIfRunning(project) { languageServer ->
languageServer.didChangeDependencyPaths(params)
}?.toCompletableFuture() ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running"))
pluginAwareExecuteOnPooledThread {
languageServer.didChangeDependencyPaths(params)
}

Check warning on line 41 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt#L39-L41 

Added lines #L39 - L41 were not covered by tests
}
}

Check warning on line 43 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt#L43 

Added line #L43 was not covered by tests

private fun syncAllModules() {
ModuleManager.getInstance(project).modules.forEach { module ->
Expand Down
3 changes: 1 addition & 2 deletions ...are/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependenciesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies

import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
import java.util.concurrent.CompletableFuture

interface ModuleDependenciesService {
fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams): CompletableFuture<Unit>
fun didChangeDependencyPaths(params: DidChangeDependencyPathsParams)
}
11 changes: 3 additions & 8 deletions ...lkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
package software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies

import com.intellij.openapi.Disposable
import com.intellij.openapi.application.Application
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.serviceIfCreated
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModuleRootEvent
import com.intellij.testFramework.ApplicationExtension
import com.intellij.util.messages.MessageBus
import com.intellij.util.messages.MessageBusConnection
import io.mockk.every
Expand All @@ -23,19 +22,20 @@ import io.mockk.verify
import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.dependencies.ModuleDependencyProvider.Companion.EP_NAME
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
import java.util.concurrent.CompletableFuture
import java.util.function.Consumer

@ExtendWith(ApplicationExtension::class)
class DefaultModuleDependenciesServiceTest {
private lateinit var project: Project
private lateinit var mockLanguageServer: AmazonQLanguageServer
private lateinit var mockModuleManager: ModuleManager
private lateinit var sut: DefaultModuleDependenciesService
private lateinit var mockApplication: Application
private lateinit var mockDependencyProvider: ModuleDependencyProvider

@BeforeEach
Expand All @@ -47,11 +47,6 @@ class DefaultModuleDependenciesServiceTest {

every { mockLanguageServer.didChangeDependencyPaths(any()) } returns CompletableFuture<Unit>()

// Mock Application
mockApplication = mockk()
mockkStatic(ApplicationManager::class)
every { ApplicationManager.getApplication() } returns mockApplication

// Mock message bus
val messageBus = mockk<MessageBus>()
every { project.messageBus } returns messageBus
Expand Down
Loading