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.

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

fix: remove fixup ending tag #182

Merged
merged 4 commits into from
Jul 13, 2023
Merged

fix: remove fixup ending tag #182

merged 4 commits into from
Jul 13, 2023

Conversation

abeatrix
Copy link
Contributor

@abeatrix abeatrix commented Jul 12, 2023

Close #114

This is a quick temporary fix for the issue where fixup replacement contains </selection> tag at the end:
image

This fix is served as a temporary fix as Dom's PR #70 to improve the multiplexer should fix this issue properly.
Adding this line of code however, could use as a fallback in the future and should not break anything before and after Dom's PR:
image

Also added error handling to surface error messages during the inline fixup step.

Notes

Looks like the issue was a regression from sourcegraph/sourcegraph#54665 as this issue does not exist when switching to the previous version (0.4.2). As the response is now being streamed to Inline Chat, caused the result to be sent to the multiplexer before the turn is marked as completed.

Test Plan

  1. Start Cody from this branch
  2. Perform a Inline Fixup
  3. Check if the fixup result includes the </selection> at the end

@abeatrix abeatrix requested a review from a team July 12, 2023 20:27
Copy link

@chrispine chrispine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this fix! I don't know enough about the code to feel confident to approve it, but I did have a few comments.

lib/shared/src/chat/recipes/helpers.ts Outdated Show resolved Hide resolved
vscode/CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

@st0nebreaker st0nebreaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Groovy! LGTM

@abeatrix abeatrix merged commit 3067d3e into main Jul 13, 2023
4 checks passed
@abeatrix abeatrix deleted the bee/fixup-tag branch July 13, 2023 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: All Fixups ends with /selection tag
3 participants