Skip to content

Add secondary overview ruler colors for staged changes #249711

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

Copilot
Copy link

@Copilot Copilot AI commented May 24, 2025

Overview

This PR adds secondary foreground colors for diff decorations in the editor overview ruler for staged changes, matching the existing functionality available for the editor gutter.

Problem

Currently, users can customize the appearance of staged changes in the editor gutter using the following color theme settings:

  • editorGutter.addedBackground and editorGutter.addedSecondaryBackground
  • editorGutter.modifiedBackground and editorGutter.modifiedSecondaryBackground
  • editorGutter.deletedBackground and editorGutter.deletedSecondaryBackground

However, there are no equivalent "secondary" colors for the overview ruler, which limits the ability to visually distinguish between regular and staged changes in the overview ruler.

Solution

Added three new color theme settings:

  • editorOverviewRuler.addedSecondaryForeground
  • editorOverviewRuler.modifiedSecondaryForeground
  • editorOverviewRuler.deletedSecondaryForeground

These new color settings follow the same pattern as the existing secondary gutter colors, using appropriate transparency and color derivations to maintain visual consistency.

Implementation Details

  • Kept changes minimal: only added color registration code with no behavior changes
  • Used the same color derivation logic as the existing secondary gutter colors
  • Added appropriate descriptions to make the purpose of each color clear

Fixes #249561.

Warning

Firewall rules blocked me from connecting to one or more addresses

I tried to connect to the following addresses, but was blocked by firewall rules:

  • electronjs.org
    • Triggering command: node-gyp (dns block)
  • playwright-akamai.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)
  • playwright-verizon.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)
  • playwright.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)

If you need me to access, download, or install something from one of these locations, you can either:


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

@Copilot Copilot AI changed the title [WIP] Expose editor overview ruler colors for diff decorations for staged changes Add secondary overview ruler colors for staged changes May 24, 2025
@Copilot Copilot AI requested a review from lszomoru May 24, 2025 11:57
Copilot finished work on behalf of lszomoru May 24, 2025 11:57
@lszomoru
Copy link
Member

@copilot, color registration looks good, but now you need to use these newly registered colors.

Copy link
Author

Copilot AI commented May 24, 2025

@copilot, color registration looks good, but now you need to use these newly registered colors.

I've updated the code to use the newly registered secondary colors in the overview ruler. Modified the QuickDiffDecorator class to create separate decoration options for secondary decorations that use the secondary foreground colors (ab377ec).

Warning

Firewall rules blocked me from connecting to one or more addresses

I tried to connect to the following addresses, but was blocked by firewall rules:

  • electronjs.org
    • Triggering command: node-gyp (dns block)
  • playwright-akamai.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)
  • playwright-verizon.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)
  • playwright.azureedge.net
    • Triggering command: /usr/local/bin/node /home/REDACTED/work/vscode/vscode/node_modules/playwright-core/lib/server/registry/oopDownloadBrowserMain.js (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Copilot finished work on behalf of lszomoru May 24, 2025 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SCM - Expose editor overview ruler colors for diff decorations for staged changes
2 participants