Replace Octicons with Codicons

build/gulpfile.editor.js

@@ -85,7 +85,7 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			`lib.webworker.importscripts.d.ts`
 		],
 		redirects: {
-			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
+			'vs/base/browser/ui/codiconLabel/codiconLabel': 'vs/base/browser/ui/codiconLabel/codiconLabel.mock',
 		},
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
 		importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,

build/gulpfile.hygiene.js

@@ -71,7 +71,6 @@ const indentationFilter = [
 	'!**/yarn-error.log',
 
 	// except multiple specific folders
-	'!**/octicons/**',
 	'!**/codicon/**',
 	'!**/fixtures/**',
 	'!**/lib/**',

build/gulpfile.vscode.js

@@ -67,7 +67,6 @@ const vscodeResources = [
 	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/languagePacks.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
-	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/base/browser/ui/codiconLabel/codicon/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
@@ -534,4 +533,3 @@ function getSettingsSearchBuildId(packageJson) {
 		throw new Error('Could not determine build number: ' + e.toString());
 	}
 }
-

cgmanifest.json

@@ -96,25 +96,13 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "vscode-octicons-font",
-					"repositoryUrl": "https://github.com/Microsoft/vscode-octicons-font",
-					"commitHash": "4cbf2bd35cf0084eabd47d322cc58339fd7743cf"
+					"name": "vscode-codicons",
+					"repositoryUrl": "https://github.com/microsoft/vscode-codicons",
+					"commitHash": "7f14c092f65f658cd520df3f13765efe828d0ba4"
 				}
 			},
-			"license": "MIT",
-			"version": "1.3.2"
-		},
-		{
-			"component": {
-				"type": "git",
-				"git": {
-					"name": "octicons",
-					"repositoryUrl": "https://github.com/primer/octicons",
-					"commitHash": "d120bf97bc9a12fb415f69fedaf31fe58427ca56"
-				}
-			},
-			"license": "MIT",
-			"version": "8.3.0"
+			"license": "MIT and Creative Commons Attribution 4.0",
+			"version": "0.0.1"
 		},
 		{
 			"component": {

extensions/html/test/colorize-fixtures/test.html

@@ -34,7 +34,7 @@
 		});
 	</script>
 	<div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner hidden">
-		<span class=octicon></span>
+		<span class=codicon></span>
 		<span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
 		<span class="signed-out-tab-flash">You signed out in another tab or window. <a href="">Reload</a> to refresh your session.</span>
 	</div>

extensions/html/test/colorize-results/test_html.json

@@ -2431,7 +2431,7 @@
 		}
 	},
 	{
-		"c": "octicon",
+		"c": "codicon",
 		"t": "text.html.derivative meta.tag.inline.span.start.html meta.attribute.class.html string.unquoted.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -3189,4 +3189,4 @@
 			"hc_black": "punctuation.definition.tag: #808080"
 		}
 	}
-]
+]

src/vs/base/browser/ui/actionbar/actionbar.css

@@ -50,12 +50,6 @@
 	margin-right: 4px;
 }
 
-.monaco-action-bar .action-label.octicon {
-	font-size: 15px;
-	line-height: 35px;
-	text-align: center;
-}
-
 .monaco-action-bar .action-item.disabled .action-label,
 .monaco-action-bar .action-item.disabled .action-label:hover {
 	opacity: 0.4;

src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css

@@ -10,5 +10,5 @@
 }
 
 .codicon-animation-spin {
-	animation: octicon-spin 1.5s linear infinite;
+	animation: codicon-spin 1.5s linear infinite;
 }

src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts → src/vs/base/browser/ui/codiconLabel/codiconLabel.mock.ts

@@ -5,11 +5,11 @@
 
 import { escape } from 'vs/base/common/strings';
 
-export function renderOcticons(text: string): string {
+export function renderCodicons(text: string): string {
 	return escape(text);
 }
 
-export class OcticonLabel {
+export class CodiconLabel {
 
 	private _container: HTMLElement;
 
@@ -18,7 +18,7 @@ export class OcticonLabel {
 	}
 
 	set text(text: string) {
-		this._container.innerHTML = renderOcticons(text || '');
+		this._container.innerHTML = renderCodicons(text || '');
 	}
 
 }

src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts

@@ -20,7 +20,7 @@ export class HighlightedLabel {
 	private highlights: IHighlight[] = [];
 	private didEverRender: boolean = false;
 
-	constructor(container: HTMLElement, private supportOcticons: boolean) {
+	constructor(container: HTMLElement, private supportCodicons: boolean) {
 		this.domNode = document.createElement('span');
 		this.domNode.className = 'monaco-highlighted-label';
 
@@ -65,21 +65,21 @@ export class HighlightedLabel {
 			if (pos < highlight.start) {
 				htmlContent += '<span>';
 				const substring = this.text.substring(pos, highlight.start);
-				htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
+				htmlContent += this.supportCodicons ? renderCodicons(substring) : escape(substring);
 				htmlContent += '</span>';
 				pos = highlight.end;
 			}
 			htmlContent += '<span class="highlight">';
 			const substring = this.text.substring(highlight.start, highlight.end);
-			htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
+			htmlContent += this.supportCodicons ? renderCodicons(substring) : escape(substring);
 			htmlContent += '</span>';
 			pos = highlight.end;
 		}
 
 		if (pos < this.text.length) {
 			htmlContent += '<span>';
 			const substring = this.text.substring(pos);
-			htmlContent += this.supportOcticons ? renderCodicons(substring) : escape(substring);
+			htmlContent += this.supportCodicons ? renderCodicons(substring) : escape(substring);
 			htmlContent += '</span>';
 		}
 

src/vs/base/browser/ui/iconLabel/iconLabel.ts

@@ -12,7 +12,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
 	supportDescriptionHighlights?: boolean;
-	supportOcticons?: boolean;
+	supportCodicons?: boolean;
 }
 
 export interface IIconLabelValueOptions {
@@ -100,13 +100,13 @@ export class IconLabel extends Disposable {
 		this.labelDescriptionContainer = this._register(new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container'))));
 
 		if (options && options.supportHighlights) {
-			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')), !!options.supportOcticons);
+			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')), !!options.supportCodicons);
 		} else {
 			this.labelNode = this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		}
 
 		if (options && options.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')), !!options.supportOcticons);
+			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')), !!options.supportCodicons);
 		} else {
 			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		}