Skip to content

fix(amazonq): didRename emits full oldUri path #5487

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
Mar 20, 2025
Merged

fix(amazonq): didRename emits full oldUri path #5487

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
8f749d4
fix oldUri for FileRename param
samgst-amazon Mar 20, 2025
d4dea79
unused function
samgst-amazon Mar 20, 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: 5 additions & 6 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 @@ -128,13 +128,12 @@
val validRenames = events
.filter { it.propertyName == VirtualFile.PROP_NAME }
.mapNotNull { event ->
val file = event.file.takeIf { shouldHandleFile(it) } ?: return@mapNotNull null
if (event.newValue !is String) return@mapNotNull null
val renamedFile = event.file.takeIf { shouldHandleFile(it) } ?: return@mapNotNull null
val oldFileName = event.oldValue as? String ?: return@mapNotNull null
val parentFile = renamedFile.parent ?: return@mapNotNull null

// Construct old and new URIs
val parentFile = file.parent ?: return@mapNotNull null
val oldUri = toUriString(parentFile)
val newUri = toUriString(file)
val oldUri = toUriString(parentFile)?.let { parentUri -> "$parentUri/$oldFileName" }
val newUri = toUriString(renamedFile)

Check warning on line 136 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#L136 

Added line #L136 was not covered by tests

FileRename().apply {
this.oldUri = oldUri
Expand Down
14 changes: 7 additions & 7 deletions ...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 @@ -393,8 +393,8 @@ class WorkspaceServiceHandlerTest {
val paramsSlot = slot<RenameFilesParams>()
verify { mockWorkspaceService.didRenameFiles(capture(paramsSlot)) }
with(paramsSlot.captured.files[0]) {
assertEquals(normalizeFileUri("file:///test/$oldName"), oldUri)
assertEquals(normalizeFileUri("file:///test/$newName"), newUri)
assertEquals(normalizeFileUri("file:///testDir/$oldName"), oldUri)
assertEquals(normalizeFileUri("file:///testDir/$newName"), newUri)
}
}

Expand Down Expand Up @@ -430,8 +430,8 @@ class WorkspaceServiceHandlerTest {
val paramsSlot = slot<RenameFilesParams>()
verify { mockWorkspaceService.didRenameFiles(capture(paramsSlot)) }
with(paramsSlot.captured.files[0]) {
assertEquals(normalizeFileUri("file:///test/oldDir"), oldUri)
assertEquals(normalizeFileUri("file:///test/newDir"), newUri)
assertEquals(normalizeFileUri("file:///testDir/oldDir"), oldUri)
assertEquals(normalizeFileUri("file:///testDir/newDir"), newUri)
}
}

Expand Down Expand Up @@ -648,10 +648,10 @@ class WorkspaceServiceHandlerTest {
newName: String,
isDirectory: Boolean = false,
): VFilePropertyChangeEvent {
val oldUri = URI("file:///test/$oldName")
val newUri = URI("file:///test/$newName")
val parent = createMockVirtualFile(URI("file:///testDir/"), "testDir", true)
val newUri = URI("file:///testDir/$newName")
val file = createMockVirtualFile(newUri, newName, isDirectory)
every { file.parent } returns createMockVirtualFile(oldUri, oldName, isDirectory)
every { file.parent } returns parent

return mockk<VFilePropertyChangeEvent>().apply {
every { propertyName } returns VirtualFile.PROP_NAME
Expand Down
Loading