some merge fixes

This commit is contained in:
Will Li 2025-07-11 15:56:33 -07:00
parent 7b77d80a73
commit 63c7c7c230
2 changed files with 5 additions and 1 deletions

View file

@ -530,6 +530,8 @@ describe("webviewMessageHandler - message dialog preferences", () => {
type: "showEditMessageDialog",
messageTs: 123456789,
text: "edited content",
hasCheckpoint: false,
images: undefined,
})
})
})

View file

@ -189,7 +189,7 @@ export const webviewMessageHandler = async (
/**
* Handles message editing operations with user confirmation
*/
const handleEditOperation = async (messageTs: number, editedContent: string): Promise<void> => {
const handleEditOperation = async (messageTs: number, editedContent: string, images?: string[]): Promise<void> => {
// Always check if the message has a checkpoint first
const currentCline = provider.getCurrentCline()
let hasCheckpoint = false
@ -232,6 +232,7 @@ export const webviewMessageHandler = async (
messageTs,
text: editedContent,
hasCheckpoint,
images,
})
} else {
// Send message to webview to show edit confirmation dialog
@ -240,6 +241,7 @@ export const webviewMessageHandler = async (
messageTs,
text: editedContent,
hasCheckpoint,
images,
})
}
}