Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add editor.findMatchForeground #213497

Merged
merged 7 commits into from
May 27, 2024
Merged

Add editor.findMatchForeground #213497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ff811d
feature: make find decoration foreground color configurable
SimonSiefke May 26, 2024
4d98766
register color
SimonSiefke May 26, 2024
9751786
add css colors
SimonSiefke May 26, 2024
1465fc5
fix colors
SimonSiefke May 26, 2024
8378ff4
fix colors
SimonSiefke May 26, 2024
9024f46
remove unused code
SimonSiefke May 26, 2024
64afd4f
fix css formatting
SimonSiefke May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/lib/stylelint/vscode-known-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@
"--vscode-dropdown-listBackground",
"--vscode-editor-background",
"--vscode-editor-findMatchBackground",
"--vscode-editor-findMatchForeground",
"--vscode-editor-findMatchBorder",
"--vscode-editor-findMatchHighlightBackground",
"--vscode-editor-findMatchHighlightForeground",
"--vscode-editor-findMatchHighlightBorder",
"--vscode-editor-findRangeHighlightBackground",
"--vscode-editor-findRangeHighlightBorder",
Expand Down
2 changes: 2 additions & 0 deletions src/vs/editor/contrib/find/browser/findDecorations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ export class FindDecorations implements IDisposable {
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
zIndex: 13,
className: 'currentFindMatch',
inlineClassName: 'currentFindMatchInline',
showIfCollapsed: true,
overviewRuler: {
color: themeColorFromId(overviewRulerFindMatchForeground),
Expand All @@ -304,6 +305,7 @@ export class FindDecorations implements IDisposable {
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
zIndex: 10,
className: 'findMatch',
inlineClassName: 'findMatchInline',
showIfCollapsed: true,
overviewRuler: {
color: themeColorFromId(overviewRulerFindMatchForeground),
Expand Down
8 changes: 8 additions & 0 deletions src/vs/editor/contrib/find/browser/findWidget.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,21 @@
background-color: var(--vscode-editor-findMatchHighlightBackground);
}

.monaco-editor .findMatchInline {
color: var(--vscode-editor-findMatchHighlightForeground);
}

.monaco-editor .currentFindMatch {
background-color: var(--vscode-editor-findMatchBackground);
border: 2px solid var(--vscode-editor-findMatchBorder);
padding: 1px;
box-sizing: border-box;
}

.monaco-editor .currentFindMatchInline {
color: var(--vscode-editor-findMatchForeground);
}

.monaco-editor .findScope {
background-color: var(--vscode-editor-findRangeHighlightBackground);
}
Expand Down
8 changes: 8 additions & 0 deletions src/vs/platform/theme/common/colors/editorColors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,18 @@ export const editorFindMatch = registerColor('editor.findMatchBackground',
{ light: '#A8AC94', dark: '#515C6A', hcDark: null, hcLight: null },
nls.localize('editorFindMatch', "Color of the current search match."));

export const editorFindMatchForeground = registerColor('editor.findMatchForeground',
{ light: null, dark: null, hcDark: null, hcLight: null },
nls.localize('editorFindMatchForeground', "Text color of the current search match."));

export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground',
{ light: '#EA5C0055', dark: '#EA5C0055', hcDark: null, hcLight: null },
nls.localize('findMatchHighlight', "Color of the other search matches. The color must not be opaque so as not to hide underlying decorations."), true);

export const editorFindMatchHighlightForeground = registerColor('editor.findMatchHighlightForeground',
{ light: null, dark: null, hcDark: null, hcLight: null },
nls.localize('findMatchHighlightForeground', "Foreground color of the other search matches."), true);

export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground',
{ dark: '#3a3d4166', light: '#b4b4b44d', hcDark: null, hcLight: null },
nls.localize('findRangeHighlight', "Color of the range limiting the search. The color must not be opaque so as not to hide underlying decorations."), true);
Expand Down
Loading