Update breakpoints to codicons

Miguel Solorio · Miguel Solorio · commit 6b43b2cb5e51 · 2019-11-08T14:43:12.000-08:00
diff --git 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] = (
-					'<div class="cgmr '
+					'<div class="cgmr codicon '
 					+ classNames.join(' ')
 					+ common
 				);
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -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")
 	};
 }
diff --git 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/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-circle-filled';
 const PAUSE = `.debug-toolbar .action-label[title*="Pause"]`;
 const DEBUG_STATUS_BAR = `.statusbar.debugging`;
 const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br`
`638`	`638`
`639`	`639`	`if (!breakpoint.enabled \|\| !debugService.getModel().areBreakpointsActivated()) {`
`640`	`640`	`return {`
`641`		`- className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-disabled' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-disabled' : breakpoint.logMessage ? 'debug-breakpoint-log-disabled' : 'debug-breakpoint-disabled',`
	`641`	`+ className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-disabled' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-disabled' : breakpoint.logMessage ? 'codicon-breakpoint-log-disabled' : 'codicon-breakpoint-disabled',`
`642`	`642`	`message: breakpoint.logMessage ? nls.localize('disabledLogpoint', "Disabled Logpoint") : nls.localize('disabledBreakpoint', "Disabled Breakpoint"),`
`643`	`643`	`};`
`644`	`644`	`}`
`@@ -648,7 +648,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br`
`648`	`648`	`};`
`649`	`649`	`if (debugActive && !breakpoint.verified) {`
`650`	`650`	`return {`
`651`		`- className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-unverified' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-unverified' : breakpoint.logMessage ? 'debug-breakpoint-log-unverified' : 'debug-breakpoint-unverified',`
	`651`	`+ className: breakpoint instanceof DataBreakpoint ? 'debug-data-breakpoint-unverified' : breakpoint instanceof FunctionBreakpoint ? 'debug-function-breakpoint-unverified' : breakpoint.logMessage ? 'codicon-breakpoint-log-unverified' : 'debug-breakpoint-unverified',`
`652`	`652`	`message: breakpoint.message \|\| (breakpoint.logMessage ? nls.localize('unverifiedLogpoint', "Unverified Logpoint") : nls.localize('unverifiedBreakopint', "Unverified Breakpoint")),`
`653`	`653`	`};`
`654`	`654`	`}`
`@@ -702,7 +702,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`return {`
`705`		`- className: breakpoint.logMessage ? 'debug-breakpoint-log' : 'debug-breakpoint-conditional',`
	`705`	`+ className: breakpoint.logMessage ? 'codicon-breakpoint-log' : 'codicon-breakpoint-conditional',`
`706`	`706`	`message: appendMessage(messages.join('\n'))`
`707`	`707`	`};`
`708`	`708`	`}`
`@@ -727,7 +727,7 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`return {`
`730`		`- className: 'debug-breakpoint',`
	`730`	`+ className: 'debug-breakpoint, codicon-circle-filled',`
`731`	`731`	`message: breakpoint.message \|\| nls.localize('breakpoint', "Breakpoint")`
`732`	`732`	`};`
`733`	`733`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@`
`212`	`212`	`.extensions-viewlet > .extensions .extension > .details > .header-container > .header .codicon {`
`213`	`213`	`font-size: 120%;`
`214`	`214`	`margin-right: 2px;`
	`215`	`+ -webkit-mask: inherit;`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`.extensions-viewlet > .extensions .extension > .details > .header-container > .header > .ratings {`