maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 5cf40f9c9a into 7dfcd74e63

Browse source
This commit is contained in:
Max Grekhov 2021-11-26 23:04:35 +03:00 committed by GitHub
parent 7dfcd74e63 5cf40f9c9a
commit d310879314
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/files/browser/files.contribution.ts
View file

@ -357,11 +357,12 @@ configurationRegistry.registerConfiguration({
},
'explorer.openEditors.sortOrder': {
'type': 'string',
'enum': ['editorOrder', 'alphabetical'],
'enum': ['editorOrder', 'alphabetical', 'fullPath'],
'description': nls.localize({ key: 'openEditorsSortOrder', comment: ['Open is an adjective'] }, "Controls the sorting order of editors in the Open Editors pane."),
'enumDescriptions': [
nls.localize('sortOrder.editorOrder', 'Editors are ordered in the same order editor tabs are shown.'),
nls.localize('sortOrder.alphabetical', 'Editors are ordered in alphabetical order inside each editor group.')
nls.localize('sortOrder.alphabetical', 'Editors are ordered in alphabetical order inside each editor group.'),
nls.localize('sortOrder.fullPath', 'Editors are ordered alphabetically by full path inside each editor group.')
],
'default': 'editorOrder'
},

32
src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
View file

@ -52,6 +52,8 @@ import { Codicon } from 'vs/base/common/codicons';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { Schemas } from 'vs/base/common/network';
import { extUriIgnorePathCase } from 'vs/base/common/resources';
const $ = dom.$;
@ -69,7 +71,7 @@ export class OpenEditorsView extends ViewPane {
private contributedContextMenu!: IMenu;
private needsRefresh = false;
private elements: (OpenEditor | IEditorGroup)[] = [];
private sortOrder: 'editorOrder' | 'alphabetical';
private sortOrder: 'editorOrder' | 'alphabetical' | 'fullPath';
private resourceContext!: ResourceContextKey;
private groupFocusedContext!: IContextKey<boolean>;
private dirtyEditorFocusedContext!: IContextKey<boolean>;
@ -106,7 +108,7 @@ export class OpenEditorsView extends ViewPane {
}
this.needsRefresh = false;
if (this.sortOrder === 'alphabetical') {
if (this.sortOrder === 'alphabetical' || this.sortOrder === 'fullPath') {
// We need to resort the list if the editor label changed
elements.forEach(e => {
if (e instanceof OpenEditor) {
@ -338,6 +340,32 @@ export class OpenEditorsView extends ViewPane {
let editors = g.editors.map(ei => new OpenEditor(ei, g));
if (this.sortOrder === 'alphabetical') {
editors = editors.sort((first, second) => compareFileNamesDefault(first.editor.getName(), second.editor.getName()));
} else if (this.sortOrder === 'fullPath') {
editors = editors.sort((first, second) => {
const firstResource = first.editor.resource;
const secondResource = second.editor.resource;
//put 'system' editors before everything
if (firstResource === undefined && secondResource === undefined) {
return compareFileNamesDefault(first.editor.getName(), second.editor.getName());
} else if (firstResource === undefined) {
return -1;
} else if (secondResource === undefined) {
return 1;
} else {
const firstScheme = firstResource.scheme;
const secondScheme = secondResource.scheme;
//put non-file editors before files
if (firstScheme !== Schemas.file && secondScheme !== Schemas.file) {
return extUriIgnorePathCase.compare(firstResource, secondResource);
} else if (firstScheme !== Schemas.file) {
return -1;
} else if (secondScheme !== Schemas.file) {
return 1;
} else {
return extUriIgnorePathCase.compare(firstResource, secondResource);
}
}
});
}
this.elements.push(...editors);
});

2
src/vs/workbench/contrib/files/common/files.ts
View file

@ -83,7 +83,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
explorer: {
openEditors: {
visible: number;
sortOrder: 'editorOrder' | 'alphabetical';
sortOrder: 'editorOrder' | 'alphabetical' | 'fullPath';
};
autoReveal: boolean | 'focusNoScroll';
enableDragAndDrop: boolean;