feat(auto-edit): Support unified diff and refactor diff format #7000
Conversation
umpox
force-pushed
the
tr/image-unified-diff
branch
from
bbe228c to
6082a72
Compare
umpox
force-pushed
the
tr/image-unified-diff
branch
from
6082a72 to
84951e4
Compare
umpox
force-pushed
the
tr/image-unified-diff
branch
2 times, most recently
from
9339e00 to
663cab5
Compare
umpox
force-pushed
the
tr/image-unified-diff
branch
from
663cab5 to
247f27b
Compare
umpox
changed the title
vscode/src/autoedits/renderer/image-gen/highlight/highlight-decorations.ts
Show resolved
Hide resolved
vscode/src/autoedits/renderer/image-gen/decorated-diff/types.ts
Outdated
Show resolved
Hide resolved
| // TODO: Log these errors, useful to see if we run into issues where we're not correctly | ||
| // initializing the canvas | ||
| throw new Error('Canvas not initialized') |
There was a problem hiding this comment.
We should figure out why Sentry error reporting isn't working right now. It'd be helpful to check if this issue occurs on users' machines.
| syntaxHighlights.push({ | ||
| range: [startPos, endPos], | ||
| color: token.color || DEFAULT_HIGHLIGHT_COLORS[theme], | ||
| }) |
There was a problem hiding this comment.
The contrast on the light theme seems a bit low. Might be because I'm used to a higher-contrast color theme.
It's a bit better for the dark theme:
There was a problem hiding this comment.
Yeah, it looks much better with the Monokai Dimmed dark theme:
There was a problem hiding this comment.
It's tricky because, the background image of the suggestion comes from your theme, but the syntax highlighting is hardcoded to a specific dark/light theme.
Some of the options we have:
-
Use a hardcoded background color for light/dark themes. I think we do this for chat right now. Solves the issue with a highlighting mismatch, but maybe becomes a visual annoyance in the users editor.
-
Find some way to get the users' theme colours. There's no built-in way that VS Code provides to do this, but maybe we could read the file system and the users settings to extract theme data.
|
@sourcegraph review |
![sourcegraph-review-agent-eap[bot]](https://avatars.githubusercontent.com/in/1118858?s=60&v=4){kind=small}
There was a problem hiding this comment.
@olafurpg Looking good! I've reviewed the code and found no issues to report.
|
many thanks bot |
https://linear.app/sourcegraph/issue/CODY-4921/auto-edit-support-unified-diff-format-for-image-generations
AutoEditUnifiedDiff.mov
Description
This PR:
DecorationInfoinstead ofAddedLinesDecorationInfo. This means we can easily port this to the inline decorator in a follow up PR.DecorationInfoand supporting deletions here adds a lot of checks/edge cases.Test plan
unifiedandadditionsmodes enabled