Skip to content

fix(amazonq): fix issue where AmazonQLspService subservices are never disposed #5753

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

fix(amazonq): fix issue where AmazonQLspService subservices are never disposed #5753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
392c9cb
fix(amazonq): fix issue where AmazonQLspService subservices are never…
rli May 22, 2025
0468beb
tst
rli May 27, 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
16 changes: 12 additions & 4 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,18 @@
}

[email protected] {
DefaultAuthCredentialsService(project, encryptionManager, this)
TextDocumentServiceHandler(project, this)
WorkspaceServiceHandler(project, lspInitResult, this)
DefaultModuleDependenciesService(project, this)
DefaultAuthCredentialsService(project, encryptionManager).also {
Disposer.register(this, it)
}
TextDocumentServiceHandler(project).also {
Disposer.register(this, it)
}
WorkspaceServiceHandler(project, lspInitResult).also {
Disposer.register(this, it)
}
DefaultModuleDependenciesService(project).also {
Disposer.register(this, it)
}

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

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt#L479-L490 

Added lines #L479 - L490 were not covered by tests
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...oftware/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
class DefaultAuthCredentialsService(
private val project: Project,
private val encryptionManager: JwtEncryptionManager,
serverInstance: Disposable,
) : AuthCredentialsService,
BearerTokenProviderListener,
ToolkitConnectionManagerListener,
Expand All @@ -50,7 +49,7 @@
private val tokenSyncIntervalMinutes = 5L

init {
project.messageBus.connect(serverInstance).apply {
project.messageBus.connect(this).apply {

Check warning on line 52 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt#L52 

Added line #L52 was not covered by tests
subscribe(BearerTokenProviderListener.TOPIC, this@DefaultAuthCredentialsService)
subscribe(ToolkitConnectionManagerListener.TOPIC, this@DefaultAuthCredentialsService)
subscribe(QRegionProfileSelectedListener.TOPIC, this@DefaultAuthCredentialsService)
Expand Down
10 changes: 6 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 @@ -15,12 +15,11 @@

class DefaultModuleDependenciesService(
private val project: Project,
serverInstance: Disposable,
) : ModuleDependenciesService,
ModuleRootListener {

ModuleRootListener,
Disposable {
init {
project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 22 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#L22 

Added line #L22 was not covered by tests
ModuleRootListener.TOPIC,
this
)
Expand Down Expand Up @@ -52,4 +51,7 @@
}
}
}

override fun dispose() {
}

Check warning on line 56 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#L56 

Added line #L56 was not covered by tests
}
16 changes: 9 additions & 7 deletions ...re/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,26 @@

class TextDocumentServiceHandler(
private val project: Project,
private val serverInstance: Disposable,
) : FileDocumentManagerListener,
FileEditorManagerListener,
BulkFileListener,
DocumentListener {

DocumentListener,
Disposable {
init {
// didOpen & didClose events
project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 42 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt#L42 

Added line #L42 was not covered by tests
FileEditorManagerListener.FILE_EDITOR_MANAGER,
this
)

// didChange events
project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 48 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt#L48 

Added line #L48 was not covered by tests
VirtualFileManager.VFS_CHANGES,
this
)

// didSave events
project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 54 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt#L54 

Added line #L54 was not covered by tests
FileDocumentManagerListener.TOPIC,
this
)
Expand All @@ -72,7 +71,7 @@
realTimeEdit(event)
}
},
serverInstance
this

Check warning on line 74 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt#L74 

Added line #L74 was not covered by tests
)
}
AmazonQLspService.executeIfRunning(project) { languageServer ->
Expand Down Expand Up @@ -183,4 +182,7 @@
}
// Process document changes here
}

override fun dispose() {
}

Check warning on line 187 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt#L187 

Added line #L187 was not covered by tests
}
11 changes: 7 additions & 4 deletions ...software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,22 @@
class WorkspaceServiceHandler(
private val project: Project,
initializeResult: InitializeResult,
serverInstance: Disposable,
) : BulkFileListener,
ModuleRootListener {
ModuleRootListener,
Disposable {

private var lastSnapshot: List<WorkspaceFolder> = emptyList()
private val operationMatchers: MutableMap<FileOperationType, List<Pair<PathMatcher, String>>> = mutableMapOf()

init {
operationMatchers.putAll(initializePatterns(initializeResult))

project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 58 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt#L58 

Added line #L58 was not covered by tests
VirtualFileManager.VFS_CHANGES,
this
)

project.messageBus.connect(serverInstance).subscribe(
project.messageBus.connect(this).subscribe(

Check warning on line 63 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt#L63 

Added line #L63 was not covered by tests
ModuleRootListener.TOPIC,
this
)
Expand Down Expand Up @@ -313,4 +313,7 @@
lastSnapshot = currentSnapshot
}
}

override fun dispose() {
}

Check warning on line 318 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt#L318 

Added line #L318 was not covered by tests
}
18 changes: 9 additions & 9 deletions ...are/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class DefaultAuthCredentialsServiceTest {

@Test
fun `activeConnectionChanged updates token when connection ID matches Q connection`() {
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)
val newConnection = createMockConnection("new-token", "connection-id")
every { mockConnection.id } returns "connection-id"

Expand All @@ -154,7 +154,7 @@ class DefaultAuthCredentialsServiceTest {

@Test
fun `activeConnectionChanged does not update token when connection ID differs`() {
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)
val newConnection = createMockConnection("new-token", "different-id")
every { mockConnection.id } returns "q-connection-id"

Expand All @@ -165,7 +165,7 @@ class DefaultAuthCredentialsServiceTest {

@Test
fun `onChange updates token with new connection`() {
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)
setupMockConnectionManager("updated-token")

sut.onChange("providerId", listOf("new-scope"))
Expand All @@ -178,7 +178,7 @@ class DefaultAuthCredentialsServiceTest {
every { isQConnected(project) } returns false
every { isQExpired(project) } returns false

sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

verify(exactly = 0) { mockLanguageServer.updateTokenCredentials(any()) }
}
Expand All @@ -188,15 +188,15 @@ class DefaultAuthCredentialsServiceTest {
every { isQConnected(project) } returns true
every { isQExpired(project) } returns true

sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

verify(exactly = 0) { mockLanguageServer.updateTokenCredentials(any()) }
}

@Test
fun `test updateTokenCredentials unencrypted success`() {
val isEncrypted = false
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

sut.updateTokenCredentials(mockConnection, isEncrypted)

Expand All @@ -215,7 +215,7 @@ class DefaultAuthCredentialsServiceTest {

@Test
fun `test updateTokenCredentials encrypted success`() {
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

val encryptedToken = "encryptedToken"
val isEncrypted = true
Expand All @@ -239,7 +239,7 @@ class DefaultAuthCredentialsServiceTest {

@Test
fun `test deleteTokenCredentials success`() {
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

every { mockLanguageServer.deleteTokenCredentials() } returns CompletableFuture.completedFuture(Unit)

Expand All @@ -252,7 +252,7 @@ class DefaultAuthCredentialsServiceTest {
fun `init results in token update`() {
every { isQConnected(any()) } returns true
every { isQExpired(any()) } returns false
sut = DefaultAuthCredentialsService(project, mockEncryptionManager, mockk())
sut = DefaultAuthCredentialsService(project, mockEncryptionManager)

verify(exactly = 1) { mockLanguageServer.updateTokenCredentials(any()) }
}
Expand Down
8 changes: 4 additions & 4 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 @@ -95,7 +95,7 @@ class DefaultModuleDependenciesServiceTest {
every { mockModuleManager.modules } returns arrayOf(module)
prepDependencyProvider(listOf(Pair(module, params)))

sut = DefaultModuleDependenciesService(project, mockk())
sut = DefaultModuleDependenciesService(project)

verify { mockLanguageServer.didChangeDependencyPaths(params) }
}
Expand Down Expand Up @@ -127,7 +127,7 @@ class DefaultModuleDependenciesServiceTest {
)
)

sut = DefaultModuleDependenciesService(project, mockk())
sut = DefaultModuleDependenciesService(project)

verify { mockLanguageServer.didChangeDependencyPaths(params1) }
verify { mockLanguageServer.didChangeDependencyPaths(params2) }
Expand All @@ -148,7 +148,7 @@ class DefaultModuleDependenciesServiceTest {
val event = mockk<ModuleRootEvent>()
every { event.isCausedByFileTypesChange } returns true

sut = DefaultModuleDependenciesService(project, mockk())
sut = DefaultModuleDependenciesService(project)

sut.rootsChanged(event)

Expand All @@ -173,7 +173,7 @@ class DefaultModuleDependenciesServiceTest {

prepDependencyProvider(listOf(Pair(module, params)))

sut = DefaultModuleDependenciesService(project, mockk())
sut = DefaultModuleDependenciesService(project)

sut.rootsChanged(event)

Expand Down
4 changes: 2 additions & 2 deletions ...ws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class TextDocumentServiceHandlerTest {
every { mockTextDocumentService.didOpen(any()) } returns Unit
every { mockTextDocumentService.didClose(any()) } returns Unit

sut = TextDocumentServiceHandler(projectRule.project, mockk())
sut = TextDocumentServiceHandler(projectRule.project)
}

@Test
Expand Down Expand Up @@ -137,7 +137,7 @@ class TextDocumentServiceHandlerTest {
projectRule.fixture.createFile("name", content).also { projectRule.fixture.openFileInEditor(it) }
}

sut = TextDocumentServiceHandler(projectRule.project, mockk())
sut = TextDocumentServiceHandler(projectRule.project)

val paramsSlot = mutableListOf<DidOpenTextDocumentParams>()
verify { mockTextDocumentService.didOpen(capture(paramsSlot)) }
Expand Down
2 changes: 1 addition & 1 deletion ...ware/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class WorkspaceServiceHandlerTest {
every { mockInitializeResult.capabilities } returns mockCapabilities

// Create WorkspaceServiceHandler with mocked InitializeResult
sut = WorkspaceServiceHandler(project, mockInitializeResult, mockk())
sut = WorkspaceServiceHandler(project, mockInitializeResult)
}

@Test
Expand Down
Loading