Update the FixUp retry instruction text #1615
Conversation
| @@ -877,7 +877,7 @@ export class FixupController | |||
| return | |||
| } | |||
| const previousRange = task.selectionRange | |||
| const previousInstruction = task.instruction | |||
| const previousInstruction = task.instruction.replace(/^\/edit/, '') | |||
There was a problem hiding this comment.
| const previousInstruction = task.instruction.replace(/^\/edit/, '') | |
| const previousInstruction = task.instruction.replace(/^\/edit /, '') |
Good catch! I'm thinking maybe instead of the retry step, we should do this during the FixupTask creation step to make sure /edit is removed for all tasks, what do you think? @deepak2431 @toolmantim
There was a problem hiding this comment.
I'm not quite sure what the trade off is here, but trust your call @abeatrix!
There was a problem hiding this comment.
@abeatrix Agree with you, that would be good to do I think so.
There was a problem hiding this comment.
Oh woops I meant to tag Tom @umpox here, sorry @toolmantim lol
vscode/CHANGELOG.md
Outdated
| @@ -25,6 +25,7 @@ Starting from `0.2.0`, Cody is using `major.EVEN_NUMBER.patch` for release versi | |||
| - Commands: Commands selector in chat will now scroll to the selected item's viewport automatically. [pull/1556](https://github.com/sourcegraph/cody/pull/1556) | |||
| - Edit: Errors are now shown separately to incoming edits, and will not be applied to the document. [pull/1376](https://github.com/sourcegraph/cody/pull/1376) | |||
| - Chat: Prevent cursor from moving during chat command selection. [pull/1592](https://github.com/sourcegraph/cody/pull/1592) | |||
| - Fixup: Updated the retry instruction to just use the previous command text. [pull/1615](https://github.com/sourcegraph/cody/pull/1615) | |||
There was a problem hiding this comment.
We just made a patch release so you might want to move it up to the new empty section after merging with main 😁
There was a problem hiding this comment.
Haha, yeah saw it. I will update the changelog. No issues!
There was a problem hiding this comment.
Also, @abeatrix Please check your Discord.
| const fixupInstruction = instruction.replace(/^\/edit/, '').trim() | ||
| const task = new FixupTask(fixupFile, fixupInstruction, selectionRange, insertMode, source) |
There was a problem hiding this comment.
@deepak2431 Can we do this in the FixupTask constructor instead? Just so we don't accidentally miss this in future
constructor(
public readonly fixupFile: FixupFile,
public readonly instruction: string,
public selectionRange: vscode.Range,
// insert mode means insert replacement at selection, otherwise replace selection contents with replacement
public insertMode?: boolean,
// the source of the instruction, e.g. 'code-action', 'doc', etc
public source?: ChatEventSource
) {
this.id = Date.now().toString(36).replaceAll(/\d+/g, '')
this.instruction = instruction.replace(/^\/edit/, '').trim()
}
There was a problem hiding this comment.
@umpox Yeah, that will be even better. Let me make those changes.
|
Thanks! Left a small comment but looks good! |
|
@umpox Made the requested changes. I think it's all good now. |
vscode/CHANGELOG.md
Outdated
| @@ -19,6 +19,7 @@ Starting from `0.2.0`, Cody is using `major.EVEN_NUMBER.patch` for release versi | |||
| ### Fixed | |||
|
|
|||
| - Chat: Fixed an issue where multiple action buttons were appended to each Code Block per chat message. [pull/1617](https://github.com/sourcegraph/cody/pull/1617) | |||
| - Fixup: Updated the fixup create task to just use the previous command text. [pull/1615](https://github.com/sourcegraph/cody/pull/1615) | |||
There was a problem hiding this comment.
This is still showing up in the old version 😅
There was a problem hiding this comment.
I fixed it now. My bad 😅
The retry instruction text has the command attached, which recursively adds to each retry. This PR fixes this issue that in case of any fixup task, only the previous instruction is used/shown in the quick pick.
Test plan
Before behaviour:
REC-20231102230135.mp4
After:
REC-20231102230014.mp4