Skip to content
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

Jump to bottom

Paused inline chat resumes with wrong "diff" #202164

Closed
jrieken opened this issue Jan 10, 2024 · 1 comment · Fixed by #202317
Closed

Paused inline chat resumes with wrong "diff" #202164

jrieken opened this issue Jan 10, 2024 · 1 comment · Fixed by #202317
Assignees
@jrieken
Labels
bug Issue identified by VS Code Team member as probable bug inline-chat insiders-released Patch has been released in VS Code Insiders verified Verification succeeded
Milestone
December / Januar...

Comments

@jrieken
Copy link
Member

jrieken commented Jan 10, 2024

  • open the same file in two editor columns
  • start inline chat
  • get AI changes
  • in column A switch to another file
  • in column B makes changes to the original file (w/o overlap of the AI chnages)
  • in column A switch back
  • the UI suggests that all edits (yours and AIs) are AI edits
@jrieken jrieken self-assigned this Jan 10, 2024
@jrieken jrieken added bug Issue identified by VS Code Team member as probable bug inline-chat labels Jan 10, 2024
@jrieken jrieken added this to the December / January 2024 milestone Jan 10, 2024
@jrieken jrieken mentioned this issue Jan 12, 2024
Merged
jrieken added a commit that referenced this issue Jan 12, 2024
@jrieken
fix #202164 (#202317)
b0abf66 
* remove start-method from strategies

* rename - activeSession to session

* keep strategy alive when pausing session, let strategy participate in pause, allow to call LiveStrategy#renderChanges repeatedly without recomputing hunks

* reset diff toggled state

* make sure to reset hunk display on done (dipose, accept, discard)

* reset diff state in pause, not hide function
@vscodenpa vscodenpa added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Jan 12, 2024
@eleanorjboyd eleanorjboyd added the verified Verification succeeded label Jan 25, 2024
@eleanorjboyd
Copy link
Member

really appreciate that after this step "in column B makes changes to the original file (w/o overlap of the AI chnages)" I accidentally saved the file and it jumped me to the other editor with the AI suggestion and required them to be resolved before I could finish saving. Great flow for that complicated edge case!!

@aiday-mar aiday-mar added this to the December / January 2024 milestone Feb 6, 2024
@microsoft microsoft locked and limited conversation to collaborators Jun 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@jrieken jrieken

Labels
bug Issue identified by VS Code Team member as probable bug inline-chat insiders-released Patch has been released in VS Code Insiders verified Verification succeeded
Projects
None yet
Milestone
December / January 2024
Development

Successfully merging a pull request may close this issue.

fix https://github.com/microsoft/vscode/issues/202164 microsoft/vscode
4 participants
@jrieken @eleanorjboyd @aiday-mar @vscodenpa