use FileKind in FileElement, microsoft#54370

jrieken · jrieken · commit cf2788274ad3 · 2018-07-24T17:10:13.000+02:00
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -76,12 +76,11 @@ class Item extends BreadcrumbsItem {
 			let label = this._instantiationService.createInstance(FileLabel, container, {});
 			label.setFile(this.element.uri, {
 				hidePath: true,
-				hideIcon: !this.element.isFile || !this.options.showFileIcons,
-				fileKind: this.element.isFile ? FileKind.FILE : FileKind.FOLDER,
+				hideIcon: this.element.kind !== FileKind.FILE || !this.options.showFileIcons,
+				fileKind: this.element.kind,
 				fileDecorations: { colors: this.options.showDecorationColors, badges: false },
 			});
 			this._disposables.push(label);
-			dom.toggleClass(container, 'file', this.element.isFile);
 
 		} else if (this.element instanceof OutlineModel) {
 			// has outline element but not in one
@@ -323,7 +322,7 @@ export class BreadcrumbsControl {
 
 	private _revealInEditor(event: IBreadcrumbsItemEvent, data: any): void {
 		if (data instanceof FileElement) {
-			if (data.isFile) {
+			if (data.kind === FileKind.FILE) {
 				// open file in editor
 				this._editorService.openEditor({ resource: data.uri });
 			} else {
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -23,11 +23,12 @@ import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/p
 import { Schemas } from 'vs/base/common/network';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
+import { FileKind } from 'vs/platform/files/common/files';
 
 export class FileElement {
 	constructor(
 		readonly uri: URI,
-		readonly isFile: boolean
+		readonly kind: FileKind
 	) { }
 }
 
@@ -117,7 +118,7 @@ export class EditorBreadcrumbsModel {
 			if (info.folder && isEqual(info.folder.uri, uri)) {
 				break;
 			}
-			info.path.unshift(new FileElement(uri, info.path.length === 0));
+			info.path.unshift(new FileElement(uri, info.path.length === 0 ? FileKind.FILE : FileKind.FOLDER));
 			uri = uri.with({ path: paths.dirname(uri.path) });
 		}
 		return info;
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -259,7 +259,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
 		let [first] = e.selection;
 		let stat = first as IFileStat;
 		if (stat && !stat.isDirectory) {
-			this._onDidPickElement.fire(new FileElement(stat.resource, true));
+			this._onDidPickElement.fire(new FileElement(stat.resource, FileKind.FILE));
 		}
 	}
 }
diff --git a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
@@ -11,6 +11,7 @@ import { Workspace, WorkspaceFolder } from 'vs/platform/workspace/common/workspa
 import { EditorBreadcrumbsModel, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
 import { TestContextService } from 'vs/workbench/test/workbenchTestServices';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { FileKind } from 'vs/platform/files/common/files';
 
 
 suite('Breadcrumb Model', function () {
@@ -35,9 +36,9 @@ suite('Breadcrumb Model', function () {
 
 		assert.equal(elements.length, 3);
 		let [one, two, three] = elements as FileElement[];
-		assert.equal(one.isFile, false);
-		assert.equal(two.isFile, false);
-		assert.equal(three.isFile, true);
+		assert.equal(one.kind, FileKind.FOLDER);
+		assert.equal(two.kind, FileKind.FOLDER);
+		assert.equal(three.kind, FileKind.FILE);
 		assert.equal(one.uri.toString(), 'foo:/bar/baz/ws/some');
 		assert.equal(two.uri.toString(), 'foo:/bar/baz/ws/some/path');
 		assert.equal(three.uri.toString(), 'foo:/bar/baz/ws/some/path/file.ts');
@@ -50,8 +51,8 @@ suite('Breadcrumb Model', function () {
 
 		assert.equal(elements.length, 2);
 		let [one, two] = elements as FileElement[];
-		assert.equal(one.isFile, false);
-		assert.equal(two.isFile, true);
+		assert.equal(one.kind, FileKind.FOLDER);
+		assert.equal(two.kind, FileKind.FILE);
 		assert.equal(one.uri.toString(), 'foo:/outside');
 		assert.equal(two.uri.toString(), 'foo:/outside/file.ts');
 	});

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {`
`259`	`259`	`let [first] = e.selection;`
`260`	`260`	`let stat = first as IFileStat;`
`261`	`261`	`if (stat && !stat.isDirectory) {`
`262`		`- this._onDidPickElement.fire(new FileElement(stat.resource, true));`
	`262`	`+ this._onDidPickElement.fire(new FileElement(stat.resource, FileKind.FILE));`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`	`}`