Skip to content

Commit c662af7

Browse files
aeschliaeschli
committed
use Codicon.error / warning / info
1 parent ecb90ae commit c662af7

6 files changed

Lines changed: 44 additions & 32 deletions

File tree

‎src/vs/platform/severityIcon/common/severityIcon.ts‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@
66
import Severity from 'vs/base/common/severity';
77
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
88
import { problemsErrorIconForeground, problemsInfoIconForeground, problemsWarningIconForeground } from 'vs/platform/theme/common/colorRegistry';
9+
import { Codicon } from 'vs/base/common/codicons';
910

1011
export namespace SeverityIcon {
1112

1213
export function className(severity: Severity): string {
1314
switch (severity) {
1415
case Severity.Ignore:
15-
return 'severity-ignore codicon-info';
16+
return 'severity-ignore ' + Codicon.info.classNames;
1617
case Severity.Info:
17-
return 'codicon-info';
18+
return Codicon.info.classNames;
1819
case Severity.Warning:
19-
return 'codicon-warning';
20+
return Codicon.warning.classNames;
2021
case Severity.Error:
21-
return 'codicon-error';
22+
return Codicon.error.classNames;
2223
}
2324
return '';
2425
}
@@ -28,37 +29,40 @@ registerThemingParticipant((theme, collector) => {
2829

2930
const errorIconForeground = theme.getColor(problemsErrorIconForeground);
3031
if (errorIconForeground) {
32+
const errorCodiconSelector = Codicon.error.cssSelector;
3133
collector.addRule(`
32-
.monaco-editor .zone-widget .codicon-error,
33-
.markers-panel .marker-icon.codicon-error,
34-
.extensions-viewlet > .extensions .codicon-error,
35-
.monaco-dialog-box .dialog-message-row .codicon-error {
34+
.monaco-editor .zone-widget ${errorCodiconSelector},
35+
.markers-panel .marker-icon${errorCodiconSelector},
36+
.extensions-viewlet > .extensions ${errorCodiconSelector},
37+
.monaco-dialog-box .dialog-message-row ${errorCodiconSelector} {
3638
color: ${errorIconForeground};
3739
}
3840
`);
3941
}
4042

4143
const warningIconForeground = theme.getColor(problemsWarningIconForeground);
42-
if (errorIconForeground) {
44+
if (warningIconForeground) {
45+
const warningCodiconSelector = Codicon.warning.cssSelector;
4346
collector.addRule(`
44-
.monaco-editor .zone-widget .codicon-warning,
45-
.markers-panel .marker-icon.codicon-warning,
46-
.extensions-viewlet > .extensions .codicon-warning,
47-
.extension-editor .codicon-warning,
48-
.monaco-dialog-box .dialog-message-row .codicon-warning {
47+
.monaco-editor .zone-widget ${warningCodiconSelector},
48+
.markers-panel .marker-icon${warningCodiconSelector},
49+
.extensions-viewlet > .extensions ${warningCodiconSelector},
50+
.extension-editor ${warningCodiconSelector},
51+
.monaco-dialog-box .dialog-message-row ${warningCodiconSelector} {
4952
color: ${warningIconForeground};
5053
}
5154
`);
5255
}
5356

5457
const infoIconForeground = theme.getColor(problemsInfoIconForeground);
55-
if (errorIconForeground) {
58+
if (infoIconForeground) {
59+
const infoCodiconSelector = Codicon.info.cssSelector;
5660
collector.addRule(`
57-
.monaco-editor .zone-widget .codicon-info,
58-
.markers-panel .marker-icon.codicon-info,
59-
.extensions-viewlet > .extensions .codicon-info,
60-
.extension-editor .codicon-info,
61-
.monaco-dialog-box .dialog-message-row .codicon-info {
61+
.monaco-editor .zone-widget ${infoCodiconSelector},
62+
.markers-panel .marker-icon${infoCodiconSelector},
63+
.extensions-viewlet > .extensions ${infoCodiconSelector},
64+
.extension-editor ${infoCodiconSelector},
65+
.monaco-dialog-box .dialog-message-row ${infoCodiconSelector} {
6266
color: ${infoIconForeground};
6367
}
6468
`);

‎src/vs/workbench/browser/parts/notifications/notificationsList.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { NotificationActionRunner, CopyNotificationMessageAction } from 'vs/work
1818
import { NotificationFocusedContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
1919
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
2020
import { assertIsDefined, assertAllDefined } from 'vs/base/common/types';
21+
import { Codicon } from 'vs/base/common/codicons';
2122

2223
export class NotificationsList extends Themable {
2324
private listContainer: HTMLElement | undefined;
@@ -290,29 +291,32 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
290291
// Notification Error Icon
291292
const notificationErrorIconForegroundColor = theme.getColor(NOTIFICATIONS_ERROR_ICON_FOREGROUND);
292293
if (notificationErrorIconForegroundColor) {
294+
const errorCodiconSelector = Codicon.error.cssSelector;
293295
collector.addRule(`
294-
.monaco-workbench .notifications-center .codicon-error,
295-
.monaco-workbench .notifications-toasts .codicon-error {
296+
.monaco-workbench .notifications-center ${errorCodiconSelector},
297+
.monaco-workbench .notifications-toasts ${errorCodiconSelector} {
296298
color: ${notificationErrorIconForegroundColor};
297299
}`);
298300
}
299301

300302
// Notification Warning Icon
301303
const notificationWarningIconForegroundColor = theme.getColor(NOTIFICATIONS_WARNING_ICON_FOREGROUND);
302304
if (notificationWarningIconForegroundColor) {
305+
const warningCodiconSelector = Codicon.warning.cssSelector;
303306
collector.addRule(`
304-
.monaco-workbench .notifications-center .codicon-warning,
305-
.monaco-workbench .notifications-toasts .codicon-warning {
307+
.monaco-workbench .notifications-center ${warningCodiconSelector},
308+
.monaco-workbench .notifications-toasts ${warningCodiconSelector} {
306309
color: ${notificationWarningIconForegroundColor};
307310
}`);
308311
}
309312

310313
// Notification Info Icon
311314
const notificationInfoIconForegroundColor = theme.getColor(NOTIFICATIONS_INFO_ICON_FOREGROUND);
312315
if (notificationInfoIconForegroundColor) {
316+
const infoCodiconSelector = Codicon.info.cssSelector;
313317
collector.addRule(`
314-
.monaco-workbench .notifications-center .codicon-info,
315-
.monaco-workbench .notifications-toasts .codicon-info {
318+
.monaco-workbench .notifications-center ${infoCodiconSelector},
319+
.monaco-workbench .notifications-toasts ${infoCodiconSelector} {
316320
color: ${notificationInfoIconForegroundColor};
317321
}`);
318322
}

‎src/vs/workbench/contrib/debug/browser/replViewer.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { IReplElementSource, IDebugService, IExpression, IReplElement, IDebugCon
2323
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
2424
import { IThemeService } from 'vs/platform/theme/common/themeService';
2525
import { localize } from 'vs/nls';
26+
import { Codicon } from 'vs/base/common/codicons';
2627

2728
const $ = dom.$;
2829

@@ -128,7 +129,7 @@ export class ReplEvaluationResultsRenderer implements ITreeRenderer<ReplEvaluati
128129
linkDetector: this.linkDetector
129130
});
130131
if (expression.hasChildren) {
131-
templateData.annotation.className = 'annotation codicon codicon-info';
132+
templateData.annotation.className = 'annotation ' + Codicon.info.classNames;
132133
templateData.annotation.title = localize('stateCapture', "Object state is captured from first evaluation");
133134
}
134135
}
@@ -262,7 +263,7 @@ export class ReplRawObjectsRenderer implements ITreeRenderer<RawObjectReplElemen
262263

263264
// annotation if any
264265
if (element.annotation) {
265-
templateData.annotation.className = 'annotation codicon codicon-info';
266+
templateData.annotation.className = 'annotation ' + Codicon.info.classNames;
266267
templateData.annotation.title = element.annotation;
267268
} else {
268269
templateData.annotation.className = '';

‎src/vs/workbench/contrib/extensions/browser/extensionsActions.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
5959
import { IProductService } from 'vs/platform/product/common/productService';
6060
import { IFileDialogService, IDialogService } from 'vs/platform/dialogs/common/dialogs';
6161
import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
62+
import { Codicon } from 'vs/base/common/codicons';
6263

6364
export function toExtensionDescription(local: ILocalExtension): IExtensionDescription {
6465
return {
@@ -2691,8 +2692,8 @@ export class ExtensionToolTipAction extends ExtensionAction {
26912692
export class SystemDisabledWarningAction extends ExtensionAction {
26922693

26932694
private static readonly CLASS = `${ExtensionAction.ICON_ACTION_CLASS} system-disable`;
2694-
private static readonly WARNING_CLASS = `${SystemDisabledWarningAction.CLASS} codicon-warning`;
2695-
private static readonly INFO_CLASS = `${SystemDisabledWarningAction.CLASS} codicon-info`;
2695+
private static readonly WARNING_CLASS = `${SystemDisabledWarningAction.CLASS} ${Codicon.warning.classNames}`;
2696+
private static readonly INFO_CLASS = `${SystemDisabledWarningAction.CLASS} ${Codicon.info.classNames}`;
26962697

26972698
updateWhenCounterExtensionChanges: boolean = true;
26982699
private _runningExtensions: IExtensionDescription[] | null = null;

‎src/vs/workbench/contrib/markers/browser/markers.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la
3232
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
3333
import type { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
3434
import { ToggleViewAction } from 'vs/workbench/browser/actions/layoutActions';
35+
import { Codicon } from 'vs/base/common/codicons';
3536

3637
registerSingleton(IMarkersWorkbenchService, MarkersWorkbenchService, false);
3738

@@ -124,7 +125,7 @@ const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewC
124125

125126
Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews([{
126127
id: Constants.MARKERS_VIEW_ID,
127-
containerIcon: 'codicon-warning',
128+
containerIcon: Codicon.warning.classNames,
128129
name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
129130
canToggleVisibility: false,
130131
canMoveView: true,

‎src/vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
2222
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
2323
import { textPreformatForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
2424
import { Color } from 'vs/base/common/color';
25+
import { Codicon } from 'vs/base/common/codicons';
2526

2627
const $ = dom.$;
2728

@@ -213,7 +214,7 @@ class WelcomeOverlay extends Disposable {
213214
}
214215

215216
private updateProblemsKey() {
216-
const problems = document.querySelector('div[id="workbench.parts.statusbar"] .statusbar-item.left .codicon.codicon-warning');
217+
const problems = document.querySelector(`div[id="workbench.parts.statusbar"] .statusbar-item.left ${Codicon.warning.cssSelector}`);
217218
const key = this._overlay.querySelector('.key.problems') as HTMLElement;
218219
if (problems instanceof HTMLElement) {
219220
const target = problems.getBoundingClientRect();

0 commit comments

Comments
 (0)