diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
index beb97dd70d544..ef963fea47371 100644
--- a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
+++ b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
@@ -5,7 +5,7 @@
@font-face {
font-family: "codicon";
- src: url("./codicon.ttf?72bd9e6bbf1e48287bcb9a9e4babeb28") format("truetype");
+ src: url("./codicon.ttf?b035097bd976825411d2c57142be0530") format("truetype");
}
.codicon[class*='codicon-'] {
@@ -69,6 +69,9 @@
.codicon-eye-watch:before { content: "\ea70" }
.codicon-circle-filled:before { content: "\ea71" }
.codicon-primitive-dot:before { content: "\ea71" }
+.codicon-debug-breakpoint:before { content: "\ea71" }
+.codicon-debug-breakpoint-disabled:before { content: "\ea71" }
+.codicon-debug-hint:before { content: "\ea71" }
.codicon-primitive-square:before { content: "\ea72" }
.codicon-edit:before { content: "\ea73" }
.codicon-pencil:before { content: "\ea73" }
@@ -162,12 +165,15 @@
.codicon-bold:before { content: "\eaa3" }
.codicon-book:before { content: "\eaa4" }
.codicon-bookmark:before { content: "\eaa5" }
-.codicon-breakpoint-conditional-unverified:before { content: "\eaa6" }
-.codicon-breakpoint-conditional:before { content: "\eaa7" }
-.codicon-breakpoint-data-unverified:before { content: "\eaa8" }
-.codicon-breakpoint-data:before { content: "\eaa9" }
-.codicon-breakpoint-log-unverified:before { content: "\eaaa" }
-.codicon-breakpoint-log:before { content: "\eaab" }
+.codicon-debug-breakpoint-conditional-unverified:before { content: "\eaa6" }
+.codicon-debug-breakpoint-conditional:before { content: "\eaa7" }
+.codicon-debug-breakpoint-conditional-disabled:before { content: "\eaa7" }
+.codicon-debug-breakpoint-data-unverified:before { content: "\eaa8" }
+.codicon-debug-breakpoint-data:before { content: "\eaa9" }
+.codicon-debug-breakpoint-data-disabled:before { content: "\eaa9" }
+.codicon-debug-breakpoint-log-unverified:before { content: "\eaaa" }
+.codicon-debug-breakpoint-log:before { content: "\eaab" }
+.codicon-debug-breakpoint-log-disabled:before { content: "\eaab" }
.codicon-briefcase:before { content: "\eaac" }
.codicon-broadcast:before { content: "\eaad" }
.codicon-browser:before { content: "\eaae" }
@@ -185,6 +191,7 @@
.codicon-chrome-minimize:before { content: "\eaba" }
.codicon-chrome-restore:before { content: "\eabb" }
.codicon-circle-outline:before { content: "\eabc" }
+.codicon-debug-breakpoint-unverified:before { content: "\eabc" }
.codicon-circle-slash:before { content: "\eabd" }
.codicon-circuit-board:before { content: "\eabe" }
.codicon-clear-all:before { content: "\eabf" }
@@ -198,8 +205,6 @@
.codicon-comment-discussion:before { content: "\eac7" }
.codicon-compare-changes:before { content: "\eac8" }
.codicon-credit-card:before { content: "\eac9" }
-.codicon-current-and-breakpoint:before { content: "\eaca" }
-.codicon-current:before { content: "\eacb" }
.codicon-dash:before { content: "\eacc" }
.codicon-dashboard:before { content: "\eacd" }
.codicon-database:before { content: "\eace" }
@@ -387,3 +392,12 @@
.codicon-list-selection:before { content: "\eb85" }
.codicon-selection:before { content: "\eb85" }
.codicon-list-tree:before { content: "\eb86" }
+.codicon-debug-breakpoint-function-unverified:before { content: "\eb87" }
+.codicon-debug-breakpoint-function:before { content: "\eb88" }
+.codicon-debug-breakpoint-function-disabled:before { content: "\eb88" }
+.codicon-debug-breakpoint-stackframe-active:before { content: "\eb89" }
+.codicon-debug-breakpoint-stackframe-dot:before { content: "\eb8a" }
+.codicon-debug-breakpoint-stackframe:before { content: "\eb8b" }
+.codicon-debug-breakpoint-stackframe-focused:before { content: "\eb8b" }
+.codicon-debug-breakpoint-unsupported:before { content: "\eb8c" }
+.codicon-debug-step-back:before { content: "\f101" }
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf
index d39e8ad92fd52..e2d73d87e70f6 100644
Binary files a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf and b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf differ
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 5eb01d0c5d7f7..83e72ebd51bb2 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -1089,7 +1089,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
private createTouchBarGroupSegments(items: ISerializableCommandAction[] = []): ITouchBarSegment[] {
const segments: ITouchBarSegment[] = items.map(item => {
let icon: NativeImage | undefined;
- if (item.iconLocation && item.iconLocation.dark.scheme === 'file') {
+ if (item.iconLocation && item.iconLocation?.dark?.scheme === 'file') {
icon = nativeImage.createFromPath(URI.revive(item.iconLocation.dark).fsPath);
if (icon.isEmpty()) {
icon = undefined;
diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 494b7d7ca233e..0cdd9c61cc2ed 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -177,7 +177,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
output[lineIndex] = '';
} else {
output[lineIndex] = (
- '
{
if (this.label) {
- removeClasses(this.label, 'icon', iconClass);
+ removeClasses(this.label, 'codicon', iconClass);
}
});
}
+
+ }
+
+ // icon path
+ else if (item.iconLocation) {
+ let iconClass: string;
+
+ if (item.iconLocation?.dark?.scheme) {
+
+ const iconPathMapKey = item.iconLocation.dark.toString();
+
+ if (MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
+ iconClass = MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
+ } else {
+ iconClass = ids.nextId();
+ createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(item.iconLocation.light || item.iconLocation.dark)}`);
+ createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(item.iconLocation.dark)}`);
+ MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
+ }
+
+ if (this.label) {
+
+ addClasses(this.label, 'icon', iconClass);
+ this._itemClassDispose.value = toDisposable(() => {
+ if (this.label) {
+ removeClasses(this.label, 'icon', iconClass);
+ }
+ });
+ }
+
+ }
+
+
+
}
}
}
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 2cea44d858941..cc7b367fd5dac 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -22,7 +22,8 @@ export interface ICommandAction {
id: string;
title: string | ILocalizedString;
category?: string | ILocalizedString;
- iconLocation?: { dark: URI; light?: URI; };
+ iconClassName?: string;
+ iconLocation?: { dark?: URI; light?: URI; };
precondition?: ContextKeyExpr;
toggled?: ContextKeyExpr;
}
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
index e0a2e8c8c1d47..736d91a7d0ce2 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
@@ -43,7 +43,7 @@ interface IBreakpointDecoration {
}
const breakpointHelperDecoration: IModelDecorationOptions = {
- glyphMarginClassName: 'debug-breakpoint-hint',
+ glyphMarginClassName: 'codicon-debug-hint',
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
};
@@ -91,7 +91,7 @@ function getBreakpointDecorationOptions(model: ITextModel, breakpoint: IBreakpoi
}
return {
- glyphMarginClassName: className,
+ glyphMarginClassName: `${className}`,
glyphMarginHoverMessage,
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
beforeContentClassName: breakpoint.column ? `debug-breakpoint-placeholder` : undefined,
@@ -344,7 +344,7 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
const decorations = this.editor.getLineDecorations(line);
if (decorations) {
for (const { options } of decorations) {
- if (options.glyphMarginClassName && options.glyphMarginClassName.indexOf('debug') === -1) {
+ if (options.glyphMarginClassName && options.glyphMarginClassName.indexOf('codicon-') === -1) {
return false;
}
}
@@ -422,7 +422,7 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
// Candidate decoration has a breakpoint attached when a breakpoint is already at that location and we did not yet set a decoration there
// In practice this happens for the first breakpoint that was set on a line
// We could have also rendered this first decoration as part of desiredBreakpointDecorations however at that moment we have no location information
- const cssClass = candidate.breakpoint ? getBreakpointMessageAndClassName(this.debugService, candidate.breakpoint).className : 'debug-breakpoint-disabled';
+ const cssClass = candidate.breakpoint ? getBreakpointMessageAndClassName(this.debugService, candidate.breakpoint).className : 'codicon-debug-breakpoint-disabled';
const contextMenuActions = () => this.getContextMenuActions(candidate.breakpoint ? [candidate.breakpoint] : [], activeCodeEditor.getModel().uri, candidate.range.startLineNumber, candidate.range.startColumn);
const inlineWidget = new InlineBreakpointWidget(activeCodeEditor, decorationId, cssClass, candidate.breakpoint, this.debugService, this.contextMenuService, contextMenuActions);
@@ -543,6 +543,7 @@ class InlineBreakpointWidget implements IContentWidget, IDisposable {
private create(cssClass: string | null | undefined): void {
this.domNode = $('.inline-breakpoint-widget');
+ this.domNode.classList.add('codicon');
if (cssClass) {
this.domNode.classList.add(cssClass);
}
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index aad8c7e6944a2..a23fddadbb61a 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -346,7 +346,7 @@ class BreakpointsRenderer implements IListRenderer
(WorkbenchExtensions.Workbench).regi
// Debug toolbar
-const registerDebugToolBarItem = (id: string, title: string, iconLightUri: URI, iconDarkUri: URI, order: number, when?: ContextKeyExpr, precondition?: ContextKeyExpr) => {
+const registerDebugToolBarItem = (id: string, title: string, order: number, iconClassName?: string, iconLightUri?: URI, iconDarkUri?: URI, when?: ContextKeyExpr, precondition?: ContextKeyExpr) => {
MenuRegistry.appendMenuItem(MenuId.DebugToolBar, {
group: 'navigation',
when,
@@ -286,6 +285,7 @@ const registerDebugToolBarItem = (id: string, title: string, iconLightUri: URI,
command: {
id,
title,
+ iconClassName,
iconLocation: {
light: iconLightUri,
dark: iconDarkUri
@@ -295,16 +295,16 @@ const registerDebugToolBarItem = (id: string, title: string, iconLightUri: URI,
});
};
-registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/continue-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/continue-dark.svg')), 10, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/pause-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/pause-dark.svg')), 10, CONTEXT_DEBUG_STATE.notEqualsTo('stopped'));
-registerDebugToolBarItem(STOP_ID, STOP_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/stop-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/stop-dark.svg')), 70, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
-registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/disconnect-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/disconnect-dark.svg')), 70, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
-registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-over-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-over-dark.svg')), 20, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-into-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-into-dark.svg')), 30, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-out-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-out-dark.svg')), 40, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/restart-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/restart-dark.svg')), 60);
-registerDebugToolBarItem(STEP_BACK_ID, nls.localize('stepBackDebug', "Step Back"), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-back-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/step-back-dark.svg')), 50, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, nls.localize('reverseContinue', "Reverse"), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/reverse-continue-light.svg')), URI.parse(registerAndGetAmdImageURL('vs/workbench/contrib/debug/browser/media/reverse-continue-dark.svg')), 60, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, 'codicon-debug-continue', undefined, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, 'codicon-debug-pause', undefined, undefined, CONTEXT_DEBUG_STATE.notEqualsTo('stopped'));
+registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, 'codicon-debug-stop', undefined, undefined, CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated());
+registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, 70, 'codicon-debug-disconnect', undefined, undefined, CONTEXT_FOCUSED_SESSION_IS_ATTACH);
+registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, 'codicon-debug-step-over', undefined, undefined, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, 'codicon-debug-step-into', undefined, undefined, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, 'codicon-debug-step-out', undefined, undefined, undefined, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, 'codicon-debug-restart', undefined, undefined);
+registerDebugToolBarItem(STEP_BACK_ID, nls.localize('stepBackDebug', "Step Back"), 50, 'codicon-debug-step-back', undefined, undefined, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, nls.localize('reverseContinue', "Reverse"), 60, 'codicon-debug-continue', undefined, undefined, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
// Debug callstack context menu
const registerDebugCallstackItem = (id: string, title: string, order: number, when?: ContextKeyExpr, precondition?: ContextKeyExpr, group = 'navigation') => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts b/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts
index d102042652bf4..ee78a18990e3f 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts
@@ -128,12 +128,12 @@ export class DebugCallStackContribution implements IWorkbenchContribution {
static readonly STICKINESS = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
// we need a separate decoration for glyph margin, since we do not want it on each line of a multi line statement.
private static TOP_STACK_FRAME_MARGIN: IModelDecorationOptions = {
- glyphMarginClassName: 'debug-top-stack-frame',
+ glyphMarginClassName: 'codicon-debug-breakpoint-stackframe',
stickiness
};
private static FOCUSED_STACK_FRAME_MARGIN: IModelDecorationOptions = {
- glyphMarginClassName: 'debug-focused-stack-frame',
+ glyphMarginClassName: 'codicon-debug-breakpoint-stackframe-focused',
stickiness
};
@@ -176,7 +176,68 @@ registerThemingParticipant((theme, collector) => {
if (focusedStackFrame) {
collector.addRule(`.monaco-editor .view-overlays .debug-focused-stack-frame-line { background: ${focusedStackFrame}; }`);
}
+
+ const debugIconBreakpointColor = theme.getColor(debugIconBreakpointForeground);
+ if (debugIconBreakpointColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-debug-breakpoint,
+ .monaco-workbench .codicon-debug-breakpoint-conditional,
+ .monaco-workbench .codicon-debug-breakpoint-log,
+ .monaco-workbench .codicon-debug-breakpoint-function,
+ .monaco-workbench .codicon-debug-breakpoint-data,
+ .monaco-workbench .codicon-debug-breakpoint-unsupported,
+ .monaco-workbench .codicon-debug-hint:not(*[class*='codicon-debug-breakpoint']) ,
+ .monaco-workbench .codicon-debug-breakpoint-stackframe-dot,
+ .monaco-workbench .codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
+ color: ${debugIconBreakpointColor} !important;
+ }
+ `);
+ }
+
+ const debugIconBreakpointDisabledColor = theme.getColor(debugIconBreakpointDisabledForeground);
+ if (debugIconBreakpointDisabledColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon[class*='-disabled'] {
+ color: ${debugIconBreakpointDisabledColor} !important;
+ }
+ `);
+ }
+
+ const debugIconBreakpointUnverifiedColor = theme.getColor(debugIconBreakpointUnverifiedForeground);
+ if (debugIconBreakpointUnverifiedColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon[class*='-unverified'] {
+ color: ${debugIconBreakpointUnverifiedColor} !important;
+ }
+ `);
+ }
+
+ const debugIconBreakpointStackframeColor = theme.getColor(debugIconBreakpointStackframeForeground);
+ if (debugIconBreakpointStackframeColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-debug-breakpoint-stackframe,
+ .monaco-workbench .codicon-debug-breakpoint-stackframe-dot::after {
+ color: ${debugIconBreakpointStackframeColor} !important;
+ }
+ `);
+ }
+
+ const debugIconBreakpointStackframeFocusedColor = theme.getColor(debugIconBreakpointStackframeFocusedForeground);
+ if (debugIconBreakpointStackframeFocusedColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-debug-breakpoint-stackframe-focused {
+ color: ${debugIconBreakpointStackframeFocusedColor} !important;
+ }
+ `);
+ }
+
});
const topStackFrameColor = registerColor('editor.stackFrameHighlightBackground', { dark: '#ffff0033', light: '#ffff6673', hc: '#fff600' }, localize('topStackFrameLineHighlight', 'Background color for the highlight of line at the top stack frame position.'));
const focusedStackFrameColor = registerColor('editor.focusedStackFrameHighlightBackground', { dark: '#7abd7a4d', light: '#cee7ce73', hc: '#cee7ce' }, localize('focusedStackFrameLineHighlight', 'Background color for the highlight of line at focused stack frame position.'));
+
+const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hc: '#E51400' }, localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
+const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hc: '#848484' }, localize('debugIcon.breakpointDisabledForeground', 'Icon color for disabled breakpoints.'));
+const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hc: '#848484' }, localize('debugIcon.breakpointUnverifiedForeground', 'Icon color for unverified breakpoints.'));
+const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', { dark: '#FFCC00', light: '#FFCC00', hc: '#FFCC00' }, localize('debugIcon.breakpointStackframeForeground', 'Icon color for breakpoints.'));
+const debugIconBreakpointStackframeFocusedForeground = registerColor('debugIcon.breakpointStackframeFocusedForeground', { dark: '#89D185', light: '#89D185', hc: '#89D185' }, localize('debugIcon.breakpointStackframeFocusedForeground', 'Icon color for breakpoints.'));
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 76e38f1bab209..e939c92fd6725 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -102,6 +102,12 @@ export const debugIconContinueForeground = registerColor('debugIcon.continueFore
hc: '#75BEFF'
}, localize('debugIcon.continueForeground', "Debug toolbar icon for continue."));
+export const debugIconStepBackForeground = registerColor('debugIcon.stepBackForeground', {
+ dark: '#75BEFF',
+ light: '#007ACC',
+ hc: '#75BEFF'
+}, localize('debugIcon.stepBackForeground', "Debug toolbar icon for step back."));
+
export class DebugToolBar extends Themable implements IWorkbenchContribution {
private $el: HTMLElement;
@@ -393,4 +399,9 @@ registerThemingParticipant((theme, collector) => {
if (debugIconContinueColor) {
collector.addRule(`.monaco-workbench .codicon-debug-continue { color: ${debugIconContinueColor} !important; }`);
}
+
+ const debugIconStepBackColor = theme.getColor(debugIconStepBackForeground);
+ if (debugIconStepBackColor) {
+ collector.addRule(`.monaco-workbench .codicon-debug-step-back { color: ${debugIconStepBackColor} !important; }`);
+ }
});
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-conditional.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-conditional.svg
deleted file mode 100644
index 382507ebcdf4c..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-conditional.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-disabled.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-disabled.svg
deleted file mode 100644
index a2c8c3417e503..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-disabled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-unverified.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-unverified.svg
deleted file mode 100644
index 96dda92ee3822..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data-unverified.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-data.svg
deleted file mode 100644
index 6752b060aeb62..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-data.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-disabled.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-disabled.svg
deleted file mode 100644
index 84588f8eac598..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-disabled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-disabled.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-disabled.svg
deleted file mode 100644
index cd71f6e462e2d..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-disabled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-unverified.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-unverified.svg
deleted file mode 100644
index 9e2354d67bd9d..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function-unverified.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-function.svg
deleted file mode 100644
index f25e57ffde942..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-function.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-hint.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-hint.svg
deleted file mode 100644
index d622c6cf0c4b5..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-hint.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-disabled.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-disabled.svg
deleted file mode 100644
index ea246058e0f6a..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-disabled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-unverified.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-unverified.svg
deleted file mode 100644
index ae8ed0ba7b696..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log-unverified.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-log.svg
deleted file mode 100644
index fc72afc7e2b3e..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-log.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-unsupported.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-unsupported.svg
deleted file mode 100644
index 624b9f60c80da..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-unsupported.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint-unverified.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint-unverified.svg
deleted file mode 100644
index 0f39b8b7c8f06..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint-unverified.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpoint.svg b/src/vs/workbench/contrib/debug/browser/media/breakpoint.svg
deleted file mode 100644
index af02a87495033..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/breakpoint.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/continue-dark.svg b/src/vs/workbench/contrib/debug/browser/media/continue-dark.svg
deleted file mode 100644
index 7c58386cccc63..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/continue-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/continue-light.svg b/src/vs/workbench/contrib/debug/browser/media/continue-light.svg
deleted file mode 100644
index 7c58386cccc63..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/continue-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/current-and-breakpoint.svg b/src/vs/workbench/contrib/debug/browser/media/current-and-breakpoint.svg
deleted file mode 100644
index 17d71fddac9df..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/current-and-breakpoint.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/current-arrow.svg b/src/vs/workbench/contrib/debug/browser/media/current-arrow.svg
deleted file mode 100644
index 85f288efcd3ee..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/current-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
index fd184092abdc8..b712940078246 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
@@ -3,45 +3,35 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-/* Activity Bar */
-.monaco-editor .debug-top-stack-frame-column::before {
- background: url('current-arrow.svg') center center no-repeat;
-}
-
-.debug-breakpoint-hint {
- background: url('breakpoint-hint.svg') center center no-repeat;
+.codicon-debug-hint {
cursor: pointer;
}
-.debug-breakpoint-disabled,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-disabled {
- background: url('breakpoint-disabled.svg') center center no-repeat;
+.codicon-debug-hint:not(*[class*='codicon-debug-breakpoint']) {
+ opacity: .4 !important;
}
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-disabled:hover {
- background: url('breakpoint-hint.svg') center center no-repeat;
+/* overlapped icons */
+.inline-breakpoint-widget.codicon-debug-breakpoint-stackframe-dot::after {
+ position: absolute;
+ top: 0;
+ left: 0;
}
-.monaco-editor .inline-breakpoint-widget.line-start {
- left: -0.45em !important;
+.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
+ position: absolute;
}
-.debug-breakpoint-unverified,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-unverified {
- background: url('breakpoint-unverified.svg') center center no-repeat;
+.inline-breakpoint-widget.codicon-debug-breakpoint-stackframe-dot::after {
+ content: "\eb8b";
}
-.monaco-editor .debug-top-stack-frame {
- background: url('current-arrow.svg') center center no-repeat;
+.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
+ content: "\eb8a";
}
-.monaco-editor .debug-focused-stack-frame {
- background: url('stackframe-arrow.svg') center center no-repeat;
-}
-
-.debug-breakpoint,
-.monaco-editor .inline-breakpoint-widget {
- background: url('breakpoint.svg') center center no-repeat;
+.monaco-editor .inline-breakpoint-widget.line-start {
+ left: -0.45em !important;
}
.monaco-editor .debug-breakpoint-placeholder::before,
@@ -70,67 +60,6 @@
cursor: pointer;
}
-.debug-function-breakpoint {
- background: url('breakpoint-function.svg') center center no-repeat;
-}
-
-.debug-function-breakpoint-unverified {
- background: url('breakpoint-function-unverified.svg') center center no-repeat;
-}
-
-.debug-function-breakpoint-disabled {
- background: url('breakpoint-function-disabled.svg') center center no-repeat;
-}
-
-.debug-data-breakpoint {
- background: url('breakpoint-data.svg') center center no-repeat;
-}
-
-.debug-data-breakpoint-unverified {
- background: url('breakpoint-data-unverified.svg') center center no-repeat;
-}
-
-.debug-data-breakpoint-disabled {
- background: url('breakpoint-data-disabled.svg') center center no-repeat;
-}
-
-.debug-breakpoint-conditional,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-conditional {
- background: url('breakpoint-conditional.svg') center center no-repeat;
-}
-
-.debug-breakpoint-log,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-log {
- background: url('breakpoint-log.svg') center center no-repeat;
-}
-
-.debug-breakpoint-log-disabled,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-log-disabled {
- background: url('breakpoint-log-disabled.svg') center center no-repeat;
-}
-
-.debug-breakpoint-log-unverified,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-log-unverified {
- background: url('breakpoint-log-unverified.svg') center center no-repeat;
-}
-
-.debug-breakpoint-unsupported,
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-unsupported {
- background: url('breakpoint-unsupported.svg') center center no-repeat;
-}
-
-.monaco-editor .debug-top-stack-frame.debug-breakpoint-and-top-stack-frame,
-.monaco-editor .debug-breakpoint.debug-top-stack-frame,
-.monaco-editor .debug-breakpoint-and-top-stack-frame-at-column {
- background: url('current-and-breakpoint.svg') center center no-repeat;
-}
-
-.monaco-editor .debug-focused-stack-frame.debug-breakpoint,
-.monaco-editor .debug-focused-stack-frame.debug-breakpoint-conditional,
-.monaco-editor .debug-focused-stack-frame.debug-breakpoint-log {
- background: url('stackframe-and-breakpoint.svg') center center no-repeat;
-}
-
/* Error editor */
.debug-error-editor:focus {
outline: none !important;
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
index a0a76da7ec1d9..4ac6feef4802d 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugToolBar.css
@@ -43,4 +43,7 @@
background-size: 16px;
background-position: center center;
background-repeat: no-repeat;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index 9847a8b1d06ac..185b8187d413a 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -78,6 +78,10 @@
color: #666;
}
+.debug-viewlet .monaco-list:focus .monaco-list-row.selected.focused .codicon {
+ color: inherit !important;
+}
+
.debug-viewlet .disabled {
opacity: 0.35;
}
@@ -333,10 +337,17 @@
flex-shrink: 0;
}
-.debug-viewlet .debug-breakpoints .breakpoint > .icon {
+.debug-viewlet .debug-breakpoints .breakpoint > .codicon {
width: 19px;
height: 19px;
min-width: 19px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.debug-viewlet .debug-breakpoints .breakpoint > .codicon-debug-breakpoint-stackframe-dot::before {
+ content: "\ea71";
}
.debug-viewlet .debug-breakpoints .breakpoint > .file-path {
diff --git a/src/vs/workbench/contrib/debug/browser/media/disconnect-dark.svg b/src/vs/workbench/contrib/debug/browser/media/disconnect-dark.svg
deleted file mode 100644
index 71aae0dd887fc..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/disconnect-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/disconnect-light.svg b/src/vs/workbench/contrib/debug/browser/media/disconnect-light.svg
deleted file mode 100644
index 06fc4c31553ed..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/disconnect-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/pause-dark.svg b/src/vs/workbench/contrib/debug/browser/media/pause-dark.svg
deleted file mode 100644
index 9cd9f46613072..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/pause-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/pause-light.svg b/src/vs/workbench/contrib/debug/browser/media/pause-light.svg
deleted file mode 100644
index 01d3cbc290ce6..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/pause-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/restart-dark.svg b/src/vs/workbench/contrib/debug/browser/media/restart-dark.svg
deleted file mode 100644
index fc48916d5a647..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/restart-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/restart-light.svg b/src/vs/workbench/contrib/debug/browser/media/restart-light.svg
deleted file mode 100644
index 4964d5bfaf19e..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/restart-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/reverse-continue-dark.svg b/src/vs/workbench/contrib/debug/browser/media/reverse-continue-dark.svg
deleted file mode 100644
index e0bbfb4202e36..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/reverse-continue-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/reverse-continue-light.svg b/src/vs/workbench/contrib/debug/browser/media/reverse-continue-light.svg
deleted file mode 100644
index e0bbfb4202e36..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/reverse-continue-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/stackframe-and-breakpoint.svg b/src/vs/workbench/contrib/debug/browser/media/stackframe-and-breakpoint.svg
deleted file mode 100644
index 3ce31c822c74b..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/stackframe-and-breakpoint.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/stackframe-arrow.svg b/src/vs/workbench/contrib/debug/browser/media/stackframe-arrow.svg
deleted file mode 100644
index 38b63a34c5371..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/stackframe-arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-back-dark.svg b/src/vs/workbench/contrib/debug/browser/media/step-back-dark.svg
deleted file mode 100644
index 5a6ada3e113f0..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-back-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-back-light.svg b/src/vs/workbench/contrib/debug/browser/media/step-back-light.svg
deleted file mode 100644
index b5a994d42525a..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-back-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-into-dark.svg b/src/vs/workbench/contrib/debug/browser/media/step-into-dark.svg
deleted file mode 100644
index 570ae02aafa4f..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-into-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-into-light.svg b/src/vs/workbench/contrib/debug/browser/media/step-into-light.svg
deleted file mode 100644
index 55c47062f5c4a..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-into-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-out-dark.svg b/src/vs/workbench/contrib/debug/browser/media/step-out-dark.svg
deleted file mode 100644
index 33a7a2fdb7281..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-out-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-out-light.svg b/src/vs/workbench/contrib/debug/browser/media/step-out-light.svg
deleted file mode 100644
index 6ac2139659d46..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-out-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-over-dark.svg b/src/vs/workbench/contrib/debug/browser/media/step-over-dark.svg
deleted file mode 100644
index 5bf10674eecdd..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-over-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/step-over-light.svg b/src/vs/workbench/contrib/debug/browser/media/step-over-light.svg
deleted file mode 100644
index b874a2564b5e5..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/step-over-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/stop-dark.svg b/src/vs/workbench/contrib/debug/browser/media/stop-dark.svg
deleted file mode 100644
index 9a28f77a9f970..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/stop-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/debug/browser/media/stop-light.svg b/src/vs/workbench/contrib/debug/browser/media/stop-light.svg
deleted file mode 100644
index 9a28f77a9f970..0000000000000
--- a/src/vs/workbench/contrib/debug/browser/media/stop-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
index 8c115cdd91220..6f07908168a6a 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
@@ -212,6 +212,7 @@
.extensions-viewlet > .extensions .extension > .details > .header-container > .header .codicon {
font-size: 120%;
margin-right: 2px;
+ -webkit-mask: inherit;
}
.extensions-viewlet > .extensions .extension > .details > .header-container > .header > .ratings {
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 37cd450349d7c..75fbbbc3a3a47 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -1375,7 +1375,7 @@ export class TestElectronService implements IElectronService {
async setRepresentedFilename(path: string): Promise { }
async setDocumentEdited(edited: boolean): Promise { }
async openExternal(url: string): Promise { return false; }
- async updateTouchBar(items: { id: string; title: string | { value: string; original: string; }; category?: string | { value: string; original: string; } | undefined; iconLocation?: { dark: UriComponents; light?: { readonly scheme: string; readonly authority: string; readonly path: string; readonly query: string; readonly fragment: string; readonly fsPath: string; with: {}; toString: {}; toJSON: {}; } | undefined; } | undefined; precondition?: { getType: {}; equals: {}; evaluate: {}; serialize: {}; keys: {}; map: {}; negate: {}; } | undefined; toggled?: { getType: {}; equals: {}; evaluate: {}; serialize: {}; keys: {}; map: {}; negate: {}; } | undefined; }[][]): Promise { }
+ async updateTouchBar(items: { id: string; title: string | { value: string; original: string; }; category?: string | { value: string; original: string; } | undefined; iconLocation?: { dark?: UriComponents; light?: { readonly scheme: string; readonly authority: string; readonly path: string; readonly query: string; readonly fragment: string; readonly fsPath: string; with: {}; toString: {}; toJSON: {}; } | undefined; } | undefined; precondition?: { getType: {}; equals: {}; evaluate: {}; serialize: {}; keys: {}; map: {}; negate: {}; } | undefined; toggled?: { getType: {}; equals: {}; evaluate: {}; serialize: {}; keys: {}; map: {}; negate: {}; } | undefined; }[][]): Promise { }
async newWindowTab(): Promise { }
async showPreviousWindowTab(): Promise { }
async showNextWindowTab(): Promise { }
diff --git a/test/automation/src/debug.ts b/test/automation/src/debug.ts
index 2dc548e5cb32f..4739d8a991798 100644
--- a/test/automation/src/debug.ts
+++ b/test/automation/src/debug.ts
@@ -19,7 +19,7 @@ const STEP_IN = `.debug-toolbar .action-label[title*="Step Into"]`;
const STEP_OUT = `.debug-toolbar .action-label[title*="Step Out"]`;
const CONTINUE = `.debug-toolbar .action-label[title*="Continue"]`;
const GLYPH_AREA = '.margin-view-overlays>:nth-child';
-const BREAKPOINT_GLYPH = '.debug-breakpoint';
+const BREAKPOINT_GLYPH = '.codicon-debug-breakpoint';
const PAUSE = `.debug-toolbar .action-label[title*="Pause"]`;
const DEBUG_STATUS_BAR = `.statusbar.debugging`;
const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;