Skip to content

Commit 1bf341e

Browse files
alexdimaalexdima
committed
Fix codicons in standalone editor
1 parent efbcd7f commit 1bf341e

7 files changed

Lines changed: 42 additions & 288 deletions

File tree

‎src/vs/editor/contrib/codeAction/lightBulbWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
225225
const editorLightBulbForegroundColor = theme.getColor(editorLightBulbForeground);
226226
if (editorLightBulbForegroundColor) {
227227
collector.addRule(`
228-
.monaco-workbench .contentWidgets .codicon-lightbulb,
228+
.monaco-editor .contentWidgets .codicon-lightbulb,
229229
.monaco-workbench .markers-panel-container .codicon-lightbulb {
230230
color: ${editorLightBulbForegroundColor};
231231
}`);
@@ -235,7 +235,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
235235
const editorLightBulbAutoFixForegroundColor = theme.getColor(editorLightBulbAutoFixForeground);
236236
if (editorLightBulbAutoFixForegroundColor) {
237237
collector.addRule(`
238-
.monaco-workbench .contentWidgets .codicon-lightbulb-autofix,
238+
.monaco-editor .contentWidgets .codicon-lightbulb-autofix,
239239
.monaco-workbench .markers-panel-container .codicon-lightbulb-autofix {
240240
color: ${editorLightBulbAutoFixForegroundColor};
241241
}`);

‎src/vs/editor/contrib/documentSymbols/outlineTree.ts‎

Lines changed: 33 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -540,300 +540,168 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
540540

541541
const symbolIconArrayColor = theme.getColor(SYMBOL_ICON_ARRAY_FOREGROUND);
542542
if (symbolIconArrayColor) {
543-
collector.addRule(`
544-
.monaco-workbench .codicon-symbol-array {
545-
color: ${symbolIconArrayColor} !important;
546-
}
547-
`);
543+
collector.addRule(`.codicon-symbol-array { color: ${symbolIconArrayColor} !important; }`);
548544
}
549545

550546
const symbolIconBooleanColor = theme.getColor(SYMBOL_ICON_BOOLEAN_FOREGROUND);
551547
if (symbolIconBooleanColor) {
552-
collector.addRule(`
553-
.monaco-workbench .codicon-symbol-boolean {
554-
color: ${symbolIconBooleanColor} !important;
555-
}
556-
`);
548+
collector.addRule(`.codicon-symbol-boolean { color: ${symbolIconBooleanColor} !important; }`);
557549
}
558550

559551
const symbolIconClassColor = theme.getColor(SYMBOL_ICON_CLASS_FOREGROUND);
560552
if (symbolIconClassColor) {
561-
collector.addRule(`
562-
.monaco-workbench .codicon-symbol-class {
563-
color: ${symbolIconClassColor} !important;
564-
}
565-
`);
553+
collector.addRule(`.codicon-symbol-class { color: ${symbolIconClassColor} !important; }`);
566554
}
567555

568556
const symbolIconMethodColor = theme.getColor(SYMBOL_ICON_METHOD_FOREGROUND);
569557
if (symbolIconMethodColor) {
570-
collector.addRule(`
571-
.monaco-workbench .codicon-symbol-method {
572-
color: ${symbolIconMethodColor} !important;
573-
}
574-
`);
558+
collector.addRule(`.codicon-symbol-method { color: ${symbolIconMethodColor} !important; }`);
575559
}
576560

577561
const symbolIconColorColor = theme.getColor(SYMBOL_ICON_COLOR_FOREGROUND);
578562
if (symbolIconColorColor) {
579-
collector.addRule(`
580-
.monaco-workbench .codicon-symbol-color {
581-
color: ${symbolIconColorColor} !important;
582-
}
583-
`);
563+
collector.addRule(`.codicon-symbol-color { color: ${symbolIconColorColor} !important; }`);
584564
}
585565

586566
const symbolIconConstantColor = theme.getColor(SYMBOL_ICON_CONSTANT_FOREGROUND);
587567
if (symbolIconConstantColor) {
588-
collector.addRule(`
589-
.monaco-workbench .codicon-symbol-constant {
590-
color: ${symbolIconConstantColor} !important;
591-
}
592-
`);
568+
collector.addRule(`.codicon-symbol-constant { color: ${symbolIconConstantColor} !important; }`);
593569
}
594570

595571
const symbolIconConstructorColor = theme.getColor(SYMBOL_ICON_CONSTRUCTOR_FOREGROUND);
596572
if (symbolIconConstructorColor) {
597-
collector.addRule(`
598-
.monaco-workbench .codicon-symbol-constructor {
599-
color: ${symbolIconConstructorColor} !important;
600-
}
601-
`);
573+
collector.addRule(`.codicon-symbol-constructor { color: ${symbolIconConstructorColor} !important; }`);
602574
}
603575

604576
const symbolIconEnumeratorColor = theme.getColor(SYMBOL_ICON_ENUMERATOR_FOREGROUND);
605577
if (symbolIconEnumeratorColor) {
606578
collector.addRule(`
607-
.monaco-workbench .codicon-symbol-value,
608-
.monaco-workbench .codicon-symbol-enum {
609-
color: ${symbolIconEnumeratorColor} !important;
610-
}
611-
`);
579+
.codicon-symbol-value,.codicon-symbol-enum { color: ${symbolIconEnumeratorColor} !important; }`);
612580
}
613581

614582
const symbolIconEnumeratorMemberColor = theme.getColor(SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND);
615583
if (symbolIconEnumeratorMemberColor) {
616-
collector.addRule(`
617-
.monaco-workbench .codicon-symbol-enum-member {
618-
color: ${symbolIconEnumeratorMemberColor} !important;
619-
}
620-
`);
584+
collector.addRule(`.codicon-symbol-enum-member { color: ${symbolIconEnumeratorMemberColor} !important; }`);
621585
}
622586

623587
const symbolIconEventColor = theme.getColor(SYMBOL_ICON_EVENT_FOREGROUND);
624588
if (symbolIconEventColor) {
625-
collector.addRule(`
626-
.monaco-workbench .codicon-symbol-event {
627-
color: ${symbolIconEventColor} !important;
628-
}
629-
`);
589+
collector.addRule(`.codicon-symbol-event { color: ${symbolIconEventColor} !important; }`);
630590
}
631591

632592
const symbolIconFieldColor = theme.getColor(SYMBOL_ICON_FIELD_FOREGROUND);
633593
if (symbolIconFieldColor) {
634-
collector.addRule(`
635-
.monaco-workbench .codicon-symbol-field {
636-
color: ${symbolIconFieldColor} !important;
637-
}
638-
`);
594+
collector.addRule(`.codicon-symbol-field { color: ${symbolIconFieldColor} !important; }`);
639595
}
640596

641597
const symbolIconFileColor = theme.getColor(SYMBOL_ICON_FILE_FOREGROUND);
642598
if (symbolIconFileColor) {
643-
collector.addRule(`
644-
.monaco-workbench .codicon-symbol-file {
645-
color: ${symbolIconFileColor} !important;
646-
}
647-
`);
599+
collector.addRule(`.codicon-symbol-file { color: ${symbolIconFileColor} !important; }`);
648600
}
649601

650602
const symbolIconFolderColor = theme.getColor(SYMBOL_ICON_FOLDER_FOREGROUND);
651603
if (symbolIconFolderColor) {
652-
collector.addRule(`
653-
.monaco-workbench .codicon-symbol-folder {
654-
color: ${symbolIconFolderColor} !important;
655-
}
656-
`);
604+
collector.addRule(`.codicon-symbol-folder { color: ${symbolIconFolderColor} !important; }`);
657605
}
658606

659607
const symbolIconFunctionColor = theme.getColor(SYMBOL_ICON_FUNCTION_FOREGROUND);
660608
if (symbolIconFunctionColor) {
661-
collector.addRule(`
662-
.monaco-workbench .codicon-symbol-function {
663-
color: ${symbolIconFunctionColor} !important;
664-
}
665-
`);
609+
collector.addRule(`.codicon-symbol-function { color: ${symbolIconFunctionColor} !important; }`);
666610
}
667611

668612
const symbolIconInterfaceColor = theme.getColor(SYMBOL_ICON_INTERFACE_FOREGROUND);
669613
if (symbolIconInterfaceColor) {
670-
collector.addRule(`
671-
.monaco-workbench .codicon-symbol-interface {
672-
color: ${symbolIconInterfaceColor} !important;
673-
}
674-
`);
614+
collector.addRule(`.codicon-symbol-interface { color: ${symbolIconInterfaceColor} !important; }`);
675615
}
676616

677617
const symbolIconKeyColor = theme.getColor(SYMBOL_ICON_KEY_FOREGROUND);
678618
if (symbolIconKeyColor) {
679-
collector.addRule(`
680-
.monaco-workbench .codicon-symbol-key {
681-
color: ${symbolIconKeyColor} !important;
682-
}
683-
`);
619+
collector.addRule(`.codicon-symbol-key { color: ${symbolIconKeyColor} !important; }`);
684620
}
685621

686622
const symbolIconKeywordColor = theme.getColor(SYMBOL_ICON_KEYWORD_FOREGROUND);
687623
if (symbolIconKeywordColor) {
688-
collector.addRule(`
689-
.monaco-workbench .codicon-symbol-keyword {
690-
color: ${symbolIconKeywordColor} !important;
691-
}
692-
`);
624+
collector.addRule(`.codicon-symbol-keyword { color: ${symbolIconKeywordColor} !important; }`);
693625
}
694626

695627
const symbolIconModuleColor = theme.getColor(SYMBOL_ICON_MODULE_FOREGROUND);
696628
if (symbolIconModuleColor) {
697-
collector.addRule(`
698-
.monaco-workbench .codicon-symbol-module {
699-
color: ${symbolIconModuleColor} !important;
700-
}
701-
`);
629+
collector.addRule(`.codicon-symbol-module { color: ${symbolIconModuleColor} !important; }`);
702630
}
703631

704632
const outlineNamespaceColor = theme.getColor(SYMBOL_ICON_NAMESPACE_FOREGROUND);
705633
if (outlineNamespaceColor) {
706-
collector.addRule(`
707-
.monaco-workbench .codicon-symbol-namespace {
708-
color: ${outlineNamespaceColor} !important;
709-
}
710-
`);
634+
collector.addRule(`.codicon-symbol-namespace { color: ${outlineNamespaceColor} !important; }`);
711635
}
712636

713637
const symbolIconNullColor = theme.getColor(SYMBOL_ICON_NULL_FOREGROUND);
714638
if (symbolIconNullColor) {
715-
collector.addRule(`
716-
.monaco-workbench .codicon-symbol-null {
717-
color: ${symbolIconNullColor} !important;
718-
}
719-
`);
639+
collector.addRule(`.codicon-symbol-null { color: ${symbolIconNullColor} !important; }`);
720640
}
721641

722642
const symbolIconNumberColor = theme.getColor(SYMBOL_ICON_NUMBER_FOREGROUND);
723643
if (symbolIconNumberColor) {
724-
collector.addRule(`
725-
.monaco-workbench .codicon-symbol-number {
726-
color: ${symbolIconNumberColor} !important;
727-
}
728-
`);
644+
collector.addRule(`.codicon-symbol-number { color: ${symbolIconNumberColor} !important; }`);
729645
}
730646

731647
const symbolIconObjectColor = theme.getColor(SYMBOL_ICON_OBJECT_FOREGROUND);
732648
if (symbolIconObjectColor) {
733-
collector.addRule(`
734-
.monaco-workbench .codicon-symbol-object {
735-
color: ${symbolIconObjectColor} !important;
736-
}
737-
`);
649+
collector.addRule(`.codicon-symbol-object { color: ${symbolIconObjectColor} !important; }`);
738650
}
739651

740652
const symbolIconOperatorColor = theme.getColor(SYMBOL_ICON_OPERATOR_FOREGROUND);
741653
if (symbolIconOperatorColor) {
742-
collector.addRule(`
743-
.monaco-workbench .codicon-symbol-operator {
744-
color: ${symbolIconOperatorColor} !important;
745-
}
746-
`);
654+
collector.addRule(`.codicon-symbol-operator { color: ${symbolIconOperatorColor} !important; }`);
747655
}
748656

749657
const symbolIconPackageColor = theme.getColor(SYMBOL_ICON_PACKAGE_FOREGROUND);
750658
if (symbolIconPackageColor) {
751-
collector.addRule(`
752-
.monaco-workbench .codicon-symbol-package {
753-
color: ${symbolIconPackageColor} !important;
754-
}
755-
`);
659+
collector.addRule(`.codicon-symbol-package { color: ${symbolIconPackageColor} !important; }`);
756660
}
757661

758662
const symbolIconPropertyColor = theme.getColor(SYMBOL_ICON_PROPERTY_FOREGROUND);
759663
if (symbolIconPropertyColor) {
760-
collector.addRule(`
761-
.monaco-workbench .codicon-symbol-property {
762-
color: ${symbolIconPropertyColor} !important;
763-
}
764-
`);
664+
collector.addRule(`.codicon-symbol-property { color: ${symbolIconPropertyColor} !important; }`);
765665
}
766666

767667
const symbolIconReferenceColor = theme.getColor(SYMBOL_ICON_REFERENCE_FOREGROUND);
768668
if (symbolIconReferenceColor) {
769-
collector.addRule(`
770-
.monaco-workbench .codicon-symbol-reference {
771-
color: ${symbolIconReferenceColor} !important;
772-
}
773-
`);
669+
collector.addRule(`.codicon-symbol-reference { color: ${symbolIconReferenceColor} !important; }`);
774670
}
775671

776672
const symbolIconSnippetColor = theme.getColor(SYMBOL_ICON_SNIPPET_FOREGROUND);
777673
if (symbolIconSnippetColor) {
778-
collector.addRule(`
779-
.monaco-workbench .codicon-symbol-snippet {
780-
color: ${symbolIconSnippetColor} !important;
781-
}
782-
`);
674+
collector.addRule(`.codicon-symbol-snippet { color: ${symbolIconSnippetColor} !important; }`);
783675
}
784676

785677
const symbolIconStringColor = theme.getColor(SYMBOL_ICON_STRING_FOREGROUND);
786678
if (symbolIconStringColor) {
787-
collector.addRule(`
788-
.monaco-workbench .codicon-symbol-string {
789-
color: ${symbolIconStringColor} !important;
790-
}
791-
`);
679+
collector.addRule(`.codicon-symbol-string { color: ${symbolIconStringColor} !important; }`);
792680
}
793681

794682
const symbolIconStructColor = theme.getColor(SYMBOL_ICON_STRUCT_FOREGROUND);
795683
if (symbolIconStructColor) {
796-
collector.addRule(`
797-
.monaco-workbench .codicon-symbol-struct {
798-
color: ${symbolIconStructColor} !important;
799-
}
800-
`);
684+
collector.addRule(`.codicon-symbol-struct { color: ${symbolIconStructColor} !important; }`);
801685
}
802686

803687
const symbolIconTextColor = theme.getColor(SYMBOL_ICON_TEXT_FOREGROUND);
804688
if (symbolIconTextColor) {
805-
collector.addRule(`
806-
.monaco-workbench .codicon-symbol-text {
807-
color: ${symbolIconTextColor} !important;
808-
}
809-
`);
689+
collector.addRule(`.codicon-symbol-text { color: ${symbolIconTextColor} !important; }`);
810690
}
811691

812692
const symbolIconTypeParameterColor = theme.getColor(SYMBOL_ICON_TYPEPARAMETER_FOREGROUND);
813693
if (symbolIconTypeParameterColor) {
814-
collector.addRule(`
815-
.monaco-workbench .codicon-symbol-type-parameter {
816-
color: ${symbolIconTypeParameterColor} !important;
817-
}
818-
`);
694+
collector.addRule(`.codicon-symbol-type-parameter { color: ${symbolIconTypeParameterColor} !important; }`);
819695
}
820696

821697
const symbolIconUnitColor = theme.getColor(SYMBOL_ICON_UNIT_FOREGROUND);
822698
if (symbolIconUnitColor) {
823-
collector.addRule(`
824-
.monaco-workbench .codicon-symbol-unit {
825-
color: ${symbolIconUnitColor} !important;
826-
}
827-
`);
699+
collector.addRule(`.codicon-symbol-unit { color: ${symbolIconUnitColor} !important; }`);
828700
}
829701

830702
const symbolIconVariableColor = theme.getColor(SYMBOL_ICON_VARIABLE_FOREGROUND);
831703
if (symbolIconVariableColor) {
832-
collector.addRule(`
833-
.monaco-workbench .codicon-symbol-variable {
834-
color: ${symbolIconVariableColor} !important;
835-
}
836-
`);
704+
collector.addRule(`.codicon-symbol-variable { color: ${symbolIconVariableColor} !important; }`);
837705
}
838706

839707
});

‎src/vs/editor/contrib/suggest/suggestWidget.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./media/suggest';
7+
import 'vs/base/browser/ui/codiconLabel/codiconLabel'; // The codicon symbol styles are defined here and must be loaded
8+
import 'vs/editor/contrib/documentSymbols/outlineTree'; // The codicon symbol colors are defined here and must be loaded
79
import * as nls from 'vs/nls';
810
import { createMatches } from 'vs/base/common/filters';
911
import * as strings from 'vs/base/common/strings';

0 commit comments

Comments
 (0)