From 6bac4340f37fcefc8def4dd336b73db1fa7bde8b Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 30 Mar 2017 11:51:43 +0200 Subject: [PATCH] [theme] rename peek view match color names (for #23464) --- .../theme-abyss/themes/abyss-color-theme.json | 2 +- .../themes/quietlight-color-theme.json | 4 ++-- .../themes/solarized-dark-color-theme.json | 2 +- .../browser/referencesWidget.ts | 20 +++++++++---------- .../electron-browser/themeCompatibility.ts | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json index d0ebd375d22..cd0a2e2fe80 100644 --- a/extensions/theme-abyss/themes/abyss-color-theme.json +++ b/extensions/theme-abyss/themes/abyss-color-theme.json @@ -272,7 +272,7 @@ "editorPeekEditorBackground": "#001F33", "editorPeekTitleBackground": "#060621", "editorPeekBorders": "#7777cc", - "editorPeekReferenceHighlight": "#ddbb5555", + "editorPeekEditorMatchHighlight": "#ddbb5555", "editorLineNumbers": "#406385", "editorMarkerNavigationBackground": "#060621", diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json index 34a3df39599..0fe52ac0594 100644 --- a/extensions/theme-quietlight/themes/quietlight-color-theme.json +++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json @@ -467,11 +467,11 @@ "inputBackground": "#F5F5F5", "editorFindMatch": "#BF9CAC", "editorFindMatchHighlight": "#edc9d8", - "editorPeekReferenceHighlight": "#C2DFE3", + "editorPeekEditorMatchHighlight": "#C2DFE3", "editorPeekTitleBackground": "#F2F8FC", "editorPeekEditorBackground": "#F2F8FC", "editorPeekResultsBackground": "#F2F8FC", - "editorPeekFindMatchHighlight": "#93C6D6", + "editorPeekResultsMatchHighlight": "#93C6D6", "activityBadgeBackground": "#705697" } } \ No newline at end of file diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json index fef7afdc4df..a59df2775f5 100644 --- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json +++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json @@ -327,7 +327,7 @@ "editorPeekResultsBackground": "#00212B", "editorPeekTitleBackground": "#00212B", - "editorPeekReferenceHighlight": "#7744AA40", + "editorPeekEditorMatchHighlight": "#7744AA40", "editorHoverBackground": "#004052" } } \ No newline at end of file diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts index a0571734483..5ddaa81ac19 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts @@ -780,23 +780,23 @@ export const editorPeekTitle = registerColor('editorPeekTitle', { dark: '#FFFFFF export const editorPeekTitleInfo = registerColor('editorPeekTitleInfo', { dark: '#ccccccb3', light: '#6c6c6cb3', hc: '#FFFFFF99' }, nls.localize('editorPeekTitleInfo', 'Editor peek view title info color')); export const editorPeekBorders = registerColor('editorPeekBorders', { dark: '#007acc', light: '#007acc', hc: '#6FC3DF' }, nls.localize('editorPeekBorders', 'Editor peek view borders')); -export const editorPeekResultsBackground = registerColor('editorPeekResultsBackground', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('editorPeekResultsBackground', 'List background in the editor peek view')); -export const editorPeekResultsMatchForeground = registerColor('editorPeekResultsMatchForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('editorPeekResultsMatchForeground', 'Match entry foreground in the editor peek view')); -export const editorPeekResultsFileForeground = registerColor('editorPeekResultsFileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('editorPeekResultsFileForeground', 'File entry foreground in the editor peek view')); -export const editorPeekResultsSelectedBackground = registerColor('editorPeekResultsSelectedBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('editorPeekResultsSelectedBackground', 'Selected entry background in the editor peek view')); -export const editorPeekResultsSelectedForeground = registerColor('editorPeekResultsSelectedForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('editorPeekResultsSelectedForeground', 'Selected entry foreground in the editor peek view')); -export const editorPeekEditorBackground = registerColor('editorPeekEditorBackground', { dark: '#001F33', light: '#F2F8FC', hc: '#0C141F' }, nls.localize('editorPeekEditorBackground', 'Editor background in the editor peek view')); +export const editorPeekResultsBackground = registerColor('editorPeekResultsBackground', { dark: '#252526', light: '#F3F3F3', hc: Color.black }, nls.localize('editorPeekResultsBackground', 'Background color of the peek view result list')); +export const editorPeekResultsMatchForeground = registerColor('editorPeekResultsMatchForeground', { dark: '#bbbbbb', light: '#646465', hc: Color.white }, nls.localize('editorPeekResultsMatchForeground', 'Match entry foreground in the peek view result list')); +export const editorPeekResultsFileForeground = registerColor('editorPeekResultsFileForeground', { dark: Color.white, light: '#1E1E1E', hc: Color.white }, nls.localize('editorPeekResultsFileForeground', 'File entry foreground in the peek view result list')); +export const editorPeekResultsSelectedBackground = registerColor('editorPeekResultsSelectedBackground', { dark: '#3399ff33', light: '#3399ff33', hc: null }, nls.localize('editorPeekResultsSelectedBackground', 'Selected entry background in the peek view result list')); +export const editorPeekResultsSelectedForeground = registerColor('editorPeekResultsSelectedForeground', { dark: Color.white, light: '#6C6C6C', hc: Color.white }, nls.localize('editorPeekResultsSelectedForeground', 'Selected entry foreground in the peek view result list')); +export const editorPeekEditorBackground = registerColor('editorPeekEditorBackground', { dark: '#001F33', light: '#F2F8FC', hc: '#0C141F' }, nls.localize('editorPeekEditorBackground', 'Background color of the peek view editor')); -export const editorPeekFindMatchHighlight = registerColor('editorPeekFindMatchHighlight', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('editorPeekFindMatchHighlight', 'Match highlight color in the peek view matches list')); -export const editorPeekReferenceHighlight = registerColor('editorPeekReferenceHighlight', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('editorPeekReferenceHighlight', 'Match highlight color in the peek view editor')); +export const editorPeekResultsMatchHighlight = registerColor('editorPeekResultsMatchHighlight', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('editorPeekResultsMatchHighlight', 'Match highlight color in the peek view result list')); +export const editorPeekEditorMatchHighlight = registerColor('editorPeekEditorMatchHighlight', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('editorPeekEditorMatchHighlight', 'Match highlight color in the peek view editor')); registerThemingParticipant((theme, collector) => { - let findMatchHighlightColor = theme.getColor(editorPeekFindMatchHighlight); + let findMatchHighlightColor = theme.getColor(editorPeekResultsMatchHighlight); if (findMatchHighlightColor) { collector.addRule(`.monaco-editor.${theme.selector} .reference-zone-widget .ref-tree .referenceMatch { background-color: ${findMatchHighlightColor}; }`); } - let referenceHighlightColor = theme.getColor(editorPeekReferenceHighlight); + let referenceHighlightColor = theme.getColor(editorPeekEditorMatchHighlight); if (referenceHighlightColor) { collector.addRule(`.monaco-editor.${theme.selector} .reference-zone-widget .preview .reference-decoration { background-color: ${referenceHighlightColor}; }`); } diff --git a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts index 4df5bed17ed..9532fc5294f 100644 --- a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts +++ b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts @@ -11,7 +11,7 @@ import * as editorColorRegistry from 'vs/editor/common/view/editorColorRegistry' import * as wordHighlighter from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; import { ansiColorIdentifiers } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry'; import { editorHoverHighlight } from 'vs/editor/contrib/hover/browser/hover'; -import { editorPeekReferenceHighlight, editorPeekFindMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget'; +import { editorPeekEditorMatchHighlight, editorPeekResultsMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget'; const settingToColorIdMapping: { [settingId: string]: string[] } = {}; function addSettingMapping(settingId: string, colorId: string) { @@ -61,8 +61,8 @@ addSettingMapping('linkForeground', colorRegistry.editorLinkForeground); addSettingMapping('wordHighlight', wordHighlighter.editorWordHighlight); addSettingMapping('wordHighlightStrong', wordHighlighter.editorWordHighlightStrong); addSettingMapping('findRangeHighlight', colorRegistry.editorFindRangeHighlight); -addSettingMapping('findMatchHighlight', editorPeekFindMatchHighlight); -addSettingMapping('referenceHighlight', editorPeekReferenceHighlight); +addSettingMapping('findMatchHighlight', editorPeekResultsMatchHighlight); +addSettingMapping('referenceHighlight', editorPeekEditorMatchHighlight); addSettingMapping('lineHighlight', editorColorRegistry.editorLineHighlight); addSettingMapping('rangeHighlight', editorColorRegistry.editorRangeHighlight); addSettingMapping('caret', editorColorRegistry.editorCursor);