diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css
index 1e49da134fdb44ebf57b639bbe998daad26d8d3c..37620bc42d3674cf9a638399c6780d374d8b8bb6 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css
@@ -23,24 +23,6 @@
outline: none;
}
-.monaco-breadcrumbs .monaco-breadcrumb-item::before {
- width: 14px;
- height: 16px;
- display: inline-block;
+.monaco-breadcrumbs .monaco-breadcrumb-item:first-of-type::before {
content: ' ';
}
-
-.monaco-breadcrumbs .monaco-breadcrumb-item:not(:nth-child(2))::before {
- background-image: url(./tree-collapsed-light.svg);
- opacity: .7;
- background-size: 16px;
- background-position: 50% 50%;
-}
-
-.vs-dark .monaco-breadcrumbs .monaco-breadcrumb-item:not(:nth-child(2))::before {
- background-image: url(./tree-collapsed-dark.svg);
-}
-
-.hc-black .monaco-breadcrumbs .monaco-breadcrumb-item:not(:nth-child(2))::before {
- background-image: url(./tree-collapsed-hc.svg);
-}
diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
index 2e72938f98677bd53a1cfeb6f5f9e8464b0b4926..5ce81d72e6679033cb696e26b3b85343a9f37d58 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -328,7 +328,9 @@ export class BreadcrumbsWidget {
item.render(container);
container.tabIndex = -1;
container.setAttribute('role', 'listitem');
- dom.addClass(container, 'monaco-breadcrumb-item');
+ dom.addClasses(container, 'monaco-breadcrumb-item');
+ const iconContainer = dom.$('.codicon.codicon-chevron-right');
+ container.appendChild(iconContainer);
}
private _onClick(event: IMouseEvent): void {
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
index bc05e29c59818331a00fcbdc82e59b42f262aa7b..3c635b26c1f834a2a2b43da70c5ed8f71cac75ac 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?10ac421d405314bb3250169d97fc2c62") format("truetype");
+ src: url("./codicon.ttf?3a05fcfc657285cdb4cd3eba790b7462") format("truetype");
}
.codicon[class*='codicon-'] {
@@ -109,258 +109,275 @@
.codicon-clock:before { content: "\ea82" }
.codicon-folder:before { content: "\ea83" }
.codicon-file-directory:before { content: "\ea83" }
+.codicon-symbol-folder:before { content: "\ea83" }
.codicon-logo-github:before { content: "\ea84" }
.codicon-mark-github:before { content: "\ea84" }
.codicon-github:before { content: "\ea84" }
.codicon-terminal:before { content: "\ea85" }
.codicon-console:before { content: "\ea85" }
.codicon-zap:before { content: "\ea86" }
-.codicon-event:before { content: "\ea86" }
+.codicon-symbol-event:before { content: "\ea86" }
.codicon-error:before { content: "\ea87" }
.codicon-stop:before { content: "\ea87" }
+.codicon-variable:before { content: "\ea88" }
+.codicon-symbol-variable:before { content: "\ea88" }
+.codicon-array:before { content: "\ea8a" }
+.codicon-symbol-array:before { content: "\ea8a" }
+.codicon-symbol-module:before { content: "\ea8b" }
+.codicon-symbol-package:before { content: "\ea8b" }
+.codicon-symbol-namespace:before { content: "\ea8b" }
+.codicon-symbol-object:before { content: "\ea8b" }
+.codicon-symbol-method:before { content: "\ea8c" }
+.codicon-symbol-function:before { content: "\ea8c" }
+.codicon-symbol-constructor:before { content: "\ea8c" }
+.codicon-symbol-boolean:before { content: "\ea8f" }
+.codicon-symbol-null:before { content: "\ea8f" }
+.codicon-symbol-numeric:before { content: "\ea90" }
+.codicon-symbol-number:before { content: "\ea90" }
+.codicon-symbol-structure:before { content: "\ea91" }
+.codicon-symbol-struct:before { content: "\ea91" }
+.codicon-symbol-parameter:before { content: "\ea92" }
+.codicon-symbol-type-parameter:before { content: "\ea92" }
+.codicon-symbol-key:before { content: "\ea93" }
+.codicon-symbol-string:before { content: "\ea93" }
+.codicon-symbol-text:before { content: "\ea93" }
+.codicon-symbol-reference:before { content: "\ea94" }
+.codicon-go-to-file:before { content: "\ea94" }
+.codicon-symbol-enum:before { content: "\ea95" }
+.codicon-symbol-value:before { content: "\ea95" }
+.codicon-symbol-ruler:before { content: "\ea96" }
+.codicon-symbol-unit:before { content: "\ea96" }
.codicon-activate-breakpoints:before { content: "\f101" }
.codicon-archive:before { content: "\f102" }
-.codicon-array:before { content: "\f103" }
-.codicon-arrow-both:before { content: "\f104" }
-.codicon-arrow-down:before { content: "\f105" }
-.codicon-arrow-left:before { content: "\f106" }
-.codicon-arrow-right:before { content: "\f107" }
-.codicon-arrow-small-down:before { content: "\f108" }
-.codicon-arrow-small-left:before { content: "\f109" }
-.codicon-arrow-small-right:before { content: "\f10a" }
-.codicon-arrow-small-up:before { content: "\f10b" }
-.codicon-arrow-up:before { content: "\f10c" }
-.codicon-bell:before { content: "\f10d" }
-.codicon-bold:before { content: "\f10e" }
-.codicon-book:before { content: "\f10f" }
-.codicon-bookmark:before { content: "\f110" }
-.codicon-boolean:before { content: "\f111" }
-.codicon-breakpoint-conditional-unverified:before { content: "\f112" }
-.codicon-breakpoint-conditional:before { content: "\f113" }
-.codicon-breakpoint-data-unverified:before { content: "\f114" }
-.codicon-breakpoint-data:before { content: "\f115" }
-.codicon-breakpoint-log-unverified:before { content: "\f116" }
-.codicon-breakpoint-log:before { content: "\f117" }
-.codicon-briefcase:before { content: "\f118" }
-.codicon-broadcast:before { content: "\f119" }
-.codicon-browser:before { content: "\f11a" }
-.codicon-bug:before { content: "\f11b" }
-.codicon-calendar:before { content: "\f11c" }
-.codicon-case-sensitive:before { content: "\f11d" }
-.codicon-check:before { content: "\f11e" }
-.codicon-checklist:before { content: "\f11f" }
-.codicon-chevron-down:before { content: "\f120" }
-.codicon-chevron-left:before { content: "\f121" }
-.codicon-chevron-right:before { content: "\f122" }
-.codicon-chevron-up:before { content: "\f123" }
-.codicon-chrome-close:before { content: "\f124" }
-.codicon-chrome-maximize:before { content: "\f125" }
-.codicon-chrome-minimize:before { content: "\f126" }
-.codicon-chrome-restore:before { content: "\f127" }
-.codicon-circle-outline:before { content: "\f128" }
-.codicon-circle-slash:before { content: "\f129" }
-.codicon-circuit-board:before { content: "\f12a" }
-.codicon-class:before { content: "\f12b" }
-.codicon-clear-all:before { content: "\f12c" }
-.codicon-clippy:before { content: "\f12d" }
-.codicon-close-all:before { content: "\f12e" }
-.codicon-cloud-download:before { content: "\f12f" }
-.codicon-cloud-upload:before { content: "\f130" }
-.codicon-code:before { content: "\f131" }
-.codicon-collapse-all:before { content: "\f132" }
-.codicon-color-mode:before { content: "\f133" }
-.codicon-color:before { content: "\f134" }
-.codicon-comment-discussion:before { content: "\f135" }
-.codicon-compare-changes:before { content: "\f136" }
-.codicon-constant:before { content: "\f137" }
-.codicon-continue:before { content: "\f138" }
-.codicon-credit-card:before { content: "\f139" }
-.codicon-current-and-breakpoint:before { content: "\f13a" }
-.codicon-current:before { content: "\f13b" }
-.codicon-dash:before { content: "\f13c" }
-.codicon-dashboard:before { content: "\f13d" }
-.codicon-database:before { content: "\f13e" }
-.codicon-debug-disconnect:before { content: "\f13f" }
-.codicon-debug-pause:before { content: "\f140" }
-.codicon-debug-restart:before { content: "\f141" }
-.codicon-debug-start:before { content: "\f142" }
-.codicon-debug-step-into:before { content: "\f143" }
-.codicon-debug-step-out:before { content: "\f144" }
-.codicon-debug-step-over:before { content: "\f145" }
-.codicon-debug-stop:before { content: "\f146" }
-.codicon-debug:before { content: "\f147" }
-.codicon-device-camera-video:before { content: "\f148" }
-.codicon-device-camera:before { content: "\f149" }
-.codicon-device-mobile:before { content: "\f14a" }
-.codicon-diff-added:before { content: "\f14b" }
-.codicon-diff-ignored:before { content: "\f14c" }
-.codicon-diff-modified:before { content: "\f14d" }
-.codicon-diff-removed:before { content: "\f14e" }
-.codicon-diff-renamed:before { content: "\f14f" }
-.codicon-diff:before { content: "\f150" }
-.codicon-discard:before { content: "\f151" }
-.codicon-editor-layout:before { content: "\f152" }
-.codicon-ellipsis:before { content: "\f153" }
-.codicon-empty-window:before { content: "\f154" }
-.codicon-enumerator-member:before { content: "\f155" }
-.codicon-enumerator:before { content: "\f156" }
-.codicon-exclude:before { content: "\f157" }
-.codicon-extensions:before { content: "\f158" }
-.codicon-eye-closed:before { content: "\f159" }
-.codicon-field:before { content: "\f15a" }
-.codicon-file-binary:before { content: "\f15b" }
-.codicon-file-code:before { content: "\f15c" }
-.codicon-file-media:before { content: "\f15d" }
-.codicon-file-pdf:before { content: "\f15e" }
-.codicon-file-submodule:before { content: "\f15f" }
-.codicon-file-symlink-directory:before { content: "\f160" }
-.codicon-file-symlink-file:before { content: "\f161" }
-.codicon-file-zip:before { content: "\f162" }
-.codicon-files:before { content: "\f163" }
-.codicon-filter:before { content: "\f164" }
-.codicon-flame:before { content: "\f165" }
-.codicon-fold-down:before { content: "\f166" }
-.codicon-fold-up:before { content: "\f167" }
-.codicon-fold:before { content: "\f168" }
-.codicon-folder-active:before { content: "\f169" }
-.codicon-folder-opened:before { content: "\f16a" }
-.codicon-gear:before { content: "\f16b" }
-.codicon-gift:before { content: "\f16c" }
-.codicon-gist-secret:before { content: "\f16d" }
-.codicon-gist:before { content: "\f16e" }
-.codicon-git-commit:before { content: "\f16f" }
-.codicon-git-compare:before { content: "\f170" }
-.codicon-git-merge:before { content: "\f171" }
-.codicon-github-action:before { content: "\f172" }
-.codicon-github-alt:before { content: "\f173" }
-.codicon-globe:before { content: "\f174" }
-.codicon-go-to-file:before { content: "\f175" }
-.codicon-grabber:before { content: "\f176" }
-.codicon-graph:before { content: "\f177" }
-.codicon-gripper:before { content: "\f178" }
-.codicon-heart:before { content: "\f179" }
-.codicon-home:before { content: "\f17a" }
-.codicon-horizontal-rule:before { content: "\f17b" }
-.codicon-hubot:before { content: "\f17c" }
-.codicon-inbox:before { content: "\f17d" }
-.codicon-interface:before { content: "\f17e" }
-.codicon-issue-closed:before { content: "\f17f" }
-.codicon-issue-reopened:before { content: "\f180" }
-.codicon-issues:before { content: "\f181" }
-.codicon-italic:before { content: "\f182" }
-.codicon-jersey:before { content: "\f183" }
-.codicon-json:before { content: "\f184" }
-.codicon-kebab-vertical:before { content: "\f185" }
-.codicon-key:before { content: "\f186" }
-.codicon-keyword:before { content: "\f187" }
-.codicon-law:before { content: "\f188" }
-.codicon-lightbulb-autofix:before { content: "\f189" }
-.codicon-link-external:before { content: "\f18a" }
-.codicon-link:before { content: "\f18b" }
-.codicon-list-ordered:before { content: "\f18c" }
-.codicon-list-unordered:before { content: "\f18d" }
-.codicon-live-share:before { content: "\f18e" }
-.codicon-loading:before { content: "\f18f" }
-.codicon-location:before { content: "\f190" }
-.codicon-mail-read:before { content: "\f191" }
-.codicon-mail:before { content: "\f192" }
-.codicon-markdown:before { content: "\f193" }
-.codicon-megaphone:before { content: "\f194" }
-.codicon-mention:before { content: "\f195" }
-.codicon-method:before { content: "\f196" }
-.codicon-milestone:before { content: "\f197" }
-.codicon-misc:before { content: "\f198" }
-.codicon-mortar-board:before { content: "\f199" }
-.codicon-move:before { content: "\f19a" }
-.codicon-multiple-windows:before { content: "\f19b" }
-.codicon-mute:before { content: "\f19c" }
-.codicon-namespace:before { content: "\f19d" }
-.codicon-no-newline:before { content: "\f19e" }
-.codicon-note:before { content: "\f19f" }
-.codicon-numeric:before { content: "\f1a0" }
-.codicon-octoface:before { content: "\f1a1" }
-.codicon-open-preview:before { content: "\f1a2" }
-.codicon-operator:before { content: "\f1a3" }
-.codicon-package:before { content: "\f1a4" }
-.codicon-paintcan:before { content: "\f1a5" }
-.codicon-parameter:before { content: "\f1a6" }
-.codicon-pin:before { content: "\f1a7" }
-.codicon-play:before { content: "\f1a8" }
-.codicon-plug:before { content: "\f1a9" }
-.codicon-preserve-case:before { content: "\f1aa" }
-.codicon-preview:before { content: "\f1ab" }
-.codicon-project:before { content: "\f1ac" }
-.codicon-property:before { content: "\f1ad" }
-.codicon-pulse:before { content: "\f1ae" }
-.codicon-question:before { content: "\f1af" }
-.codicon-quote:before { content: "\f1b0" }
-.codicon-radio-tower:before { content: "\f1b1" }
-.codicon-reactions:before { content: "\f1b2" }
-.codicon-references:before { content: "\f1b3" }
-.codicon-refresh:before { content: "\f1b4" }
-.codicon-regex:before { content: "\f1b5" }
-.codicon-remote:before { content: "\f1b6" }
-.codicon-remove:before { content: "\f1b7" }
-.codicon-replace-all:before { content: "\f1b8" }
-.codicon-replace:before { content: "\f1b9" }
-.codicon-repo-clone:before { content: "\f1ba" }
-.codicon-repo-force-push:before { content: "\f1bb" }
-.codicon-repo-pull:before { content: "\f1bc" }
-.codicon-repo-push:before { content: "\f1bd" }
-.codicon-report:before { content: "\f1be" }
-.codicon-request-changes:before { content: "\f1bf" }
-.codicon-rocket:before { content: "\f1c0" }
-.codicon-root-folder-opened:before { content: "\f1c1" }
-.codicon-root-folder:before { content: "\f1c2" }
-.codicon-rss:before { content: "\f1c3" }
-.codicon-ruby:before { content: "\f1c4" }
-.codicon-ruler:before { content: "\f1c5" }
-.codicon-save-all:before { content: "\f1c6" }
-.codicon-save-as:before { content: "\f1c7" }
-.codicon-save:before { content: "\f1c8" }
-.codicon-screen-full:before { content: "\f1c9" }
-.codicon-screen-normal:before { content: "\f1ca" }
-.codicon-search-stop:before { content: "\f1cb" }
-.codicon-selection:before { content: "\f1cc" }
-.codicon-server:before { content: "\f1cd" }
-.codicon-settings:before { content: "\f1ce" }
-.codicon-shield:before { content: "\f1cf" }
-.codicon-smiley:before { content: "\f1d0" }
-.codicon-snippet:before { content: "\f1d1" }
-.codicon-sort-precedence:before { content: "\f1d2" }
-.codicon-split-horizontal:before { content: "\f1d3" }
-.codicon-split-vertical:before { content: "\f1d4" }
-.codicon-squirrel:before { content: "\f1d5" }
-.codicon-star-full:before { content: "\f1d6" }
-.codicon-star-half:before { content: "\f1d7" }
-.codicon-string:before { content: "\f1d8" }
-.codicon-structure:before { content: "\f1d9" }
-.codicon-tasklist:before { content: "\f1da" }
-.codicon-telescope:before { content: "\f1db" }
-.codicon-text-size:before { content: "\f1dc" }
-.codicon-three-bars:before { content: "\f1dd" }
-.codicon-thumbsdown:before { content: "\f1de" }
-.codicon-thumbsup:before { content: "\f1df" }
-.codicon-tools:before { content: "\f1e0" }
-.codicon-triangle-down:before { content: "\f1e1" }
-.codicon-triangle-left:before { content: "\f1e2" }
-.codicon-triangle-right:before { content: "\f1e3" }
-.codicon-triangle-up:before { content: "\f1e4" }
-.codicon-twitter:before { content: "\f1e5" }
-.codicon-unfold:before { content: "\f1e6" }
-.codicon-unlock:before { content: "\f1e7" }
-.codicon-unmute:before { content: "\f1e8" }
-.codicon-unverified:before { content: "\f1e9" }
-.codicon-variable:before { content: "\f1ea" }
-.codicon-verified:before { content: "\f1eb" }
-.codicon-versions:before { content: "\f1ec" }
-.codicon-vm-active:before { content: "\f1ed" }
-.codicon-vm-outline:before { content: "\f1ee" }
-.codicon-vm-running:before { content: "\f1ef" }
-.codicon-watch:before { content: "\f1f0" }
-.codicon-whitespace:before { content: "\f1f1" }
-.codicon-whole-word:before { content: "\f1f2" }
-.codicon-window:before { content: "\f1f3" }
-.codicon-word-wrap:before { content: "\f1f4" }
-.codicon-zoom-in:before { content: "\f1f5" }
-.codicon-zoom-out:before { content: "\f1f6" }
+.codicon-arrow-both:before { content: "\f103" }
+.codicon-arrow-down:before { content: "\f104" }
+.codicon-arrow-left:before { content: "\f105" }
+.codicon-arrow-right:before { content: "\f106" }
+.codicon-arrow-small-down:before { content: "\f107" }
+.codicon-arrow-small-left:before { content: "\f108" }
+.codicon-arrow-small-right:before { content: "\f109" }
+.codicon-arrow-small-up:before { content: "\f10a" }
+.codicon-arrow-up:before { content: "\f10b" }
+.codicon-bell:before { content: "\f10c" }
+.codicon-bold:before { content: "\f10d" }
+.codicon-book:before { content: "\f10e" }
+.codicon-bookmark:before { content: "\f10f" }
+.codicon-breakpoint-conditional-unverified:before { content: "\f110" }
+.codicon-breakpoint-conditional:before { content: "\f111" }
+.codicon-breakpoint-data-unverified:before { content: "\f112" }
+.codicon-breakpoint-data:before { content: "\f113" }
+.codicon-breakpoint-log-unverified:before { content: "\f114" }
+.codicon-breakpoint-log:before { content: "\f115" }
+.codicon-briefcase:before { content: "\f116" }
+.codicon-broadcast:before { content: "\f117" }
+.codicon-browser:before { content: "\f118" }
+.codicon-bug:before { content: "\f119" }
+.codicon-calendar:before { content: "\f11a" }
+.codicon-case-sensitive:before { content: "\f11b" }
+.codicon-check:before { content: "\f11c" }
+.codicon-checklist:before { content: "\f11d" }
+.codicon-chevron-down:before { content: "\f11e" }
+.codicon-chevron-left:before { content: "\f11f" }
+.codicon-chevron-right:before { content: "\f120" }
+.codicon-chevron-up:before { content: "\f121" }
+.codicon-chrome-close:before { content: "\f122" }
+.codicon-chrome-maximize:before { content: "\f123" }
+.codicon-chrome-minimize:before { content: "\f124" }
+.codicon-chrome-restore:before { content: "\f125" }
+.codicon-circle-outline:before { content: "\f126" }
+.codicon-circle-slash:before { content: "\f127" }
+.codicon-circuit-board:before { content: "\f128" }
+.codicon-clear-all:before { content: "\f129" }
+.codicon-clippy:before { content: "\f12a" }
+.codicon-close-all:before { content: "\f12b" }
+.codicon-cloud-download:before { content: "\f12c" }
+.codicon-cloud-upload:before { content: "\f12d" }
+.codicon-code:before { content: "\f12e" }
+.codicon-collapse-all:before { content: "\f12f" }
+.codicon-color-mode:before { content: "\f130" }
+.codicon-comment-discussion:before { content: "\f131" }
+.codicon-compare-changes:before { content: "\f132" }
+.codicon-continue:before { content: "\f133" }
+.codicon-credit-card:before { content: "\f134" }
+.codicon-current-and-breakpoint:before { content: "\f135" }
+.codicon-current:before { content: "\f136" }
+.codicon-dash:before { content: "\f137" }
+.codicon-dashboard:before { content: "\f138" }
+.codicon-database:before { content: "\f139" }
+.codicon-debug-disconnect:before { content: "\f13a" }
+.codicon-debug-pause:before { content: "\f13b" }
+.codicon-debug-restart:before { content: "\f13c" }
+.codicon-debug-start:before { content: "\f13d" }
+.codicon-debug-step-into:before { content: "\f13e" }
+.codicon-debug-step-out:before { content: "\f13f" }
+.codicon-debug-step-over:before { content: "\f140" }
+.codicon-debug-stop:before { content: "\f141" }
+.codicon-debug:before { content: "\f142" }
+.codicon-device-camera-video:before { content: "\f143" }
+.codicon-device-camera:before { content: "\f144" }
+.codicon-device-mobile:before { content: "\f145" }
+.codicon-diff-added:before { content: "\f146" }
+.codicon-diff-ignored:before { content: "\f147" }
+.codicon-diff-modified:before { content: "\f148" }
+.codicon-diff-removed:before { content: "\f149" }
+.codicon-diff-renamed:before { content: "\f14a" }
+.codicon-diff:before { content: "\f14b" }
+.codicon-discard:before { content: "\f14c" }
+.codicon-editor-layout:before { content: "\f14d" }
+.codicon-ellipsis:before { content: "\f14e" }
+.codicon-empty-window:before { content: "\f14f" }
+.codicon-exclude:before { content: "\f150" }
+.codicon-extensions:before { content: "\f151" }
+.codicon-eye-closed:before { content: "\f152" }
+.codicon-file-binary:before { content: "\f153" }
+.codicon-file-code:before { content: "\f154" }
+.codicon-file-media:before { content: "\f155" }
+.codicon-file-pdf:before { content: "\f156" }
+.codicon-file-submodule:before { content: "\f157" }
+.codicon-file-symlink-directory:before { content: "\f158" }
+.codicon-file-symlink-file:before { content: "\f159" }
+.codicon-file-zip:before { content: "\f15a" }
+.codicon-files:before { content: "\f15b" }
+.codicon-filter:before { content: "\f15c" }
+.codicon-flame:before { content: "\f15d" }
+.codicon-fold-down:before { content: "\f15e" }
+.codicon-fold-up:before { content: "\f15f" }
+.codicon-fold:before { content: "\f160" }
+.codicon-folder-active:before { content: "\f161" }
+.codicon-folder-opened:before { content: "\f162" }
+.codicon-gear:before { content: "\f163" }
+.codicon-gift:before { content: "\f164" }
+.codicon-gist-secret:before { content: "\f165" }
+.codicon-gist:before { content: "\f166" }
+.codicon-git-commit:before { content: "\f167" }
+.codicon-git-compare:before { content: "\f168" }
+.codicon-git-merge:before { content: "\f169" }
+.codicon-github-action:before { content: "\f16a" }
+.codicon-github-alt:before { content: "\f16b" }
+.codicon-globe:before { content: "\f16c" }
+.codicon-grabber:before { content: "\f16d" }
+.codicon-graph:before { content: "\f16e" }
+.codicon-gripper:before { content: "\f16f" }
+.codicon-heart:before { content: "\f170" }
+.codicon-home:before { content: "\f171" }
+.codicon-horizontal-rule:before { content: "\f172" }
+.codicon-hubot:before { content: "\f173" }
+.codicon-inbox:before { content: "\f174" }
+.codicon-issue-closed:before { content: "\f175" }
+.codicon-issue-reopened:before { content: "\f176" }
+.codicon-issues:before { content: "\f177" }
+.codicon-italic:before { content: "\f178" }
+.codicon-jersey:before { content: "\f179" }
+.codicon-json:before { content: "\f17a" }
+.codicon-kebab-vertical:before { content: "\f17b" }
+.codicon-law:before { content: "\f17c" }
+.codicon-lightbulb-autofix:before { content: "\f17d" }
+.codicon-link-external:before { content: "\f17e" }
+.codicon-link:before { content: "\f17f" }
+.codicon-list-ordered:before { content: "\f180" }
+.codicon-list-unordered:before { content: "\f181" }
+.codicon-live-share:before { content: "\f182" }
+.codicon-loading:before { content: "\f183" }
+.codicon-location:before { content: "\f184" }
+.codicon-mail-read:before { content: "\f185" }
+.codicon-mail:before { content: "\f186" }
+.codicon-markdown:before { content: "\f187" }
+.codicon-megaphone:before { content: "\f188" }
+.codicon-mention:before { content: "\f189" }
+.codicon-milestone:before { content: "\f18a" }
+.codicon-mortar-board:before { content: "\f18b" }
+.codicon-move:before { content: "\f18c" }
+.codicon-multiple-windows:before { content: "\f18d" }
+.codicon-mute:before { content: "\f18e" }
+.codicon-no-newline:before { content: "\f18f" }
+.codicon-note:before { content: "\f190" }
+.codicon-octoface:before { content: "\f191" }
+.codicon-open-preview:before { content: "\f192" }
+.codicon-package:before { content: "\f193" }
+.codicon-paintcan:before { content: "\f194" }
+.codicon-pin:before { content: "\f195" }
+.codicon-play:before { content: "\f196" }
+.codicon-plug:before { content: "\f197" }
+.codicon-preserve-case:before { content: "\f198" }
+.codicon-preview:before { content: "\f199" }
+.codicon-project:before { content: "\f19a" }
+.codicon-pulse:before { content: "\f19b" }
+.codicon-question:before { content: "\f19c" }
+.codicon-quote:before { content: "\f19d" }
+.codicon-radio-tower:before { content: "\f19e" }
+.codicon-reactions:before { content: "\f19f" }
+.codicon-references:before { content: "\f1a0" }
+.codicon-refresh:before { content: "\f1a1" }
+.codicon-regex:before { content: "\f1a2" }
+.codicon-remote:before { content: "\f1a3" }
+.codicon-remove:before { content: "\f1a4" }
+.codicon-replace-all:before { content: "\f1a5" }
+.codicon-replace:before { content: "\f1a6" }
+.codicon-repo-clone:before { content: "\f1a7" }
+.codicon-repo-force-push:before { content: "\f1a8" }
+.codicon-repo-pull:before { content: "\f1a9" }
+.codicon-repo-push:before { content: "\f1aa" }
+.codicon-report:before { content: "\f1ab" }
+.codicon-request-changes:before { content: "\f1ac" }
+.codicon-rocket:before { content: "\f1ad" }
+.codicon-root-folder-opened:before { content: "\f1ae" }
+.codicon-root-folder:before { content: "\f1af" }
+.codicon-rss:before { content: "\f1b0" }
+.codicon-ruby:before { content: "\f1b1" }
+.codicon-save-all:before { content: "\f1b2" }
+.codicon-save-as:before { content: "\f1b3" }
+.codicon-save:before { content: "\f1b4" }
+.codicon-screen-full:before { content: "\f1b5" }
+.codicon-screen-normal:before { content: "\f1b6" }
+.codicon-search-stop:before { content: "\f1b7" }
+.codicon-selection:before { content: "\f1b8" }
+.codicon-server:before { content: "\f1b9" }
+.codicon-settings:before { content: "\f1ba" }
+.codicon-shield:before { content: "\f1bb" }
+.codicon-smiley:before { content: "\f1bc" }
+.codicon-sort-precedence:before { content: "\f1bd" }
+.codicon-split-horizontal:before { content: "\f1be" }
+.codicon-split-vertical:before { content: "\f1bf" }
+.codicon-squirrel:before { content: "\f1c0" }
+.codicon-star-full:before { content: "\f1c1" }
+.codicon-star-half:before { content: "\f1c2" }
+.codicon-symbol-class:before { content: "\f1c3" }
+.codicon-symbol-color:before { content: "\f1c4" }
+.codicon-symbol-constant:before { content: "\f1c5" }
+.codicon-symbol-enum-member:before { content: "\f1c6" }
+.codicon-symbol-field:before { content: "\f1c7" }
+.codicon-symbol-file:before { content: "\f1c8" }
+.codicon-symbol-interface:before { content: "\f1c9" }
+.codicon-symbol-keyword:before { content: "\f1ca" }
+.codicon-symbol-misc:before { content: "\f1cb" }
+.codicon-symbol-operator:before { content: "\f1cc" }
+.codicon-symbol-property:before { content: "\f1cd" }
+.codicon-symbol-snippet:before { content: "\f1ce" }
+.codicon-tasklist:before { content: "\f1cf" }
+.codicon-telescope:before { content: "\f1d0" }
+.codicon-text-size:before { content: "\f1d1" }
+.codicon-three-bars:before { content: "\f1d2" }
+.codicon-thumbsdown:before { content: "\f1d3" }
+.codicon-thumbsup:before { content: "\f1d4" }
+.codicon-tools:before { content: "\f1d5" }
+.codicon-triangle-down:before { content: "\f1d6" }
+.codicon-triangle-left:before { content: "\f1d7" }
+.codicon-triangle-right:before { content: "\f1d8" }
+.codicon-triangle-up:before { content: "\f1d9" }
+.codicon-twitter:before { content: "\f1da" }
+.codicon-unfold:before { content: "\f1db" }
+.codicon-unlock:before { content: "\f1dc" }
+.codicon-unmute:before { content: "\f1dd" }
+.codicon-unverified:before { content: "\f1de" }
+.codicon-verified:before { content: "\f1df" }
+.codicon-versions:before { content: "\f1e0" }
+.codicon-vm-active:before { content: "\f1e1" }
+.codicon-vm-outline:before { content: "\f1e2" }
+.codicon-vm-running:before { content: "\f1e3" }
+.codicon-watch:before { content: "\f1e4" }
+.codicon-whitespace:before { content: "\f1e5" }
+.codicon-whole-word:before { content: "\f1e6" }
+.codicon-window:before { content: "\f1e7" }
+.codicon-word-wrap:before { content: "\f1e8" }
+.codicon-zoom-in:before { content: "\f1e9" }
+.codicon-zoom-out:before { content: "\f1ea" }
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf
index 93e1eec8e27bd8349c64cae07f87c855e83048d2..beeea24d9513097660ec7972200746989fd2bdb4 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/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css
index ed859b6ba661fe609eb0b8c8bcdcd6336dc24c37..89be99cf1a48c364bb49e843ebfafd86b9ffdfe9 100644
--- a/src/vs/base/browser/ui/iconLabel/iconlabel.css
+++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css
@@ -20,6 +20,7 @@
padding-right: 6px;
width: 16px;
height: 22px;
+ line-height: inherit !important;
display: inline-block;
/* fonts icons */
diff --git a/src/vs/base/parts/quickopen/browser/quickopen.css b/src/vs/base/parts/quickopen/browser/quickopen.css
index 97ddd6aab12b17eb8c2fdb1d942e0674dd22f2c9..b6a9b9247d0d416e9602685d29e707b0fa1f509e 100644
--- a/src/vs/base/parts/quickopen/browser/quickopen.css
+++ b/src/vs/base/parts/quickopen/browser/quickopen.css
@@ -70,7 +70,8 @@
width: 16px;
height: 16px;
margin-right: 4px;
- display: inline-block;
+ display: flex;
+ align-items: center;
vertical-align: middle;
flex-shrink: 0;
}
@@ -161,4 +162,4 @@
.monaco-quick-open-widget .quick-open-tree .monaco-highlighted-label .highlight {
font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 9c5f2238c6af9fff4b643bff81b23c09258a9ec2..32ba842a1192bc27ee713f34c048e6b9d6a3d9a9 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -954,7 +954,7 @@ export namespace SymbolKinds {
* @internal
*/
export function toCssClassName(kind: SymbolKind, inline?: boolean): string {
- return `symbol-icon ${inline ? 'inline' : 'block'} ${byKind.get(kind) || 'property'}`;
+ return `codicon ${inline ? 'inline' : 'block'} codicon-symbol-${byKind.get(kind) || 'property'}`;
}
}
diff --git a/src/vs/editor/contrib/documentSymbols/media/boolean-dark.svg b/src/vs/editor/contrib/documentSymbols/media/boolean-dark.svg
deleted file mode 100644
index e009568b131d0b4bdcfd690a2ba249f47bd58d7d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/boolean-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/boolean-light.svg b/src/vs/editor/contrib/documentSymbols/media/boolean-light.svg
deleted file mode 100644
index 06613f8beddc4329db1ea5459e759cb00edeb992..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/boolean-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/class-dark.svg b/src/vs/editor/contrib/documentSymbols/media/class-dark.svg
deleted file mode 100644
index a71e221f6bd537adda402edac79fe0538d945153..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/class-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/class-light.svg b/src/vs/editor/contrib/documentSymbols/media/class-light.svg
deleted file mode 100644
index aa106f18f8732483275909604c27543e150a67eb..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/class-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/constant-dark.svg b/src/vs/editor/contrib/documentSymbols/media/constant-dark.svg
deleted file mode 100644
index 0e90ecafcd80a1e89c68611ea71ee617ad0a3fef..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/constant-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/constant-light.svg b/src/vs/editor/contrib/documentSymbols/media/constant-light.svg
deleted file mode 100644
index 1a369c1d8aa3262445c6d07356d7f61079651a2d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/constant-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/enumerator-dark.svg b/src/vs/editor/contrib/documentSymbols/media/enumerator-dark.svg
deleted file mode 100644
index 82d4ff29c44568f1b313121f18288f4cc295be09..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/enumerator-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/enumerator-item-dark.svg b/src/vs/editor/contrib/documentSymbols/media/enumerator-item-dark.svg
deleted file mode 100644
index 23c697fdf171247f4f07bf8d360f8388c8c702c1..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/enumerator-item-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/enumerator-item-light.svg b/src/vs/editor/contrib/documentSymbols/media/enumerator-item-light.svg
deleted file mode 100644
index a99045d3352fd933d0a121fd25b579bfcae2234a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/enumerator-item-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/enumerator-light.svg b/src/vs/editor/contrib/documentSymbols/media/enumerator-light.svg
deleted file mode 100644
index e2441a0dc16370e849ac6d0b6d4e701c461cda46..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/enumerator-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/event-dark.svg b/src/vs/editor/contrib/documentSymbols/media/event-dark.svg
deleted file mode 100644
index 051bef316e95ab5de25afa1eb03f5e80679f547a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/event-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/event-light.svg b/src/vs/editor/contrib/documentSymbols/media/event-light.svg
deleted file mode 100644
index 712344d1f92ff0f3da3e666b8c599d52f3f29d11..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/event-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/field-dark.svg b/src/vs/editor/contrib/documentSymbols/media/field-dark.svg
deleted file mode 100644
index 15623061c5ddb8d5ac19e25afee5176a7c6f17d1..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/field-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/field-light.svg b/src/vs/editor/contrib/documentSymbols/media/field-light.svg
deleted file mode 100644
index 72dd79504f6774db573c6b2128f5d79d21dada1d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/field-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/file-dark.svg b/src/vs/editor/contrib/documentSymbols/media/file-dark.svg
deleted file mode 100644
index 5ed5762a1f0f501eeccd9f4582059880e389b650..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/file-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/file-light.svg b/src/vs/editor/contrib/documentSymbols/media/file-light.svg
deleted file mode 100644
index ad54e13b1b1889893be24271bae55806909f389f..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/file-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/indexer-dark.svg b/src/vs/editor/contrib/documentSymbols/media/indexer-dark.svg
deleted file mode 100644
index e92131d3d0210d804a07485dbd4fe50123a26add..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/indexer-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/indexer-light.svg b/src/vs/editor/contrib/documentSymbols/media/indexer-light.svg
deleted file mode 100644
index 207899642c8493f63bd489ecd21bb3f23d052e57..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/indexer-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/interface-dark.svg b/src/vs/editor/contrib/documentSymbols/media/interface-dark.svg
deleted file mode 100644
index 6d482b2abde623efebd0e3df8a8eb30fedba1f4f..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/interface-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/interface-light.svg b/src/vs/editor/contrib/documentSymbols/media/interface-light.svg
deleted file mode 100644
index a397dd00b005b21c8b008276219011ed13a7689d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/interface-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/keyword-dark.svg b/src/vs/editor/contrib/documentSymbols/media/keyword-dark.svg
deleted file mode 100644
index 70ba6ea9331b81462b56f44e94773986caa79946..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/keyword-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/keyword-light.svg b/src/vs/editor/contrib/documentSymbols/media/keyword-light.svg
deleted file mode 100644
index fc57528a3efa063910ee1bf314277886b39244ae..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/keyword-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/method-dark.svg b/src/vs/editor/contrib/documentSymbols/media/method-dark.svg
deleted file mode 100644
index 970d7b61480f924c968a8df1673a5e5f509fd854..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/method-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/method-light.svg b/src/vs/editor/contrib/documentSymbols/media/method-light.svg
deleted file mode 100644
index 403a9b90dd9bf4c7124adc81a8021e466898082b..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/method-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/namespace-dark.svg b/src/vs/editor/contrib/documentSymbols/media/namespace-dark.svg
deleted file mode 100644
index 9a725bb41fddf7206e460517f2488a89eeb5d2e9..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/namespace-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/namespace-light.svg b/src/vs/editor/contrib/documentSymbols/media/namespace-light.svg
deleted file mode 100644
index 1339da7ce21412b692d1c1dd72b24e80b7301d13..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/namespace-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/numeric-dark.svg b/src/vs/editor/contrib/documentSymbols/media/numeric-dark.svg
deleted file mode 100644
index a1573df010781e44cff0087871413e4f6b44e908..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/numeric-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/numeric-light.svg b/src/vs/editor/contrib/documentSymbols/media/numeric-light.svg
deleted file mode 100644
index ea0e56e022524e3f754d59b83675d7fdec444780..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/numeric-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/operator-dark.svg b/src/vs/editor/contrib/documentSymbols/media/operator-dark.svg
deleted file mode 100644
index 957f5f44f17802f33bd9e0bad3e21ebd355feb9e..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/operator-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/operator-light.svg b/src/vs/editor/contrib/documentSymbols/media/operator-light.svg
deleted file mode 100644
index bf6ed57996a7189fcaaf6145972d4c60b9d1d540..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/operator-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/outlineTree.css b/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
index 4d97a722d9d3fa1771ff4b2865b7ed8e78efbb9d..e7953bf8ec6b3f6f6e090c34301320d393e3eb81 100644
--- a/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
+++ b/src/vs/editor/contrib/documentSymbols/media/outlineTree.css
@@ -39,3 +39,7 @@
font-size: 14px;
opacity: 0.4;
}
+
+.monaco-list .outline-element .outline-element-icon {
+ margin-right: 4px;
+}
diff --git a/src/vs/editor/contrib/documentSymbols/media/property-dark.svg b/src/vs/editor/contrib/documentSymbols/media/property-dark.svg
deleted file mode 100644
index 23e07ffa19b14fc66fc855f0b379f9872b598d53..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/property-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/property-light.svg b/src/vs/editor/contrib/documentSymbols/media/property-light.svg
deleted file mode 100644
index be642dd152dce3fe7af423c9adb77866ba883825..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/property-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/snippet-dark.svg b/src/vs/editor/contrib/documentSymbols/media/snippet-dark.svg
deleted file mode 100644
index 79799f98c261f310d91ce56056190f9f420f625c..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/snippet-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/snippet-light.svg b/src/vs/editor/contrib/documentSymbols/media/snippet-light.svg
deleted file mode 100644
index 45fa3a001e81d043df032c991de4e778e3ff6f9d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/snippet-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/string-dark.svg b/src/vs/editor/contrib/documentSymbols/media/string-dark.svg
deleted file mode 100644
index 80fb9d6567d7d8e715a64ff54aec090c33266449..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/string-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/string-light.svg b/src/vs/editor/contrib/documentSymbols/media/string-light.svg
deleted file mode 100644
index 02a0282e90666d23b7dabe12c2d93629d7df4eca..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/string-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/structure-dark.svg b/src/vs/editor/contrib/documentSymbols/media/structure-dark.svg
deleted file mode 100644
index 13766a5dcea167f56ae70f4bee30ca990ffe207e..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/structure-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/structure-light.svg b/src/vs/editor/contrib/documentSymbols/media/structure-light.svg
deleted file mode 100644
index c96bcfa61b02b35eb56c43579cace6cab97f7cae..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/structure-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css b/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
index 0504a233a63884599927d2af1289a62e4899c5fd..0885772974fd4216577df583e4ef298250288dbd 100644
--- a/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
+++ b/src/vs/editor/contrib/documentSymbols/media/symbol-icons.css
@@ -9,9 +9,9 @@
}
.monaco-workbench .symbol-icon.inline {
- background-position: left center;
- padding-left: 20px;
- background-size: 16px 16px;
+ display: flex;
+ align-items: center;
+ padding-left: 0;
}
.monaco-workbench .symbol-icon.block {
@@ -22,267 +22,3 @@
min-width: 16px;
background-position: center;
}
-
-/* default icons */
-.monaco-workbench .symbol-icon {
- background-image: url('field-light.svg');
- background-repeat: no-repeat;
-}
-.vs-dark .monaco-workbench .symbol-icon,
-.hc-black .monaco-workbench .symbol-icon {
- background-image: url('field-dark.svg');
-}
-
-/* constant */
-.monaco-workbench .symbol-icon.constant {
- background-image: url('constant-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.constant,
-.hc-black .monaco-workbench .symbol-icon.constant {
- background-image: url('constant-dark.svg');
-}
-
-/* enum */
-.monaco-workbench .symbol-icon.enum {
- background-image: url('enumerator-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.enum,
-.hc-black .monaco-workbench .symbol-icon.enum {
- background-image: url('enumerator-dark.svg');
-}
-
-/* enum-member */
-.monaco-workbench .symbol-icon.enum-member {
- background-image: url('enumerator-item-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.enum-member,
-.hc-black .monaco-workbench .symbol-icon.enum-member {
- background-image: url('enumerator-item-dark.svg');
-}
-
-/* struct */
-.monaco-workbench .symbol-icon.struct {
- background-image: url('structure-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.struct,
-.hc-black .monaco-workbench .symbol-icon.struct {
- background-image: url('structure-dark.svg');
-}
-
-/* event */
-.monaco-workbench .symbol-icon.event {
- background-image: url('event-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.event,
-.hc-black .monaco-workbench .symbol-icon.event {
- background-image: url('event-dark.svg');
-}
-
-/* operator */
-.monaco-workbench .symbol-icon.operator {
- background-image: url('operator-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.operator,
-.hc-black .monaco-workbench .symbol-icon.operator {
- background-image: url('operator-dark.svg');
-}
-
-/* type paramter */
-.monaco-workbench .symbol-icon.type-parameter {
- background-image: url('template-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.type-parameter,
-.hc-black .monaco-workbench .symbol-icon.type-parameter {
- background-image: url('template-dark.svg');
-}
-
-/* boolean, null */
-.monaco-workbench .symbol-icon.boolean {
- background-image: url('boolean-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.boolean,
-.hc-black .monaco-workbench .symbol-icon.boolean {
- background-image: url('boolean-dark.svg');
-}
-
-/* null */
-.monaco-workbench .symbol-icon.null {
- background-image: url('boolean-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.null,
-.hc-black .monaco-workbench .symbol-icon.null {
- background-image: url('boolean-dark.svg');
-}
-
-/* class */
-.monaco-workbench .symbol-icon.class {
- background-image: url('class-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.class,
-.hc-black .monaco-workbench .symbol-icon.class {
- background-image: url('class-dark.svg');
-}
-
-/* constructor */
-.monaco-workbench .symbol-icon.constructor {
- background-image: url('method-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.constructor,
-.hc-black .monaco-workbench .symbol-icon.constructor {
- background-image: url('method-dark.svg');
-}
-
-/* file */
-.monaco-workbench .symbol-icon.file {
- background-image: url('file-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.file,
-.hc-black .monaco-workbench .symbol-icon.file {
- background-image: url('file-dark.svg');
-}
-
-/* field */
-.monaco-workbench .symbol-icon.field {
- background-image: url('field-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.field,
-.hc-black .monaco-workbench .symbol-icon.field {
- background-image: url('field-dark.svg');
-}
-
-/* variable */
-.monaco-workbench .symbol-icon.variable {
- background-image: url('variable-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.variable,
-.hc-black .monaco-workbench .symbol-icon.variable {
- background-image: url('variable-dark.svg');
-}
-
-/* array */
-.monaco-workbench .symbol-icon.array {
- background-image: url('indexer-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.array,
-.hc-black .monaco-workbench .symbol-icon.array {
- background-image: url('indexer-dark.svg');
-}
-
-/* keyword */
-/* todo@joh not used? */
-.monaco-workbench .symbol-icon.keyword {
- background-image: url('keyword-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.keyword,
-.hc-black .monaco-workbench .symbol-icon.keyword {
- background-image: url('keyword-dark.svg');
-}
-
-/* interface */
-.monaco-workbench .symbol-icon.interface {
- background-image: url('interface-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.interface,
-.hc-black .monaco-workbench .symbol-icon.interface {
- background-image: url('interface-dark.svg');
-}
-
-/* method */
-.monaco-workbench .symbol-icon.method {
- background-image: url('method-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.method,
-.hc-black .monaco-workbench .symbol-icon.method {
- background-image: url('method-dark.svg');
-}
-
-/* function */
-.monaco-workbench .symbol-icon.function {
- background-image: url('method-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.function,
-.hc-black .monaco-workbench .symbol-icon.function {
- background-image: url('method-dark.svg');
-}
-
-/* object */
-.monaco-workbench .symbol-icon.object {
- background-image: url('namespace-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.object,
-.hc-black .monaco-workbench .symbol-icon.object {
- background-image: url('namespace-dark.svg');
-}
-
-/* namespace */
-.monaco-workbench .symbol-icon.namespace {
- background-image: url('namespace-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.namespace,
-.hc-black .monaco-workbench .symbol-icon.namespace {
- background-image: url('namespace-dark.svg');
-}
-
-/* package */
-.monaco-workbench .symbol-icon.package {
- background-image: url('namespace-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.package,
-.hc-black .monaco-workbench .symbol-icon.package {
- background-image: url('namespace-dark.svg');
-}
-
-/* module */
-.monaco-workbench .symbol-icon.module {
- background-image: url('namespace-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.module,
-.hc-black .monaco-workbench .symbol-icon.module {
- background-image: url('namespace-dark.svg');
-}
-
-/* number */
-.monaco-workbench .symbol-icon.number {
- background-image: url('numeric-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.number,
-.hc-black .monaco-workbench .symbol-icon.number {
- background-image: url('numeric-dark.svg');
-}
-
-/* property */
-.monaco-workbench .symbol-icon.property {
- background-image: url('property-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.property,
-.hc-black .monaco-workbench .symbol-icon.property {
- background-image: url('property-dark.svg');
-}
-
-/* snippet */
-/* todo@joh unused? */
-.monaco-workbench .symbol-icon.snippet {
- background-image: url('snippet-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.snippet,
-.hc-black .monaco-workbench .symbol-icon.snippet {
- background-image: url('snippet-dark.svg');
-}
-
-/* string */
-.monaco-workbench .symbol-icon.string {
- background-image: url('string-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.string,
-.hc-black .monaco-workbench .symbol-icon.string {
- background-image: url('string-dark.svg');
-}
-
-/* key */
-.monaco-workbench .symbol-icon.key {
- background-image: url('string-light.svg');
-}
-.vs-dark .monaco-workbench .symbol-icon.key,
-.hc-black .monaco-workbench .symbol-icon.key {
- background-image: url('string-dark.svg');
-}
diff --git a/src/vs/editor/contrib/documentSymbols/media/template-dark.svg b/src/vs/editor/contrib/documentSymbols/media/template-dark.svg
deleted file mode 100644
index 425ced36f0eaffeb1c013db42f876f74adbb6a9a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/template-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/template-light.svg b/src/vs/editor/contrib/documentSymbols/media/template-light.svg
deleted file mode 100644
index 496d8f7c85c15b9d0be1ea85110849235418410a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/template-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/variable-dark.svg b/src/vs/editor/contrib/documentSymbols/media/variable-dark.svg
deleted file mode 100644
index 687fcabfff5645beeeb791b60380fd283c6db0ca..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/variable-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/media/variable-light.svg b/src/vs/editor/contrib/documentSymbols/media/variable-light.svg
deleted file mode 100644
index ede7e9434dd4ee669a54a7899d77ba208c4b1765..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/documentSymbols/media/variable-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/documentSymbols/outlineTree.ts b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
index 6112e53b9dd734e1c7935b6bd415ed1ac2c72e5c..befef082d67c15bc68880edd700594e4606fe719 100644
--- a/src/vs/editor/contrib/documentSymbols/outlineTree.ts
+++ b/src/vs/editor/contrib/documentSymbols/outlineTree.ts
@@ -19,8 +19,8 @@ import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { OutlineConfigKeys } from 'vs/editor/contrib/documentSymbols/outline';
import { MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { listErrorForeground, listWarningForeground } from 'vs/platform/theme/common/colorRegistry';
+import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { registerColor, listErrorForeground, listWarningForeground, foreground } from 'vs/platform/theme/common/colorRegistry';
import { IdleValue } from 'vs/base/common/async';
export type OutlineItem = OutlineGroup | OutlineElement;
@@ -56,6 +56,7 @@ export class OutlineElementTemplate {
constructor(
readonly container: HTMLElement,
readonly iconLabel: IconLabel,
+ readonly iconClass: HTMLElement,
readonly decoration: HTMLElement,
) { }
}
@@ -110,9 +111,11 @@ export class OutlineElementRenderer implements ITreeRenderer, index: number, template: OutlineElementTemplate): void {
@@ -125,7 +128,8 @@ export class OutlineElementRenderer implements ITreeRenderer= 0) {
options.extraClasses.push(`deprecated`);
@@ -273,3 +277,398 @@ export class OutlineDataSource implements IDataSource
return values(element.children);
}
}
+
+export const SYMBOL_ICON_ARRAY_FOREGROUND = registerColor('symbolIcon.arrayForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.arrayForeground', 'The foreground color for array symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_BOOLEAN_FOREGROUND = registerColor('symbolIcon.booleanForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.booleanForeground', 'The foreground color for boolean symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_CLASS_FOREGROUND = registerColor('symbolIcon.classForeground', {
+ dark: '#EE9D28',
+ light: '#D67E00',
+ hc: '#EE9D28'
+}, localize('symbolIcon.classForeground', 'The foreground color for class symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_CONSTANT_FOREGROUND = registerColor('symbolIcon.contstantForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.contstantForeground', 'The foreground color for contstant symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_CONSTRUCTOR_FOREGROUND = registerColor('symbolIcon.constructorForeground', {
+ dark: '#B180D7',
+ light: '#652D90',
+ hc: '#B180D7'
+}, localize('symbolIcon.constructorForeground', 'The foreground color for constructor symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enumeratorForeground', {
+ dark: '#EE9D28',
+ light: '#D67E00',
+ hc: '#EE9D28'
+}, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND = registerColor('symbolIcon.enumeratorMemberForeground', {
+ dark: '#75BEFF',
+ light: '#007ACC',
+ hc: '#75BEFF'
+}, localize('symbolIcon.enumeratorMemberForeground', 'The foreground color for enumerator member symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_EVENT_FOREGROUND = registerColor('symbolIcon.eventForeground', {
+ dark: '#EE9D28',
+ light: '#D67E00',
+ hc: '#EE9D28'
+}, localize('symbolIcon.eventForeground', 'The foreground color for event symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_FIELD_FOREGROUND = registerColor('symbolIcon.fieldForeground', {
+ dark: '#75BEFF',
+ light: '#007ACC',
+ hc: '#75BEFF'
+}, localize('symbolIcon.fieldForeground', 'The foreground color for field symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_FILE_FOREGROUND = registerColor('symbolIcon.fileForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.fileForeground', 'The foreground color for file symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_FUNCTION_FOREGROUND = registerColor('symbolIcon.functionForeground', {
+ dark: '#B180D7',
+ light: '#652D90',
+ hc: '#B180D7'
+}, localize('symbolIcon.functionForeground', 'The foreground color for function symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_INTERFACE_FOREGROUND = registerColor('symbolIcon.interfaceForeground', {
+ dark: '#75BEFF',
+ light: '#007ACC',
+ hc: '#75BEFF'
+}, localize('symbolIcon.interfaceForeground', 'The foreground color for interface symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_KEY_FOREGROUND = registerColor('symbolIcon.keyForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.keyForeground', 'The foreground color for key symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodForeground', {
+ dark: '#B180D7',
+ light: '#652D90',
+ hc: '#B180D7'
+}, localize('symbolIcon.methodForeground', 'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_NULL_FOREGROUND = registerColor('symbolIcon.nullForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.nullForeground', 'The foreground color for null symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_NUMBER_FOREGROUND = registerColor('symbolIcon.numberForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.numberForeground', 'The foreground color for number symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_OBJECT_FOREGROUND = registerColor('symbolIcon.objectForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.objectForeground', 'The foreground color for object symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_OPERATOR_FOREGROUND = registerColor('symbolIcon.operatorForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.operatorForeground', 'The foreground color for operator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_PACKAGE_FOREGROUND = registerColor('symbolIcon.packageForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.packageForeground', 'The foreground color for package symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_PROPERTY_FOREGROUND = registerColor('symbolIcon.propertyForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.propertyForeground', 'The foreground color for property symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_STRING_FOREGROUND = registerColor('symbolIcon.stringForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.stringForeground', 'The foreground color for string symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_STRUCT_FOREGROUND = registerColor('symbolIcon.structForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.structForeground', 'The foreground color for struct symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_TYPEPARAMETER_FOREGROUND = registerColor('symbolIcon.typeParameterForeground', {
+ dark: foreground,
+ light: foreground,
+ hc: foreground
+}, localize('symbolIcon.typeParameterForeground', 'The foreground color for type parameter symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+export const SYMBOL_ICON_VARIABLE_FOREGROUND = registerColor('symbolIcon.variableForeground', {
+ dark: '#75BEFF',
+ light: '#007ACC',
+ hc: '#75BEFF'
+}, localize('symbolIcon.variableForeground', 'The foreground color for variable symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+
+ const symbolIconArrayColor = theme.getColor(SYMBOL_ICON_ARRAY_FOREGROUND);
+ if (symbolIconArrayColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-array {
+ color: ${symbolIconArrayColor};
+ }
+ `);
+ }
+
+ const symbolIconBooleanColor = theme.getColor(SYMBOL_ICON_BOOLEAN_FOREGROUND);
+ if (symbolIconBooleanColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-boolean {
+ color: ${symbolIconBooleanColor};
+ }
+ `);
+ }
+
+ const symbolIconClassColor = theme.getColor(SYMBOL_ICON_CLASS_FOREGROUND);
+ if (symbolIconClassColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-class {
+ color: ${symbolIconClassColor};
+ }
+ `);
+ }
+
+ const symbolIconMethodColor = theme.getColor(SYMBOL_ICON_METHOD_FOREGROUND);
+ if (symbolIconMethodColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-method {
+ color: ${symbolIconMethodColor};
+ }
+ `);
+ }
+
+ const symbolIconConstantColor = theme.getColor(SYMBOL_ICON_CONSTANT_FOREGROUND);
+ if (symbolIconConstantColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-constant {
+ color: ${symbolIconConstantColor};
+ }
+ `);
+ }
+
+ const symbolIconConstructorColor = theme.getColor(SYMBOL_ICON_CONSTRUCTOR_FOREGROUND);
+ if (symbolIconConstructorColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-constructor {
+ color: ${symbolIconConstructorColor};
+ }
+ `);
+ }
+
+ const symbolIconEnumeratorColor = theme.getColor(SYMBOL_ICON_ENUMERATOR_FOREGROUND);
+ if (symbolIconEnumeratorColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-value,
+ .monaco-workbench .codicon-symbol-enum {
+ color: ${symbolIconEnumeratorColor};
+ }
+ `);
+ }
+
+ const symbolIconEnumeratorMemberColor = theme.getColor(SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND);
+ if (symbolIconEnumeratorMemberColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-enum-member {
+ color: ${symbolIconEnumeratorMemberColor};
+ }
+ `);
+ }
+
+ const symbolIconEventColor = theme.getColor(SYMBOL_ICON_EVENT_FOREGROUND);
+ if (symbolIconEventColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-event {
+ color: ${symbolIconEventColor};
+ }
+ `);
+ }
+
+ const symbolIconFieldColor = theme.getColor(SYMBOL_ICON_FIELD_FOREGROUND);
+ if (symbolIconFieldColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-field {
+ color: ${symbolIconFieldColor};
+ }
+ `);
+ }
+
+ const symbolIconFileColor = theme.getColor(SYMBOL_ICON_FILE_FOREGROUND);
+ if (symbolIconFileColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-file {
+ color: ${symbolIconFileColor};
+ }
+ `);
+ }
+
+ const symbolIconFunctionColor = theme.getColor(SYMBOL_ICON_FUNCTION_FOREGROUND);
+ if (symbolIconFunctionColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-function {
+ color: ${symbolIconFunctionColor};
+ }
+ `);
+ }
+
+ const symbolIconInterfaceColor = theme.getColor(SYMBOL_ICON_INTERFACE_FOREGROUND);
+ if (symbolIconInterfaceColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-interface {
+ color: ${symbolIconInterfaceColor};
+ }
+ `);
+ }
+
+ const symbolIconKeyColor = theme.getColor(SYMBOL_ICON_KEY_FOREGROUND);
+ if (symbolIconKeyColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-key {
+ color: ${symbolIconKeyColor};
+ }
+ `);
+ }
+
+ const symbolIconModuleColor = theme.getColor(SYMBOL_ICON_MODULE_FOREGROUND);
+ if (symbolIconModuleColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-module {
+ color: ${symbolIconModuleColor};
+ }
+ `);
+ }
+
+ const outlineNamespaceColor = theme.getColor(SYMBOL_ICON_NAMESPACE_FOREGROUND);
+ if (outlineNamespaceColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-namespace {
+ color: ${outlineNamespaceColor};
+ }
+ `);
+ }
+
+ const symbolIconNullColor = theme.getColor(SYMBOL_ICON_NULL_FOREGROUND);
+ if (symbolIconNullColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-null {
+ color: ${symbolIconNullColor};
+ }
+ `);
+ }
+
+ const symbolIconNumberColor = theme.getColor(SYMBOL_ICON_NUMBER_FOREGROUND);
+ if (symbolIconNumberColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-number {
+ color: ${symbolIconNumberColor};
+ }
+ `);
+ }
+
+ const symbolIconObjectColor = theme.getColor(SYMBOL_ICON_OBJECT_FOREGROUND);
+ if (symbolIconObjectColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-object {
+ color: ${symbolIconObjectColor};
+ }
+ `);
+ }
+
+ const symbolIconOperatorColor = theme.getColor(SYMBOL_ICON_OPERATOR_FOREGROUND);
+ if (symbolIconOperatorColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-operator {
+ color: ${symbolIconOperatorColor};
+ }
+ `);
+ }
+
+ const symbolIconPackageColor = theme.getColor(SYMBOL_ICON_PACKAGE_FOREGROUND);
+ if (symbolIconPackageColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-package {
+ color: ${symbolIconPackageColor};
+ }
+ `);
+ }
+
+ const symbolIconPropertyColor = theme.getColor(SYMBOL_ICON_PROPERTY_FOREGROUND);
+ if (symbolIconPropertyColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-property {
+ color: ${symbolIconPropertyColor};
+ }
+ `);
+ }
+
+ const symbolIconStringColor = theme.getColor(SYMBOL_ICON_STRING_FOREGROUND);
+ if (symbolIconStringColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-string {
+ color: ${symbolIconStringColor};
+ }
+ `);
+ }
+
+ const symbolIconStructColor = theme.getColor(SYMBOL_ICON_STRUCT_FOREGROUND);
+ if (symbolIconStructColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-struct {
+ color: ${symbolIconStructColor};
+ }
+ `);
+ }
+
+ const symbolIconTypeParameterColor = theme.getColor(SYMBOL_ICON_TYPEPARAMETER_FOREGROUND);
+ if (symbolIconTypeParameterColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-type-parameter {
+ color: ${symbolIconTypeParameterColor};
+ }
+ `);
+ }
+
+ const symbolIconVariableColor = theme.getColor(SYMBOL_ICON_VARIABLE_FOREGROUND);
+ if (symbolIconVariableColor) {
+ collector.addRule(`
+ .monaco-workbench .codicon-symbol-variable {
+ color: ${symbolIconVariableColor};
+ }
+ `);
+ }
+
+});
diff --git a/src/vs/editor/contrib/suggest/media/class-dark.svg b/src/vs/editor/contrib/suggest/media/class-dark.svg
deleted file mode 100644
index a71e221f6bd537adda402edac79fe0538d945153..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/class-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/class-light.svg b/src/vs/editor/contrib/suggest/media/class-light.svg
deleted file mode 100644
index aa106f18f8732483275909604c27543e150a67eb..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/class-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/close-dark.svg b/src/vs/editor/contrib/suggest/media/close-dark.svg
deleted file mode 100644
index 556e2e20992416201e82dc7bd934184cf93cd64f..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/close-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/close-light.svg b/src/vs/editor/contrib/suggest/media/close-light.svg
deleted file mode 100644
index c84816a03248530290642cb717035388500147e6..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/close-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/color-dark.svg b/src/vs/editor/contrib/suggest/media/color-dark.svg
deleted file mode 100644
index 0914abcdbd3e13fe20172de662349dcf79df3231..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/color-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/color-light.svg b/src/vs/editor/contrib/suggest/media/color-light.svg
deleted file mode 100644
index ca089a1bf2ab169ed638ef14ed2224c6c4e04336..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/color-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/constant-dark.svg b/src/vs/editor/contrib/suggest/media/constant-dark.svg
deleted file mode 100644
index 0e90ecafcd80a1e89c68611ea71ee617ad0a3fef..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/constant-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/constant-light.svg b/src/vs/editor/contrib/suggest/media/constant-light.svg
deleted file mode 100644
index 1a369c1d8aa3262445c6d07356d7f61079651a2d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/constant-light.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/enumerator-dark.svg b/src/vs/editor/contrib/suggest/media/enumerator-dark.svg
deleted file mode 100644
index 82d4ff29c44568f1b313121f18288f4cc295be09..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/enumerator-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/enumerator-item-dark.svg b/src/vs/editor/contrib/suggest/media/enumerator-item-dark.svg
deleted file mode 100644
index 23c697fdf171247f4f07bf8d360f8388c8c702c1..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/enumerator-item-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/enumerator-item-light.svg b/src/vs/editor/contrib/suggest/media/enumerator-item-light.svg
deleted file mode 100644
index a99045d3352fd933d0a121fd25b579bfcae2234a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/enumerator-item-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/enumerator-light.svg b/src/vs/editor/contrib/suggest/media/enumerator-light.svg
deleted file mode 100644
index e2441a0dc16370e849ac6d0b6d4e701c461cda46..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/enumerator-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/event-dark.svg b/src/vs/editor/contrib/suggest/media/event-dark.svg
deleted file mode 100644
index 712344d1f92ff0f3da3e666b8c599d52f3f29d11..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/event-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/event-light.svg b/src/vs/editor/contrib/suggest/media/event-light.svg
deleted file mode 100644
index 712344d1f92ff0f3da3e666b8c599d52f3f29d11..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/event-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/field-dark.svg b/src/vs/editor/contrib/suggest/media/field-dark.svg
deleted file mode 100644
index 15623061c5ddb8d5ac19e25afee5176a7c6f17d1..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/field-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/field-light.svg b/src/vs/editor/contrib/suggest/media/field-light.svg
deleted file mode 100644
index 72dd79504f6774db573c6b2128f5d79d21dada1d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/field-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/file-dark.svg b/src/vs/editor/contrib/suggest/media/file-dark.svg
deleted file mode 100644
index 5ed5762a1f0f501eeccd9f4582059880e389b650..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/file-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/file-light.svg b/src/vs/editor/contrib/suggest/media/file-light.svg
deleted file mode 100644
index ad54e13b1b1889893be24271bae55806909f389f..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/file-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/folder-dark.svg b/src/vs/editor/contrib/suggest/media/folder-dark.svg
deleted file mode 100644
index 43d454e7e5ac12898289fc6b229066065d543a08..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/folder-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/folder-light.svg b/src/vs/editor/contrib/suggest/media/folder-light.svg
deleted file mode 100644
index 8daecdac6a358b5d789ed6e6f02dee0b4c7a48c3..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/folder-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/info-dark.svg b/src/vs/editor/contrib/suggest/media/info-dark.svg
deleted file mode 100644
index 3f2d84fa649ba813e5fd0f60ef9dc879dd2c1999..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/info-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/info-light.svg b/src/vs/editor/contrib/suggest/media/info-light.svg
deleted file mode 100644
index f25ac7c78d66a7cfaef941d58c8a26e61cb544ab..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/info-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/interface-dark.svg b/src/vs/editor/contrib/suggest/media/interface-dark.svg
deleted file mode 100644
index 6d482b2abde623efebd0e3df8a8eb30fedba1f4f..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/interface-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/interface-light.svg b/src/vs/editor/contrib/suggest/media/interface-light.svg
deleted file mode 100644
index a397dd00b005b21c8b008276219011ed13a7689d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/interface-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/keyword-dark.svg b/src/vs/editor/contrib/suggest/media/keyword-dark.svg
deleted file mode 100644
index 70ba6ea9331b81462b56f44e94773986caa79946..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/keyword-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/keyword-light.svg b/src/vs/editor/contrib/suggest/media/keyword-light.svg
deleted file mode 100644
index fc57528a3efa063910ee1bf314277886b39244ae..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/keyword-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/method-dark.svg b/src/vs/editor/contrib/suggest/media/method-dark.svg
deleted file mode 100644
index 970d7b61480f924c968a8df1673a5e5f509fd854..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/method-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/method-light.svg b/src/vs/editor/contrib/suggest/media/method-light.svg
deleted file mode 100644
index 403a9b90dd9bf4c7124adc81a8021e466898082b..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/method-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/namespace-dark.svg b/src/vs/editor/contrib/suggest/media/namespace-dark.svg
deleted file mode 100644
index 9a725bb41fddf7206e460517f2488a89eeb5d2e9..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/namespace-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/namespace-light.svg b/src/vs/editor/contrib/suggest/media/namespace-light.svg
deleted file mode 100644
index 1339da7ce21412b692d1c1dd72b24e80b7301d13..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/namespace-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/operator-dark.svg b/src/vs/editor/contrib/suggest/media/operator-dark.svg
deleted file mode 100644
index 957f5f44f17802f33bd9e0bad3e21ebd355feb9e..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/operator-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/operator-light.svg b/src/vs/editor/contrib/suggest/media/operator-light.svg
deleted file mode 100644
index bf6ed57996a7189fcaaf6145972d4c60b9d1d540..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/operator-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/property-dark.svg b/src/vs/editor/contrib/suggest/media/property-dark.svg
deleted file mode 100644
index 23e07ffa19b14fc66fc855f0b379f9872b598d53..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/property-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/property-light.svg b/src/vs/editor/contrib/suggest/media/property-light.svg
deleted file mode 100644
index be642dd152dce3fe7af423c9adb77866ba883825..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/property-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/reference-dark.svg b/src/vs/editor/contrib/suggest/media/reference-dark.svg
deleted file mode 100644
index ed302ae139840c6b01a5e698b24e24c08ae279e0..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/reference-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/reference-light.svg b/src/vs/editor/contrib/suggest/media/reference-light.svg
deleted file mode 100644
index 392a840c5ef6f6766f2308794deb4b4e273dc252..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/reference-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/ruler-dark.svg b/src/vs/editor/contrib/suggest/media/ruler-dark.svg
deleted file mode 100644
index 1957dbad34eb835dd7e67ba7643891f2941aaae7..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/ruler-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/ruler-light.svg b/src/vs/editor/contrib/suggest/media/ruler-light.svg
deleted file mode 100644
index bc321cdffa3b335de879ef7972a762723b490f9c..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/ruler-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/snippet-dark.svg b/src/vs/editor/contrib/suggest/media/snippet-dark.svg
deleted file mode 100644
index 79799f98c261f310d91ce56056190f9f420f625c..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/snippet-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/snippet-light.svg b/src/vs/editor/contrib/suggest/media/snippet-light.svg
deleted file mode 100644
index 45fa3a001e81d043df032c991de4e778e3ff6f9d..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/snippet-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/string-dark.svg b/src/vs/editor/contrib/suggest/media/string-dark.svg
deleted file mode 100644
index 80fb9d6567d7d8e715a64ff54aec090c33266449..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/string-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/string-light.svg b/src/vs/editor/contrib/suggest/media/string-light.svg
deleted file mode 100644
index 02a0282e90666d23b7dabe12c2d93629d7df4eca..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/string-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/structure-dark.svg b/src/vs/editor/contrib/suggest/media/structure-dark.svg
deleted file mode 100644
index 13766a5dcea167f56ae70f4bee30ca990ffe207e..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/structure-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/structure-light.svg b/src/vs/editor/contrib/suggest/media/structure-light.svg
deleted file mode 100644
index c96bcfa61b02b35eb56c43579cace6cab97f7cae..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/structure-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css
index 197145ad27d7396705b42259daf3f239eab46968..23cdc3ef285dbffc4f000cc1082efeeeeea735c6 100644
--- a/src/vs/editor/contrib/suggest/media/suggest.css
+++ b/src/vs/editor/contrib/suggest/media/suggest.css
@@ -110,28 +110,22 @@
/** Icon styles **/
-.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .close,
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore {
+.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .codicon-close,
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore::before {
+ color: inherit;
opacity: 0.6;
- background-position: center center;
- background-repeat: no-repeat;
- background-size: 70%;
+ font-size: 14px;
+ margin-left: 4px;
cursor: pointer;
}
-.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .close {
- background-image: url('./close-light.svg');
+.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .codicon-close {
position: absolute;
- top: 0;
- right: 0;
- margin-right: 5px;
-}
-
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore {
- background-image: url('./info-light.svg');
+ top: 2px;
+ right: 2px;
}
-.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .close:hover,
+.monaco-editor .suggest-widget .details > .monaco-scrollable-element > .body > .header > .codicon-close:hover,
.monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore:hover {
opacity: 1;
}
@@ -193,45 +187,17 @@
display: none;
}
+.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon {
+ display: flex;
+ align-items: center;
+ margin-right: 4px;
+}
+
.monaco-editor .suggest-widget.no-icons .monaco-list .monaco-list-row .icon,
-.monaco-editor .suggest-widget.no-icons .monaco-list .monaco-list-row .monaco-icon-label.suggest-icon::before {
+.monaco-editor .suggest-widget.no-icons .monaco-list .monaco-list-row .suggest-icon::before {
display: none;
}
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .monaco-icon-label.suggest-icon::before {
- content: ' ';
- background-repeat: no-repeat;
- background-position: center;
- background-size: 75%;
-}
-
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.method::before,
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.function::before,
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constructor::before { background-image: url('method-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.field::before { background-image: url('field-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.event::before { background-image: url('event-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.operator::before { background-image: url('operator-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.variable::before { background-image: url('variable-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.class::before { background-image: url('class-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.interface::before { background-image: url('interface-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.struct::before { background-image: url('structure-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.type-parameter::before { background-image: url('template-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.module::before { background-image: url('namespace-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.property::before { background-image: url('property-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.unit::before { background-image: url('ruler-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constant::before { background-image: url('constant-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.value::before,
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum::before { background-image: url('enumerator-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum-member::before { background-image: url('enumerator-item-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.keyword::before { background-image: url('keyword-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.text::before { background-image: url('string-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.color::before { background-image: url('color-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.file::before { background-image: url('file-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.reference::before { background-image: url('reference-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.snippet::before { background-image: url('snippet-light.svg'); }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.customcolor::before { background-image: none; }
-.monaco-editor .suggest-widget .monaco-list .monaco-list-row .suggest-icon.folder::before { background-image: url('folder-light.svg'); }
-
.monaco-editor .suggest-widget .monaco-list .monaco-list-row .icon.customcolor .colorspan {
margin: 0 0 0 0.3em;
border: 0.1em solid #000;
@@ -313,90 +279,3 @@
border-radius: 3px;
padding: 0 0.4em;
}
-
-/* High Contrast and Dark Theming */
-
-.monaco-editor.vs-dark .suggest-widget .details > .monaco-scrollable-element > .body > .header > .close,
-.monaco-editor.hc-black .suggest-widget .details > .monaco-scrollable-element > .body > .header > .close {
- background-image: url('./close-dark.svg');
-}
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .readMore {
- background-image: url('./info-dark.svg');
-}
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.method::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.method::before,
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.function::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.function::before,
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constructor::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constructor::before { background-image: url('method-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.field::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.field::before { background-image: url('field-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.event::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.event::before { background-image: url('event-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.operator::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.operator::before { background-image: url('operator-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.variable::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.variable::before { background-image: url('variable-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.class::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.class::before { background-image: url('class-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.interface::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.interface::before { background-image: url('interface-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.struct::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.struct::before { background-image: url('structure-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.type-parameter::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.type-parameter::before { background-image: url('template-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.module::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.module::before { background-image: url('namespace-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.property::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.property::before { background-image: url('property-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.unit::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.unit::before { background-image: url('ruler-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constant::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.constant::before { background-image: url('constant-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.value::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.value::before,
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum::before { background-image: url('enumerator-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum-member::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.enum-member::before { background-image: url('enumerator-item-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.keyword::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.keyword::before { background-image: url('keyword-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.text::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.text::before { background-image: url('string-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.color::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.color::before { background-image: url('color-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.file::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.file::before { background-image: url('file-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.reference::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.reference::before { background-image: url('reference-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.snippet::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.snippet::before { background-image: url('snippet-dark.svg'); }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.customcolor::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.customcolor::before { background-image: none; }
-
-.monaco-editor.vs-dark .suggest-widget .monaco-list .monaco-list-row .suggest-icon.folder::before,
-.monaco-editor.hc-black .suggest-widget .monaco-list .monaco-list-row .suggest-icon.folder::before { background-image: url('folder-dark.svg'); }
diff --git a/src/vs/editor/contrib/suggest/media/template-dark.svg b/src/vs/editor/contrib/suggest/media/template-dark.svg
deleted file mode 100644
index 425ced36f0eaffeb1c013db42f876f74adbb6a9a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/template-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/template-light.svg b/src/vs/editor/contrib/suggest/media/template-light.svg
deleted file mode 100644
index 496d8f7c85c15b9d0be1ea85110849235418410a..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/template-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/variable-dark.svg b/src/vs/editor/contrib/suggest/media/variable-dark.svg
deleted file mode 100644
index 687fcabfff5645beeeb791b60380fd283c6db0ca..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/variable-dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/media/variable-light.svg b/src/vs/editor/contrib/suggest/media/variable-light.svg
deleted file mode 100644
index ede7e9434dd4ee669a54a7899d77ba208c4b1765..0000000000000000000000000000000000000000
--- a/src/vs/editor/contrib/suggest/media/variable-light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 77ccc3428849643ca56fd91044bf42a285039a8a..a9f1bcad47220386ccd7f21049c87e298b743e2f 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -10,7 +10,7 @@ import * as strings from 'vs/base/common/strings';
import { Event, Emitter } from 'vs/base/common/event';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IDisposable, dispose, toDisposable, DisposableStore, Disposable } from 'vs/base/common/lifecycle';
-import { addClass, append, $, hide, removeClass, show, toggleClass, getDomNodePagePosition, hasClass, addDisposableListener, addStandardDisposableListener } from 'vs/base/browser/dom';
+import { addClass, append, $, hide, removeClass, show, toggleClass, getDomNodePagePosition, hasClass, addDisposableListener, addStandardDisposableListener, addClasses } from 'vs/base/browser/dom';
import { IListVirtualDelegate, IListEvent, IListRenderer, IListMouseEvent, IListGestureEvent } from 'vs/base/browser/ui/list/list';
import { List } from 'vs/base/browser/ui/list/listWidget';
import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -48,6 +48,7 @@ interface ISuggestionTemplateData {
icon: HTMLElement;
colorspan: HTMLElement;
iconLabel: IconLabel;
+ iconContainer: HTMLElement;
typeLabel: HTMLElement;
readMore: HTMLElement;
disposables: DisposableStore;
@@ -116,12 +117,14 @@ class Renderer implements IListRenderer
const text = append(container, $('.contents'));
const main = append(text, $('.main'));
+ data.iconContainer = append(main, $('.icon-label.codicon'));
+
data.iconLabel = new IconLabel(main, { supportHighlights: true, supportCodicons: true });
data.disposables.add(data.iconLabel);
data.typeLabel = append(main, $('span.type-label'));
- data.readMore = append(main, $('span.readMore'));
+ data.readMore = append(main, $('span.readMore.codicon.codicon-info'));
data.readMore.title = nls.localize('readMore', "Read More...{0}", this.triggerKeybindingLabel);
const configureFont = () => {
@@ -169,11 +172,13 @@ class Renderer implements IListRenderer
if (suggestion.kind === CompletionItemKind.Color && extractColor(element, color)) {
// special logic for 'color' completion items
data.icon.className = 'icon customcolor';
+ data.iconContainer.className = 'icon customcolor';
data.colorspan.style.backgroundColor = color[0];
} else if (suggestion.kind === CompletionItemKind.File && this._themeService.getIconTheme().hasFileIcons) {
// special logic for 'file' completion items
data.icon.className = 'icon hide';
+ data.iconContainer.className = 'icon hide';
const labelClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: suggestion.label }), FileKind.FILE);
const detailClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: suggestion.detail }), FileKind.FILE);
labelOptions.extraClasses = labelClasses.length > detailClasses.length ? labelClasses : detailClasses;
@@ -181,6 +186,7 @@ class Renderer implements IListRenderer
} else if (suggestion.kind === CompletionItemKind.Folder && this._themeService.getIconTheme().hasFolderIcons) {
// special logic for 'folder' completion items
data.icon.className = 'icon hide';
+ data.iconContainer.className = 'icon hide';
labelOptions.extraClasses = flatten([
getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: suggestion.label }), FileKind.FOLDER),
getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: suggestion.detail }), FileKind.FOLDER)
@@ -188,9 +194,8 @@ class Renderer implements IListRenderer
} else {
// normal icon
data.icon.className = 'icon hide';
- labelOptions.extraClasses = [
- `suggest-icon ${completionKindToCssClass(suggestion.kind)}`
- ];
+ data.iconContainer.className = '';
+ addClasses(data.iconContainer, `suggest-icon codicon codicon-symbol-${completionKindToCssClass(suggestion.kind)}`);
}
if (suggestion.tags && suggestion.tags.indexOf(CompletionItemTag.Deprecated) >= 0) {
@@ -267,7 +272,7 @@ class SuggestionDetails {
this.disposables.add(this.scrollbar);
this.header = append(this.body, $('.header'));
- this.close = append(this.header, $('span.close'));
+ this.close = append(this.header, $('span.codicon.codicon-close'));
this.close.title = nls.localize('readLess', "Read less...{0}", this.triggerKeybindingLabel);
this.type = append(this.header, $('p.type'));
diff --git a/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
index 1e6e29ee935be1fb442cbe06a7e39c1be38a11ae..98ddd9e96baf3083fd53f48c6a98b4d22f35b26f 100644
--- a/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css
@@ -17,7 +17,7 @@
text-decoration-line: underline;
}
-.monaco-workbench .monaco-breadcrumb-item.shows-symbol-icon .symbol-icon.block {
+.monaco-workbench .monaco-breadcrumb-item.shows-symbol-icon .codicon[class*='codicon-symbol-'] {
padding-right: 6px;
}
diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
index 2e5c93ce321bb6654996d8cdf4061062b275745e..0c97c633443e4f25bca184e3e69c3b9c3cc7e61e 100644
--- a/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
@@ -275,8 +275,11 @@
}
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item::before {
- min-width: 16px;
+ width: 16px;
height: 22px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-breadcrumbs .breadcrumbs-control .monaco-breadcrumb-item:last-child {
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index 8b5fd2f78fc95016345a4e9e65d8737de36c1c1c..bddadea7078317db7ba0346a42bb002bd1c887f9 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -571,21 +571,18 @@ export class RawDebugSession implements IDisposable {
const args: string[] = [];
for (let arg of vscodeArgs.args) {
- if (arg.prefix) {
- const a2 = (arg.prefix || '') + (arg.path || '');
- const match = /^--(.+)=(.+)$/.exec(a2);
- if (match && match.length === 3) {
- const key = match[1];
- let value = match[2];
-
- if ((key === 'file-uri' || key === 'folder-uri') && !isUri(arg.path)) {
- value = URI.file(value).toString();
- }
-
- args.push(`--${key}=${value}`);
- } else {
- args.push(a2);
+ const a2 = (arg.prefix || '') + (arg.path || '');
+ const match = /^--(.+)=(.+)$/.exec(a2);
+ if (match && match.length === 3) {
+ const key = match[1];
+ let value = match[2];
+
+ if ((key === 'file-uri' || key === 'folder-uri') && !isUri(arg.path)) {
+ value = URI.file(value).toString();
}
+ args.push(`--${key}=${value}`);
+ } else {
+ args.push(a2);
}
}