Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-30 17:07:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle single folder case better

Browse Source
This commit is contained in:
Benjamin Pasero
2018-01-23 11:55:28 +01:00
parent 1172986c21
commit e410a785b5
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+22 -10
View File
@@ -72,10 +72,16 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
return this.removeFolders(foldersToDelete);
}
// Add & Delete Folders (first remove and then add to allow for updating existing folders)
return this.removeFolders(foldersToDelete).then(() => {
return this.doAddFolders(foldersToAdd, index, donotNotifyError);
});
// Add & Delete Folders
if (this.includesSingleFolderWorkspace(foldersToDelete)) {
// if we are in single-folder state and the folder is replaced with
// other folders, we handle this specially and just enter workspace
// mode with the folders that are being added.
return this.createAndEnterWorkspace(foldersToAdd);
}
// Make sure to first remove folders and then add them to account for folders being updated
return this.removeFolders(foldersToDelete).then(() => this.doAddFolders(foldersToAdd, index, donotNotifyError));
}
public addFolders(foldersToAdd: IWorkspaceFolderCreationData[], donotNotifyError: boolean = false): TPromise<void> {
@@ -108,12 +114,9 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
public removeFolders(foldersToRemove: URI[], donotNotifyError: boolean = false): TPromise<void> {
// If we are in single-folder state and the opened folder is to be removed,
// we close the workspace and enter the empty workspace state for the window.
if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
const workspaceFolder = this.contextService.getWorkspace().folders[0];
if (foldersToRemove.some(folder => isEqual(folder, workspaceFolder.uri, !isLinux))) {
return this.windowService.closeWorkspace();
}
// we create an empty workspace and enter it.
if (this.includesSingleFolderWorkspace(foldersToRemove)) {
return this.createAndEnterWorkspace([]);
}
// Delegate removal of folders to workspace service otherwise
@@ -121,6 +124,15 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
.then(() => null, error => donotNotifyError ? TPromise.wrapError(error) : this.handleWorkspaceConfigurationEditingError(error));
}
private includesSingleFolderWorkspace(folders: URI[]): boolean {
if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
const workspaceFolder = this.contextService.getWorkspace().folders[0];
return (folders.some(folder => isEqual(folder, workspaceFolder.uri, !isLinux)));
}
return false;
}
public createAndEnterWorkspace(folders?: IWorkspaceFolderCreationData[], path?: string): TPromise<void> {
return this.doEnterWorkspace(() => this.windowService.createAndEnterWorkspace(folders, path));
}