maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update breakpoints to codicons

Browse source
This commit is contained in:
Miguel Solorio 2019-11-08 14:43:12 -08:00
parent 59ba1190b4
commit 6b43b2cb5e
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
View file

@ -177,7 +177,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
output[lineIndex] = '';
} else {
output[lineIndex] = (
'<div class="cgmr '
'<div class="cgmr codicon '
+ classNames.join(' ')
+ common
);

8
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
View file

@ -638,7 +638,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
if (!breakpoint.enabled || !debugService.getModel().areBreakpointsActivated()) {
return {
className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-disabled' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-disabled' : breakpoint.logMessage ? 'debug-breakpoint-log-disabled' : 'debug-breakpoint-disabled',
className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-disabled' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-disabled' : breakpoint.logMessage ? 'codicon-breakpoint-log-disabled' : 'codicon-breakpoint-disabled',
message: breakpoint.logMessage ? nls.localize('disabledLogpoint', "Disabled Logpoint") : nls.localize('disabledBreakpoint', "Disabled Breakpoint"),
};
}
@ -648,7 +648,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
};
if (debugActive && !breakpoint.verified) {
return {
className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-unverified' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-unverified' : breakpoint.logMessage ? 'debug-breakpoint-log-unverified' : 'debug-breakpoint-unverified',
className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-unverified' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-unverified' : breakpoint.logMessage ? 'codicon-breakpoint-log-unverified' : 'debug-breakpoint-unverified',
message: breakpoint.message || (breakpoint.logMessage ? nls.localize('unverifiedLogpoint', "Unverified Logpoint") : nls.localize('unverifiedBreakopint', "Unverified Breakpoint")),
};
}
@ -702,7 +702,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
}
return {
className: breakpoint.logMessage ? 'debug-breakpoint-log' : 'debug-breakpoint-conditional',
className: breakpoint.logMessage ? 'codicon-breakpoint-log' : 'codicon-breakpoint-conditional',
message: appendMessage(messages.join('\n'))
};
}
@ -727,7 +727,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
}
return {
className: 'debug-breakpoint',
className: 'debug-breakpoint, codicon-circle-filled',
message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
};
}

1
src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
View file

@ -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 {

2
test/automation/src/debug.ts
View file

@ -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-circle-filled';
const PAUSE = `.debug-toolbar .action-label[title*="Pause"]`;
const DEBUG_STATUS_BAR = `.statusbar.debugging`;
const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;