Skip to content

Commit 0cf1d95

Browse files
committed
Fix CodeWhisperer compilation for 2025.3
- Change lsp4j dependency from implementation to api in shared module to expose transitively - Add lsp4j dependency to codewhisperer module - Add null checks for editor.virtualFile in CodeWhispererService and CodeWhispererServiceNew - Fixes 'Unresolved reference lsp4j' and null-safety errors
1 parent bbec883 commit 0cf1d95

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
compileOnly(project(":plugin-core:jetbrains-community"))
2020

2121
implementation(project(":plugin-amazonq:shared:jetbrains-community"))
22+
implementation(libs.lsp4j)
2223
// CodeWhispererTelemetryService uses a CircularFifoQueue, previously transitive from zjsonpatch
2324
implementation(libs.commons.collections)
2425

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
542542
.openFiles.mapNotNull { toUriString(it) }
543543
}.orEmpty(),
544544
).apply {
545-
textDocument = TextDocumentIdentifier(toUriString(editor.virtualFile))
545+
textDocument = TextDocumentIdentifier(toUriString(editor.virtualFile ?: return@compute null))
546546
position = Position(
547547
editor.caretModel.primaryCaret.logicalPosition.line,
548548
editor.caretModel.primaryCaret.logicalPosition.column

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererServiceNew.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ class CodeWhispererServiceNew(private val cs: CoroutineScope) : Disposable {
572572
documentChangeParams = null,
573573
openTabFilepaths = null,
574574
).apply {
575-
textDocument = TextDocumentIdentifier(toUriString(editor.virtualFile))
575+
textDocument = TextDocumentIdentifier(toUriString(editor.virtualFile ?: return@compute null))
576576
position = Position(
577577
editor.caretModel.primaryCaret.logicalPosition.line,
578578
editor.caretModel.primaryCaret.logicalPosition.column

plugins/amazonq/shared/jetbrains-community/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
// CodeWhispererTelemetryService uses a CircularFifoQueue
2424
implementation(libs.commons.collections)
2525
implementation(libs.nimbus.jose.jwt)
26-
implementation(libs.lsp4j)
26+
api(libs.lsp4j)
2727

2828
testFixturesApi(testFixtures(project(":plugin-core:jetbrains-community")))
2929
}

0 commit comments

Comments
 (0)