Welcome to Visual Studio Code 6 Monthly update ！ The main highlights of this update are as follows ：

▌3 way merge editor

In this version , We continue to develop 3 way merge editor. It can be done by putting git.mergeEditor Set to true To enable this feature , And will be enabled by default in future versions . The merge editor allows you to quickly resolve Git Merger conflict . When enabled , You can open the merge editor by clicking on the conflict file in the source control view . Check boxes can be used to accept and combine Theirs or Yours Changes in ：

All language functions are provided in the merge editor （ Including diagnosis 、 Breakpoints and tests ）, You can get immediate feedback about any problems in the merged results , The results can also be edited directly . Notice how the check box updates as expected ：

When closing the merge editor or accepting a merge , If all conflicts are not resolved , Warning will be displayed . The merge editor supports word level merge . No matter when , You can also resolve conflicts manually .

▌Command Center

Command Center Now you can try . adopt window.commandCenter Set enable it . The command center replaces the normal title bar , You can quickly search the files in the project . single click main section To display a quick open drop-down menu with your recent files and search box .

There is also a button on the right , It can be done by “？” Show quick access options . On the left is Go Back and Go Forward Button , For browsing your editor history .

▌“ Do not disturb. ” Pattern

new “ Do not disturb. ” Mode hides all non error notification pop ups when enabled . The progress notification will be automatically displayed in the status bar . Hidden notifications can still be viewed in the notification Center .

You can open the notification Center （ Select the bell icon on the right side of the status bar ） And click the slash bell icon to switch “ Do not disturb. ” Pattern .

▌Shell integration

since 1 It has been in preview status since its release in August PowerShell、bash and zsh Of Shell Integration has now stopped previewing ！ We plan to 1.70 It is enabled by default in version . To enable the shell Integration features , Please check Terminal > Integrated > Shell Integration : Enable in the settings editor or settings.json Set the value of ：

"terminal.integrated.shellIntegration.enabled": true

Shell Integration allowed VS Code To learn more about Shell What happened inside , To enable more functions .Shell One of the goals of integration is to enable it to work with zero configuration . This is achieved by using shell Parameters and / Or the environment variable will automatically shell Integration script “ Inject ” To shell In conversation . In some cases this does not work , for example ： stay sub-shells Or some complicated shell Setting up , But we also provide manual installation routes for those more advanced situations .

• Shell integration Summary of functions provided

▌Decorations

Before several iterations , We added decorations, This is due to Shell integration function , To improve terminal navigation .Decorations Now also mark the task points of interest, You can use the command navigation function （Ctrl/Cmd+Up、Ctrl/Cmd+Down） Jump to . To start the / Stop task , Next to the start of the task, a decoration, And according to the running exit code （ If there is ） Make style settings .

▌ by Git Repository add Commit " Operate the button "

stay 1.61 In the version , by Git The repository adds publishing and synchronizing changes “ Operate the button ”. In this milestone , We added a Commit Button , This button has a main operation and a set of auxiliary operations . have access to git.postCommitCommand Set control auxiliary operation , It also allows you to push or synchronize after submission .

add to Commit“ Operate the button ” after , There is a new setting git.showActionButton, You can use it to control the Git Operate the button . You can still use general scm.showActionButton Set the visibility of any action button to be disabled globally .

▌Step Into Target UI Optimize

Some debuggers allow direct access to specific function calls when a line is paused . In this iteration , We have improved UI：

• Right click the target area on the source row and select Step Into Target Will automatically enter the target area （ If any ）

• Command Palette There is a new command in Debug: Step Into Target You can use , Shortcut keys are Ctrl+F11

• more Debugging Related optimization

This update also has a blockbuster release

VS Code Server (private preview)

stay VS Code in , We hope you can seamlessly use the environment that makes your work more efficient .VS Code Remote development extension （VS Code Remote Development extensions） Allows you to Windows Subsystem for Linux （WSL)、 adopt SSH The remote computer , And directly from VS Code Work in the development container . These extensions install servers in remote environments , Allow local VS Code Interact smoothly with remote source code and runtime .

We now offer independent “VS Code Server” Of private preview , It is a service built on the same underlying server used by remote extensions , And some additional functions , for example ： Interactive CLI And promote and vscode.dev Security connection for , No need SSH Connect .

Our ultimate goal is no matter where your project is stored , Can enhance the code you use CLI, To open VS Code The desktop and Web example . We are working hard for this ,VS Code Server Is a great milestone , We hope to get your feedback ！

• VS Code Remote development extension

• The Visual Studio Code Server

​ Focus on Microsoft China MSDN Learn more about

Click on Read the original blog ​​​​​​​~