Revert "Merge pull request #87320 from microsoft/misolori/codicon-consolidation"

This reverts commit 6c9b23ed, reversing
changes made to 085abd5f.

build/gulpfile.editor.js

@@ -41,7 +41,7 @@ var editorEntryPoints = [
 ];
 
 var editorResources = [
-	'out-editor-build/vs/base/parts/codicon/browser/codiconLabel/**/*.ttf'
+	'out-editor-build/vs/base/browser/ui/codiconLabel/**/*.ttf'
 ];
 
 var BUNDLED_FILE_HEADER = [

build/gulpfile.vscode.js

@@ -67,7 +67,7 @@ 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/parts/codicon/browser/codiconLabel/**',
+	'out-build/vs/base/browser/ui/codiconLabel/codicon/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',

src/vs/base/browser/markdownRenderer.ts

@@ -15,7 +15,7 @@ import { cloneAndChange } from 'vs/base/common/objects';
 import { escape } from 'vs/base/common/strings';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
-import { renderCodicons, markdownEscapeEscapedCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons, markdownEscapeEscapedCodicons } from 'vs/base/common/codicons';
 
 export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
 	codeBlockRenderer?: (modeId: string, value: string) => Promise<string>;

src/vs/base/parts/codicon/browser/codiconLabel.ts → src/vs/base/browser/ui/codiconLabel/codiconLabel.ts

@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./codicon';
-import 'vs/css!./codicon-animations';
+import 'vs/css!./codicon/codicon';
+import 'vs/css!./codicon/codicon-animations';
 import { escape } from 'vs/base/common/strings';
-import { renderCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons } from 'vs/base/common/codicons';
 
 export class CodiconLabel {
 

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as objects from 'vs/base/common/objects';
-import { renderCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons } from 'vs/base/common/codicons';
 import { escape } from 'vs/base/common/strings';
 
 export interface IHighlight {

src/vs/base/common/htmlContent.ts

@@ -5,7 +5,7 @@
 
 import { equals } from 'vs/base/common/arrays';
 import { UriComponents } from 'vs/base/common/uri';
-import { escapeCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { escapeCodicons } from 'vs/base/common/codicons';
 
 export interface IMarkdownString {
 	readonly value: string;

src/vs/base/test/common/codicon.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import { IMatch } from 'vs/base/common/filters';
-import { matchesFuzzyCodiconAware, parseCodicons, IParsedCodicons } from 'vs/base/parts/codicon/common/codicon';
+import { matchesFuzzyCodiconAware, parseCodicons, IParsedCodicons } from 'vs/base/common/codicon';
 
 export interface ICodiconFilter {
 	// Returns null if word doesn't match.

src/vs/code/electron-browser/issue/issueReporterMain.ts

@@ -8,7 +8,7 @@ import * as os from 'os';
 import * as browser from 'vs/base/browser/browser';
 import { $ } from 'vs/base/browser/dom';
 import { Button } from 'vs/base/browser/ui/button/button';
-import { CodiconLabel } from 'vs/base/parts/codicon/browser/codiconLabel';
+import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
 import * as collections from 'vs/base/common/collections';
 import { debounce } from 'vs/base/common/decorators';
 import { Disposable } from 'vs/base/common/lifecycle';

src/vs/editor/contrib/codelens/codelensWidget.ts

@@ -5,7 +5,7 @@
 
 import 'vs/css!./codelensWidget';
 import * as dom from 'vs/base/browser/dom';
-import { renderCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons } from 'vs/base/common/codicons';
 import { escape } from 'vs/base/common/strings';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { Range } from 'vs/editor/common/core/range';

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/suggest';
-import 'vs/base/parts/codicon/browser/codiconLabel'; // The codicon symbol styles are defined here and must be loaded
+import 'vs/base/browser/ui/codiconLabel/codiconLabel'; // The codicon symbol styles are defined here and must be loaded
 import 'vs/editor/contrib/documentSymbols/outlineTree'; // The codicon symbol colors are defined here and must be loaded
 import * as nls from 'vs/nls';
 import { createMatches } from 'vs/base/common/filters';

src/vs/editor/standalone/browser/quickOpen/quickOutline.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./quickOutline';
-import 'vs/base/parts/codicon/browser/codiconLabel'; // The codicon symbol styles are defined here and must be loaded
+import 'vs/base/browser/ui/codiconLabel/codiconLabel'; // The codicon symbol styles are defined here and must be loaded
 import 'vs/editor/contrib/documentSymbols/outlineTree'; // The codicon symbol colors are defined here and must be loaded
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { matchesFuzzy } from 'vs/base/common/filters';

src/vs/workbench/api/common/extHostTypes.ts

@@ -14,7 +14,7 @@ import { generateUuid } from 'vs/base/common/uuid';
 import * as vscode from 'vscode';
 import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from 'vs/platform/files/common/files';
 import { RemoteAuthorityResolverErrorCode } from 'vs/platform/remote/common/remoteAuthorityResolver';
-import { escapeCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { escapeCodicons } from 'vs/base/common/codicons';
 
 function es5ClassCompat(target: Function): any {
 	///@ts-ignore

src/vs/workbench/browser/parts/quickinput/quickInputList.ts

@@ -11,7 +11,7 @@ import { WorkbenchList, IWorkbenchListOptions } from 'vs/platform/list/browser/l
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
 import { IMatch } from 'vs/base/common/filters';
-import { matchesFuzzyCodiconAware, parseCodicons } from 'vs/base/parts/codicon/common/codicon';
+import { matchesFuzzyCodiconAware, parseCodicons } from 'vs/base/common/codicon';
 import { compareAnything } from 'vs/base/common/comparers';
 import { Emitter, Event } from 'vs/base/common/event';
 import { assign } from 'vs/base/common/objects';

src/vs/workbench/browser/parts/statusbar/statusbarPart.ts

@@ -7,7 +7,7 @@ import 'vs/css!./media/statusbarpart';
 import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { dispose, IDisposable, Disposable, toDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { CodiconLabel } from 'vs/base/parts/codicon/browser/codiconLabel';
+import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Part } from 'vs/workbench/browser/part';

src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts

@@ -38,7 +38,7 @@ import { randomPort } from 'vs/base/node/ports';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { renderCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons } from 'vs/base/common/codicons';
 import { escape } from 'vs/base/common/strings';
 import { ExtensionIdentifier, ExtensionType, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';

src/vs/workbench/contrib/scm/browser/mainPane.ts

@@ -25,7 +25,7 @@ import { ActionBar, ActionViewItem } from 'vs/base/browser/ui/actionbar/actionba
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { Command } from 'vs/editor/common/modes';
-import { renderCodicons } from 'vs/base/parts/codicon/common/codicons';
+import { renderCodicons } from 'vs/base/common/codicons';
 import { escape } from 'vs/base/common/strings';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

tslint.json

@@ -68,8 +68,7 @@
 				"target": "**/vs/base/common/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/common/**",
-					"**/vs/base/parts/*/common/**"
+					"**/vs/base/common/**"
 				]
 			},
 			{
@@ -79,8 +78,7 @@
 					"sinon",
 					"vs/nls",
 					"**/vs/base/common/**",
-					"**/vs/base/test/common/**",
-					"**/vs/base/parts/*/common/**"
+					"**/vs/base/test/common/**"
 				]
 			},
 			{
@@ -88,16 +86,14 @@
 				"restrictions": [
 					"vs/nls",
 					"vs/css!./**/*",
-					"**/vs/base/{common,browser}/**",
-					"**/vs/base/parts/*/{common,browser}/**"
+					"**/vs/base/{common,browser}/**"
 				]
 			},
 			{
 				"target": "**/vs/base/node/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/{common,node}/**",
-					"**/vs/base/parts/*/{common,node}/**",
+					"**/vs/base/{common,browser,node}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -109,7 +105,6 @@
 					"sinon",
 					"vs/nls",
 					"**/vs/base/{common,browser}/**",
-					"**/vs/base/parts/*/{common,browser}/**",
 					"**/vs/base/test/{common,browser}/**"
 				]
 			},
@@ -134,8 +129,8 @@
 				"target": "**/vs/base/parts/*/node/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/{common,node}/**",
-					"**/vs/base/parts/*/{common,node}/**",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -153,8 +148,8 @@
 				"target": "**/vs/base/parts/*/electron-main/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/{common,node,electron-main}/**",
-					"**/vs/base/parts/*/{common,node,electron-main}/**",
+					"**/vs/base/{common,browser,node,electron-main}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-main}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -192,9 +187,9 @@
 				"target": "**/vs/platform/*/node/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/{common,node}/**",
-					"**/vs/base/parts/*/{common,node}/**",
-					"**/vs/platform/*/{common,node}/**",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node}/**",
+					"**/vs/platform/*/{common,browser,node}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -213,9 +208,9 @@
 				"target": "**/vs/platform/*/electron-main/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/{common,node,electron-main}/**",
-					"**/vs/base/parts/*/{common,node,electron-main}/**",
-					"**/vs/platform/*/{common,node,electron-main}/**",
+					"**/vs/base/{common,browser,node}/**",
+					"**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+					"**/vs/platform/*/{common,browser,node,electron-main}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -401,7 +396,6 @@
 					"**/vs/editor/common/**",
 					"**/vs/editor/contrib/*/common/**",
 					"**/vs/workbench/api/common/**",
-					"**/vs/base/parts/*/common/**",
 					"**/vs/workbench/common/**",
 					"**/vs/workbench/services/*/common/**",
 					"**/vs/workbench/contrib/*/common/**"
@@ -514,6 +508,37 @@
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
+			{
+				"target": "**/vs/workbench/contrib/files/common/**",
+				"restrictions": [
+					"vs/nls",
+					"**/vs/base/common/**",
+					"**/vs/base/parts/*/common/**",
+					"**/vs/platform/*/common/**",
+					"**/vs/editor/common/**",
+					"**/vs/editor/contrib/*/common/**",
+					"**/vs/workbench/common/**",
+					"**/vs/workbench/services/*/common/**",
+					"**/vs/workbench/contrib/files/common/**",
+					"assert"
+				]
+			},
+			{
+				"target": "**/vs/workbench/contrib/files/browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"**/vs/base/{common,browser}/**",
+					"**/vs/base/parts/*/{common,browser}/**",
+					"**/vs/platform/*/{common,browser}/**",
+					"**/vs/editor/{common,browser}/**",
+					"**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+					"**/vs/workbench/{common,browser}/**",
+					"**/vs/workbench/services/*/{common,browser}/**",
+					"**/vs/workbench/contrib/files/{common,browser}/**",
+					"assert"
+				]
+			},
 			{
 				"target": "**/vs/workbench/contrib/terminal/browser/**",
 				"restrictions": [
@@ -541,10 +566,10 @@
 				"target": "**/vs/code/node/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/**/{common,node}/**",
-					"**/vs/base/parts/**/{common,node}/**",
-					"**/vs/platform/**/{common,node}/**",
-					"**/vs/code/**/{common,node}/**",
+					"**/vs/base/**/{common,browser,node}/**",
+					"**/vs/base/parts/**/{common,browser,node}/**",
+					"**/vs/platform/**/{common,browser,node}/**",
+					"**/vs/code/**/{common,browser,node}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},
@@ -564,10 +589,10 @@
 				"target": "**/vs/code/electron-main/**",
 				"restrictions": [
 					"vs/nls",
-					"**/vs/base/**/{common,node,electron-main}/**",
-					"**/vs/base/parts/**/{common,node,electron-main}/**",
-					"**/vs/platform/**/{common,node,electron-main}/**",
-					"**/vs/code/**/{common,node,electron-main}/**",
+					"**/vs/base/**/{common,browser,node}/**",
+					"**/vs/base/parts/**/{common,browser,node,electron-main}/**",
+					"**/vs/platform/**/{common,browser,node,electron-main}/**",
+					"**/vs/code/**/{common,browser,node,electron-main}/**",
 					"!path" // node modules (except path where we have our own impl)
 				]
 			},