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

Cody: Fix Inline Assist decorations #52322

Merged
merged 2 commits into from
May 23, 2023
Merged

Cody: Fix Inline Assist decorations #52322

merged 2 commits into from
May 23, 2023

Conversation

abeatrix
Copy link
Contributor

@abeatrix abeatrix commented May 23, 2023

Close: #52320

We are resetting the task ID when Cody replies before the replacement task is run, which led to the fixup replacement task unable to locate the Code Lens which handles the decorations using the task ID.

Solution: The task ID should only need to be reset after the fixup task has been completed, as it is only set when a fix up task is run.

Test plan

Tested locally:
image

image

The fix also pass the WIP e2e test in #52337

@cla-bot cla-bot bot added the cla-signed label May 23, 2023
@abeatrix abeatrix requested review from a team and philipp-spiess May 23, 2023 16:17
@sourcegraph-bot
Copy link
Contributor

📖 Storybook live preview

@abeatrix abeatrix merged commit 6193922 into main May 23, 2023
24 checks passed
@abeatrix abeatrix deleted the bee/cody-inline-fix branch May 23, 2023 21:49
ErikaRS pushed a commit that referenced this pull request Jun 22, 2023
Close: #52320

We are resetting the task ID when Cody replies before the replacement
task is run, which led to the fixup replacement task unable to locate
the Code Lens which handles the decorations using the task ID.

Solution: The task ID should only need to be reset after the fixup task
has been completed, as it is only set when a fix up task is run.

## Test plan

<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->

Tested locally:
<img width="1482" alt="image"
src="https://github.com/sourcegraph/sourcegraph/assets/68532117/78f18a64-83d1-4143-92d7-5c924dddaa18">

<img width="1438" alt="image"
src="https://github.com/sourcegraph/sourcegraph/assets/68532117/140b311b-dc76-4413-afb2-7887a4007e96">

The fix also pass the WIP e2e test in
#52337
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cody Bug: Inline Assist does not update decorations on replacement
3 participants