Skip to content

Commit

Permalink
Add minimap.errorHighlight and minimap.warningHighlight theme colors, #…
Browse files Browse the repository at this point in the history
  • Loading branch information
Rachel Macfarlane committed Dec 2, 2019
1 parent 888c06f commit 573df43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/vs/editor/common/services/markerDecorationsServiceImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDeco
import { Schemas } from 'vs/base/common/network';
import { Emitter, Event } from 'vs/base/common/event';
import { withUndefinedAsNull } from 'vs/base/common/types';
import { minimapWarning, minimapError } from 'vs/platform/theme/common/colorRegistry';

function MODEL_ID(resource: URI): string {
return resource.toString();
Expand Down Expand Up @@ -205,7 +206,7 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
color = themeColorFromId(overviewRulerWarning);
zIndex = 20;
minimap = {
color,
color: themeColorFromId(minimapWarning),
position: MinimapPosition.Inline
};
break;
Expand All @@ -220,7 +221,7 @@ export class MarkerDecorationsService extends Disposable implements IMarkerDecor
color = themeColorFromId(overviewRulerError);
zIndex = 30;
minimap = {
color,
color: themeColorFromId(minimapError),
position: MinimapPosition.Inline
};
break;
Expand Down
2 changes: 2 additions & 0 deletions src/vs/platform/theme/common/colorRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,8 @@ export const overviewRulerSelectionHighlightForeground = registerColor('editorOv

export const minimapFindMatch = registerColor('minimap.findMatchHighlight', { light: '#d18616', dark: '#d18616', hc: '#AB5A00' }, nls.localize('minimapFindMatchHighlight', 'Minimap marker color for find matches.'), true);
export const minimapSelection = registerColor('minimap.selectionHighlight', { light: '#ADD6FF', dark: '#264F78', hc: '#ffffff' }, nls.localize('minimapSelectionHighlight', 'Minimap marker color for the editor selection.'), true);
export const minimapError = registerColor('minimap.errorHighlight', { dark: new Color(new RGBA(255, 18, 18, 0.7)), light: new Color(new RGBA(255, 18, 18, 0.7)), hc: new Color(new RGBA(255, 50, 50, 1)) }, nls.localize('minimapError', 'Minimap marker color for errors.'));
export const minimapWarning = registerColor('minimap.warningHighlight', { dark: editorWarningForeground, light: editorWarningForeground, hc: editorWarningBorder }, nls.localize('overviewRuleWarning', 'Minimap marker color for warnings.'));

export const problemsErrorIconForeground = registerColor('problemsErrorIcon.foreground', { dark: editorErrorForeground, light: editorErrorForeground, hc: editorErrorForeground }, nls.localize('problemsErrorIconForeground', "The color used for the problems error icon."));
export const problemsWarningIconForeground = registerColor('problemsWarningIcon.foreground', { dark: editorWarningForeground, light: editorWarningForeground, hc: editorWarningForeground }, nls.localize('problemsWarningIconForeground', "The color used for the problems warning icon."));
Expand Down

0 comments on commit 573df43

Please sign in to comment.