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

Fix #35219

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-10-20 22:08:53 +02:00
parent 004d0da57a
commit f80adf8a85
5 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/lib/i18n.resources.json
+4
View File
@@ -186,6 +186,10 @@
"name": "vs/workbench/services/textMate",
"project": "vscode-workbench"
},
{
"name": "vs/workbench/services/workspace",
"project": "vscode-workbench"
},
{
"name": "setup_messages",
"project": "vscode-workbench"
src/vs/workbench/browser/actions/workspaceActions.ts
+4 -4
View File
@@ -119,7 +119,7 @@ export class AddRootFolderAction extends BaseWorkspacesAction {
return TPromise.as(null);
}
addFoldersPromise = this.contextService.addFolders(folders.map(folder => URI.file(folder)));
addFoldersPromise = this.workspaceEditingService.addFolders(folders.map(folder => URI.file(folder)));
}
// Empty or Folder
@@ -163,7 +163,7 @@ export class GlobalRemoveRootFolderAction extends BaseWorkspacesAction {
}
// Workspace: remove folder
return this.contextService.removeFolders([folder.uri]).then(() => true);
return this.workspaceEditingService.removeFolders([folder.uri]).then(() => true);
}
return true;
@@ -216,13 +216,13 @@ export class RemoveRootFolderAction extends Action {
private rootUri: URI,
id: string,
label: string,
@IWorkspaceContextService private contextService: IWorkspaceContextService
@IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService
) {
super(id, label);
}
public run(): TPromise<any> {
return this.contextService.removeFolders([this.rootUri]);
return this.workspaceEditingService.removeFolders([this.rootUri]);
}
}
src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+1 -1
View File
@@ -910,7 +910,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
const folders = result.filter(result => result.stat.isDirectory).map(result => result.stat.resource);
if (folders.length > 0) {
if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
return this.contextService.addFolders(folders);
return this.workspaceEditingService.addFolders(folders);
}
// If we are in single-folder context, ask for confirmation to create a workspace
src/vs/workbench/services/workspace/common/workspaceEditing.ts
+11
View File
@@ -7,6 +7,7 @@
import { TPromise } from 'vs/base/common/winjs.base';
import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import URI from 'vs/base/common/uri';
export const IWorkspaceEditingService = createDecorator<IWorkspaceEditingService>('workspaceEditingService');
@@ -14,6 +15,16 @@ export interface IWorkspaceEditingService {
_serviceBrand: ServiceIdentifier<any>;
/**
* Add folders to the existing workspace
*/
addFolders(folders: URI[]): TPromise<void>;
/**
* Remove folders from the existing workspace
*/
removeFolders(folders: URI[]): TPromise<void>;
/**
* creates a new workspace with the provided folders and opens it. if path is provided
* the workspace will be saved into that location.
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+50 -2
View File
@@ -7,10 +7,11 @@
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
import URI from 'vs/base/common/uri';
import * as nls from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
import { IWindowService, IEnterWorkspaceResult } from 'vs/platform/windows/common/windows';
import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
import { IJSONEditingService, JSONEditingError, JSONEditingErrorCode } from 'vs/workbench/services/configuration/common/jsonEditing';
import { IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
@@ -22,6 +23,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { BackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
import { IChoiceService, Severity, IMessageService } from 'vs/platform/message/common/message';
import { ICommandService } from 'vs/platform/commands/common/commands';
export class WorkspaceEditingService implements IWorkspaceEditingService {
@@ -34,10 +37,23 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
@IWorkspaceConfigurationService private workspaceConfigurationService: IWorkspaceConfigurationService,
@IStorageService private storageService: IStorageService,
@IExtensionService private extensionService: IExtensionService,
@IBackupFileService private backupFileService: IBackupFileService
@IBackupFileService private backupFileService: IBackupFileService,
@IChoiceService private choiceService: IChoiceService,
@IMessageService private messageService: IMessageService,
@ICommandService private commandService: ICommandService
) {
}
public addFolders(folders: URI[]): TPromise<void> {
return this.contextService.addFolders(folders)
.then(() => null, error => this.handleWorkspaceConfigurationEditingError(error));
}
public removeFolders(folders: URI[]): TPromise<void> {
return this.contextService.removeFolders(folders)
.then(() => null, error => this.handleWorkspaceConfigurationEditingError(error));
}
public createAndEnterWorkspace(folderPaths?: string[], path?: string): TPromise<void> {
return this.doEnterWorkspace(() => this.windowService.createAndEnterWorkspace(folderPaths, path));
}
@@ -46,6 +62,38 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
return this.doEnterWorkspace(() => this.windowService.saveAndEnterWorkspace(path));
}
private handleWorkspaceConfigurationEditingError(error: JSONEditingError): TPromise<void> {
switch (error.code) {
case JSONEditingErrorCode.ERROR_INVALID_FILE:
return this.onInvalidWorkspaceConfigurationFileError();
case JSONEditingErrorCode.ERROR_FILE_DIRTY:
return this.onWorkspaceConfigurationFileDirtyError();
}
this.messageService.show(Severity.Error, error.message);
return TPromise.as(void 0);
}
private onInvalidWorkspaceConfigurationFileError(): TPromise<void> {
const message = nls.localize('errorInvalidTaskConfiguration', "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again.");
return this.askToOpenWorkspaceConfigurationFile(message);
}
private onWorkspaceConfigurationFileDirtyError(): TPromise<void> {
const message = nls.localize('errorWorkspaceConfigurationFileDirty', "Unable to write into workspace configuration file because the file is dirty. Please save it and try again.");
return this.askToOpenWorkspaceConfigurationFile(message);
}
private askToOpenWorkspaceConfigurationFile(message: string): TPromise<void> {
return this.choiceService.choose(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration File"), nls.localize('close', "Close")], 1)
.then(option => {
switch (option) {
case 0:
this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
break;
}
});
}
private doEnterWorkspace(mainSidePromise: () => TPromise<IEnterWorkspaceResult>): TPromise<void> {
// Stop the extension host first to give extensions most time to shutdown