Skip to content

Commit 619c082

Browse files
committed
explorer.compressSingleChildFolders
1 parent 26f3390 commit 619c082

5 files changed

Lines changed: 34 additions & 12 deletions

File tree

‎src/vs/base/browser/ui/tree/asyncDataTree.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,10 @@ export interface ICompressibleAsyncDataTreeOptions<T, TFilterData = void> extend
10251025
readonly keyboardNavigationLabelProvider?: ICompressibleKeyboardNavigationLabelProvider<T>;
10261026
}
10271027

1028+
export interface ICompressibleAsyncDataTreeOptionsUpdate extends IAsyncDataTreeOptionsUpdate {
1029+
readonly compressionEnabled?: boolean;
1030+
}
1031+
10281032
export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends AsyncDataTree<TInput, T, TFilterData> {
10291033

10301034
protected readonly tree: CompressibleObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData>;
@@ -1063,6 +1067,10 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
10631067
};
10641068
}
10651069

1070+
updateOptions(options: ICompressibleAsyncDataTreeOptionsUpdate = {}): void {
1071+
this.tree.updateOptions(options);
1072+
}
1073+
10661074
getViewState(): IAsyncDataTreeViewState {
10671075
if (!this.identityProvider) {
10681076
throw new TreeError(this.user, 'Can\'t get tree view state without an identity provider');

‎src/vs/base/browser/ui/tree/objectTree.ts‎

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

66
import { ISequence } from 'vs/base/common/iterator';
7-
import { AbstractTree, IAbstractTreeOptions } from 'vs/base/browser/ui/tree/abstractTree';
7+
import { AbstractTree, IAbstractTreeOptions, IAbstractTreeOptionsUpdate } from 'vs/base/browser/ui/tree/abstractTree';
88
import { ISpliceable } from 'vs/base/common/sequence';
99
import { ITreeNode, ITreeModel, ITreeElement, ITreeRenderer, ITreeSorter, ICollapseStateChangeEvent } from 'vs/base/browser/ui/tree/tree';
1010
import { ObjectTreeModel, IObjectTreeModel } from 'vs/base/browser/ui/tree/objectTreeModel';
@@ -160,6 +160,10 @@ function asObjectTreeOptions<T, TFilterData>(compressedTreeNodeProvider: () => I
160160
};
161161
}
162162

163+
export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptionsUpdate {
164+
readonly compressionEnabled?: boolean;
165+
}
166+
163167
export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = void> extends ObjectTree<T, TFilterData> implements ICompressedTreeNodeProvider<T, TFilterData> {
164168

165169
protected model!: CompressibleObjectTreeModel<T, TFilterData>;
@@ -184,12 +188,12 @@ export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = vo
184188
return new CompressibleObjectTreeModel(user, view, options);
185189
}
186190

187-
isCompressionEnabled(): boolean {
188-
return this.model.isCompressionEnabled();
189-
}
191+
updateOptions(optionsUpdate: ICompressibleObjectTreeOptionsUpdate = {}): void {
192+
super.updateOptions(optionsUpdate);
190193

191-
setCompressionEnabled(enabled: boolean): void {
192-
this.model.setCompressionEnabled(enabled);
194+
if (typeof optionsUpdate.compressionEnabled !== 'undefined') {
195+
this.model.setCompressionEnabled(optionsUpdate.compressionEnabled);
196+
}
193197
}
194198

195199
getCompressedTreeNode(element: T | null = null): ITreeNode<ICompressedTreeNode<T> | null, TFilterData> {

‎src/vs/base/test/browser/ui/tree/objectTree.test.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,6 @@ suite('CompressibleObjectTree', function () {
348348
const tree = new CompressibleObjectTree<number>('test', container, new Delegate(), [new Renderer()]);
349349
tree.layout(200);
350350

351-
assert.equal(tree.isCompressionEnabled(), true);
352-
353351
tree.setChildren(null, Iterator.fromArray([
354352
{
355353
element: 1, children: Iterator.fromArray([{
@@ -367,11 +365,11 @@ suite('CompressibleObjectTree', function () {
367365
let rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
368366
assert.deepEqual(rows, ['1/11/111', '1111', '1112', '1113']);
369367

370-
tree.setCompressionEnabled(false);
368+
tree.updateOptions({ compressionEnabled: false });
371369
rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
372370
assert.deepEqual(rows, ['1', '11', '111', '1111', '1112', '1113']);
373371

374-
tree.setCompressionEnabled(true);
372+
tree.updateOptions({ compressionEnabled: true });
375373
rows = toArray(container.querySelectorAll('.monaco-tl-contents')).map(row => row.textContent);
376374
assert.deepEqual(rows, ['1/11/111', '1111', '1112', '1113']);
377375
});

‎src/vs/workbench/contrib/files/browser/files.contribution.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,12 @@ configurationRegistry.registerConfiguration({
423423
],
424424
description: nls.localize('explorer.incrementalNaming', "Controls what naming strategy to use when a giving a new name to a duplicated explorer item on paste."),
425425
default: 'simple'
426-
}
426+
},
427+
'explorer.compressSingleChildFolders': {
428+
'type': 'boolean',
429+
'description': nls.localize('compressSingleChildFolders', "Controls whether the explorer should compress single child folders in a combined tree element. Useful for Java project folder structures, for example."),
430+
'default': false
431+
},
427432
}
428433
});
429434

‎src/vs/workbench/contrib/files/browser/views/explorerView.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import { first } from 'vs/base/common/arrays';
5050
import { withNullAsUndefined } from 'vs/base/common/types';
5151
import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
5252
import { dispose } from 'vs/base/common/lifecycle';
53+
import { Event } from 'vs/base/common/event';
5354

5455
export class ExplorerView extends ViewletPanel {
5556
static readonly ID: string = 'workbench.explorer.fileView';
@@ -282,9 +283,11 @@ export class ExplorerView extends ViewletPanel {
282283

283284
this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
284285

286+
const isCompressionEnabled = () => this.configurationService.getValue<boolean>('explorer.compressSingleChildFolders');
287+
285288
this.tree = this.instantiationService.createInstance<typeof WorkbenchCompressibleAsyncDataTree, WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>>(WorkbenchCompressibleAsyncDataTree, 'FileExplorer', container, new ExplorerDelegate(), new ExplorerCompressionDelegate(), [filesRenderer],
286289
this.instantiationService.createInstance(ExplorerDataSource), {
287-
// compressionEnabled: false,
290+
compressionEnabled: isCompressionEnabled(),
288291
accessibilityProvider: new ExplorerAccessibilityProvider(),
289292
ariaLabel: nls.localize('treeAriaLabel', "Files Explorer"),
290293
identityProvider: {
@@ -321,6 +324,10 @@ export class ExplorerView extends ViewletPanel {
321324
});
322325
this._register(this.tree);
323326

327+
// Bind configuration
328+
const onDidChangeCompressionConfiguration = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('explorer.compressSingleChildFolders'));
329+
this._register(onDidChangeCompressionConfiguration(_ => this.tree.updateOptions({ compressionEnabled: isCompressionEnabled() })));
330+
324331
// Bind context keys
325332
FilesExplorerFocusedContext.bindTo(this.tree.contextKeyService);
326333
ExplorerFocusedContext.bindTo(this.tree.contextKeyService);

0 commit comments

Comments
 (0)