Skip to content

fix(amazonq): Files.move will throw if src / dest are in different volumes #5733

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 19, 2025
Merged

fix(amazonq): Files.move will throw if src / dest are in different volumes #5733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6205628
Java Files.move will throw if src and destination are in different vo…
Will-ShaoHua May 19, 2025
bd89d6b
Update plugins/amazonq/shared/jetbrains-community/src/software/aws/to…
Will-ShaoHua May 19, 2025
27ff920
detekt
Will-ShaoHua May 19, 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: 3 additions & 1 deletion ...-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.io.DigestUtil
import com.intellij.util.system.CpuArch
import org.apache.commons.io.FileUtils
import software.aws.toolkits.core.utils.ZIP_PROPERTY_POSIX
import software.aws.toolkits.core.utils.createParentDirectories
import software.aws.toolkits.core.utils.exists
Expand Down Expand Up @@ -68,7 +69,8 @@ fun getSubFolders(basePath: Path): List<Path> = try {
fun moveFilesFromSourceToDestination(sourceDir: Path, targetDir: Path) {
try {
Files.createDirectories(targetDir.parent)
Files.move(sourceDir, targetDir, StandardCopyOption.REPLACE_EXISTING)
// NIO move does not work when copying across mount points (i.e. /tmp is on tmpfs)
FileUtils.moveDirectory(sourceDir.toFile(), targetDir.toFile())
} catch (e: Exception) {
throw IllegalStateException("Failed to move files from $sourceDir to $targetDir", e)
}
Expand Down
Loading