Test: SCM - diff decoration for staged changes

[lszomoru]

Refs: #60389

• anyOS Joe Binder (@binderjoe)
• anyOS Alex Ross (@alexr00)

Complexity: 3

Create Issue

---

This milestone we have addressed a long time feature request to display diff decorations in the editor gutter for changes that have been staged.

Prerequisites

• Install the latest VS Code Insiders release
• Ensure that the following settings have their default values:
  • scm.diffDecorations
  • scm.diffDecorationsGutterAction
  • scm.diffDecorationsGutterVisibility
  • scm.diffDecorationsIgnoreTrimWhitespace

Stage/unstage changes

• Launch VS Code Insiders
• Open a folder/workspace that contains a git repository
• Open a file and make some changes to it: add some lines, editor some lines and delete some lines
  • Confirm that the editor decorations for the changes appear as expected
• Click on each decoration and invoke the "Stage Change" from the peak view toolbar
  • Confirm that the editor decorations for the staged changes appear as expected (lighter/darker) depending on the theme
• Click on each decoration and invoke the "Unstage Change" from the peak view toolbar
  • Confirm that the editor decorations for the changes appear as expected

Stage/unstage selected ranges

• Launch VS Code Insiders
• Open a folder/workspace that contains a git repository
• Open a file and make some changes to it: add some lines, editor some lines and delete some lines
• Select each range and invoke the "Git: Stage Selected Ranges" command from the command palette
  • Confirm that the selection gets staged as expected and the decoration color changes
• Select each range and invoke the "Git: Unstage Selected Ranges" command from the command palette
  • Confirm that the selection gets unstaged as expected and the decoration color changes
• Select only part of the changed lines and see if the commands are working as expected
• Select a range that does not contain any changes and see if the commands are working as expected

[daniel-pg-hwit]

So is this why VSCode is unusable for me now? How do I disable the diff decoration for staged changes? I only want to see unstaged changes.

[daniel-pg-hwit]

Found it! According to the Release Notes 1.100.1:

Quick diff decorations for staged changes
To address a long-time feature request, this milestone we have added quick diff editor decorations for staged changes. Now you can view your staged changes directly from the editor, without needing to open the Source Control view.

You can customize the color of the staged changes quick diff decorations by using the following theme tokens: editorGutter.addedSecondaryBackground, editorGutter.modifiedSecondaryBackground, editorGutter.deletedSecondaryBackground.

If you do not want to see quick diff decorations for staged changes, you can hide them by using the Diff Decorations submenu that is available in the editor gutter context menu.

I did not see this Diff Decorations submenu nor was it clear to me what this "gutter context menu" is or how to find it. Also, there is no corresponding option in the Settings page. This is how you disable this annoying feature:

1. Right click on the line numbers sidebar located to the left, NOT on the diff decoration / color strip thingy.
2. Uncheck this option: Diff Decorations -> Git Local Changes (Index)