pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-21 12:51:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use globalStorage instead of temp dir for editing files; re-order file operations to fix windows lock error

Browse Source
This commit is contained in:
Saoud Rizwan
2024-09-03 18:16:18 -04:00
parent c209198b23
commit b7a06f0a7e
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ClaudeDev.ts
View File

@@ -814,10 +814,20 @@ export class ClaudeDev {
// Create a temporary file with the new content
const fileName = path.basename(absolutePath)
const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "claude-dev-"))
const globalStoragePath = this.providerRef.deref()?.context.globalStorageUri.fsPath
if (!globalStoragePath) {
throw new Error("Global storage uri is invalid")
}
const tempDir = path.join(globalStoragePath, "temp")
await fs.mkdir(tempDir, { recursive: true })
const tempFilePath = path.join(tempDir, fileName)
await fs.writeFile(tempFilePath, newContent)
// const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "claude-dev-"))
// const tempFilePath = path.join(tempDir, fileName)
// await fs.writeFile(tempFilePath, newContent)
// await vscode.workspace.fs.writeFile(vscode.Uri.file(tempFilePath), Buffer.from(newContent))
vscode.commands.executeCommand(
"vscode.diff",
vscode.Uri.parse(`claude-dev-diff:${fileName}`).with({
@@ -872,12 +882,7 @@ export class ClaudeDev {
if (response !== "yesButtonTapped") {
await this.closeDiffViews()
// Clean up the temporary file
try {
await fs.rm(tempDir, { recursive: true, force: true })
} catch (error) {
// deleting temp file failed (seems to happen on some windows machines), which is okay since system will clean it up anyways
console.error(`Error deleting temporary directory: ${error}`)
}
await fs.rm(tempDir, { recursive: true, force: true })
if (response === "messageResponse") {
await this.say("user_feedback", text, images)
return this.formatIntoToolResponse(await this.formatGenericToolFeedback(text), images)
@@ -885,6 +890,8 @@ export class ClaudeDev {
return "The user denied this operation."
}
await this.closeDiffViews()
// Read the potentially edited content from the temp file
const editedContent = await fs.readFile(tempFilePath, "utf-8")
if (!fileExists) {
@@ -892,16 +899,11 @@ export class ClaudeDev {
}
await fs.writeFile(absolutePath, editedContent)
// Clean up the temporary file
try {
await fs.rm(tempDir, { recursive: true, force: true })
} catch (error) {
console.error(`Error deleting temporary directory: ${error}`)
}
// Finish by opening the edited file in the editor
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), { preview: false })
await this.closeDiffViews()
// Clean up the temporary file
await fs.rm(tempDir, { recursive: true, force: true })
if (editedContent !== newContent) {
const diffResult = diff.createPatch(relPath, originalContent, editedContent)
@@ -944,14 +946,10 @@ export class ClaudeDev {
const tabs = vscode.window.tabGroups.all
.map((tg) => tg.tabs)
.flat()
.filter((tab) => {
if (tab.input instanceof vscode.TabInputTextDiff) {
const originalPath = (tab.input.original as vscode.Uri).toString()
const modifiedPath = (tab.input.modified as vscode.Uri).toString()
return originalPath.includes("claude-dev-") || modifiedPath.includes("claude-dev-")
}
return false
})
.filter(
(tab) =>
tab.input instanceof vscode.TabInputTextDiff && tab.input?.original?.scheme === "claude-dev-diff"
)
for (const tab of tabs) {
await vscode.window.tabGroups.close(tab)