-
Notifications
You must be signed in to change notification settings - Fork 30.6k
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
Equal lines in merge editor files are not aligned vertically #165900
Labels
bug
Issue identified by VS Code Team member as probable bug
insiders-released
Patch has been released in VS Code Insiders
merge-editor
verified
Verification succeeded
Milestone
Comments
Hi |
I can still reproduce in today's Insiders with the steps:
Kapture.2022-12-05.at.14.40.46.mp4 |
Today, folding always causes misalignments. We could fix this by disabling folding for now in the code editors in the merge editor. |
hediet
added a commit
that referenced
this issue
May 12, 2023
hediet
added a commit
that referenced
this issue
May 12, 2023
a90120411
added a commit
to a90120411/vscode
that referenced
this issue
May 14, 2023
* main: (1973 commits) Navigate chat codeblocks with a keyboard shortcuut (microsoft#182361) Select entire value when showing with an existing query (microsoft#182348) Add codeblock actions to command palette, and some keybindings (microsoft#182349) Fix disappearing chat response (microsoft#182347) add f20-f24 event key codes (microsoft#182202) First attempt at a quick question UI (microsoft#182337) rm excl fix name Fixes microsoft#165900 by disabling the folding controller in the merge editor (microsoft#182328) Update src/vs/workbench/contrib/interactiveSession/browser/interactiveSessionInputPart.ts Update src/vs/workbench/contrib/interactiveSession/browser/actions/interactiveSessionActions.ts re-add deleted line rm unused import reorganize things revert unnecessary change fix alias interactiveSessionInput -> chatInput Mark suggest setting as experimental Handle snapshot in all cell executions (microsoft#182336) Migrate more uses of Workspace/User storage (microsoft#182332) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
bug
Issue identified by VS Code Team member as probable bug
insiders-released
Patch has been released in VS Code Insiders
merge-editor
verified
Verification succeeded
I have configured the setting
"editor.foldingImportsByDefault": true
The text was updated successfully, but these errors were encountered: