Highlight VS Code merge editor improvements 1.71 (August 2022 Update)
Although August is a popular holiday month for Visual Studio Code engineers, the development team managed to squeeze in a bunch of new features in the regular monthly update, bringing the lightweight code editor , open source and cross-platform to v1.71. .
Topping this list of new features are several enhancements to VS Code’s three-way merge editor for resolving merge conflicts, allowing developers to see current, incoming, and final merge results.
In last month’s update, the team announced the new ability for developers to use command line options to bring up the merge editor in the code editor, allowing them to, for example, set some configurations to use VS Code as a merge tool for Git. .
In this update, they made several other improvements:
- Opening the merge editor from files with conflicts: A file with a conflict will now automatically show an “Open in Merge Editor” button to transition between text and merge editors.
- Merge editor file not modified when opened: “VS Code no longer modifies the result file when opening it in the merge editor (conflicting regions have been replaced with base). Instead, conflict markers remain in the file but are hidden in the results view. The checkboxes can be used to replace the conflict marker with either side, a combination of both sides, or, by unchecking them, with the base.”
- Restoration of decorators from old conflicts: “The old inline conflict decorators are no longer disabled, so the merge editor and the inline experience can be used together. When the merge editor opens, you can get the previous experience d ‘a single click in the editor toolbar.
- Checkbox improvements: Conflict checkboxes are now visible by default, even for conflicts that are too large for the viewport, with colors highlighting the checkboxes for unhandled conflicts.
- Different algorithm improvements: While exploring alternative differencing algorithms to improve conflict quality, the team added a new experimental differencing algorithm. Although not yet optimized for performance, it can improve the Merge Editor experience in many edge cases.
“In this release, we focused on the most important UX issues in the Fusion Editor and fixed many bugs,” the team said. “If you still find yourself confused by the new merge editor, we’d love to hear from you! Please create a new issue in our repository, share a screenshot and the status of your merge editor (using the Copy merge editor state in JSON format ordered). We really appreciate all the feedback we’ve received so far, and further feedback will help us make the Fusion Editor experience great for everyone.”
Here’s what else is new in the update, as the team highlighted in a September 1 post, with links for more details.
- Extensive codec support — To help display embedded audio and video in notebooks and webviews: The FFmpeg shared library that ships with VS Code previously only supported the
FLACcodec, but now supports many other codecs and containers, allowing more audio and video to be played from laptops or extensions that embed audio and video in web views.
- Selection to rename file — Pressing F2 selects the filename, entire name, or file extension: “After initiating a rename action on a file, pressing the F2 key will cycle through the filename, entire selection, and file extension to allow keyboard interaction only more flexible.”
- New Code Action UI — Quickly find the code action you’re looking for: In a redesign of the code action control, developers can now find a needed code action with a new custom control instead of just being presented with a simple pop-up menu. code actions.
- Terminal Updates — Shell integration for fish and Git Bash, new smooth scrolling: improvements include:
- Fishshell integration is available as an experimental manual installation only. See the Shell Integration documentation for how to install it.
- The Git bash integration for the Windows shell is only available as an experimental manual install. See the manual installation section for more details.
- Support for common alternative common working directory sequences:
OSC 6 ; scheme://
ST, OSC 1337 ; CurrentDir= ST, OSC 9 ; 9 ; ST
- Better handling of various peripheral shell integration cases.
- Jupyter notebook image collage – Paste and preview image files into Notepad Markdown cells: Users of the popular VS Code Jupyter extension (44 million installs) can now paste screenshots or image files into Markdown cells inside notebooks, with only the currently supported image/png mime type.
- TypeScript Live Streaming — Watch TS’s “Crash Course” or “Tips & Tricks” on YouTube: Developers who missed the VS Code live streams on TypeScript can now watch these two recent sessions with Matt Pocock: TypeScript crash course and TypeScript tips and tricks.
- Live Preview Extension — Live Preview now supports multi-root web projects: “The Live Preview extension now officially supports multi-root workspaces! Although users have technically been able to use live preview in workspaces multi-root workspace previously, there is now a cleaner implementation that supports it.The Live Preview extension now starts a new server for each root in your multi-root workspace, so links relative to the root of your project (those that start with a
/) will work correctly when previewing multi-root workspaces.”