api - remove add/removeWorkspaceFolder (for #37301)

src/vs/vscode.d.ts

@@ -5210,34 +5210,6 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
 
-		/**
-		 * Adds a workspace folder to the currently opened workspace.
-		 *
-		 * This method will be a no-op if the folder is already part of the workspace.
-		 *
-		 * Note: if this workspace had no folder opened, all extensions will be restarted
-		 * so that the (deprecated) `rootPath` property is updated to point to the first workspace
-		 * folder.
-		 *
-		 * @param folder a workspace folder to add.
-		 * @return A thenable that resolves when the workspace folder was added successfully.
-		 */
-		export function addWorkspaceFolder(uri: Uri, name?: string): Thenable<boolean>;
-
-		/**
-		 * Remove a workspace folder from the currently opened workspace.
-		 *
-		 * This method will be a no-op when called while not having a workspace opened.
-		 *
-		 * Note: if the first workspace folder is removed, all extensions will be restarted
-		 * so that the (deprecated) `rootPath` property is updated to point to the first workspace
-		 * folder.
-		 *
-		 * @param folder a [workspace folder](#WorkspaceFolder) to remove.
-		 * @return A thenable that resolves when the workspace folder was removed successfully
-		 */
-		export function removeWorkspaceFolder(folder: WorkspaceFolder): Thenable<boolean>;
-
 		/**
 		 * Returns the [workspace folder](#WorkspaceFolder) that contains a given uri.
 		 * * returns `undefined` when the given uri doesn't match any workspace folder

src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts

@@ -14,13 +14,9 @@ import { MainThreadWorkspaceShape, ExtHostWorkspaceShape, ExtHostContext, MainCo
 import { IFileService } from 'vs/platform/files/common/files';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IRelativePattern } from 'vs/base/common/glob';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
-import { IMessageService } from 'vs/platform/message/common/message';
-import { localize } from 'vs/nls';
-import { getPathLabel } from 'vs/base/common/labels';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 @extHostNamedCustomer(MainContext.MainThreadWorkspace)
 export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -36,9 +32,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@ITextFileService private readonly _textFileService: ITextFileService,
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IFileService private readonly _fileService: IFileService,
-		@IWorkspaceEditingService private _workspaceEditingService: IWorkspaceEditingService,
-		@IMessageService private _messageService: IMessageService,
-		@IEnvironmentService private _environmentService: IEnvironmentService
+		@IWorkspaceEditingService private _workspaceEditingService: IWorkspaceEditingService
 	) {
 		this._proxy = extHostContext.get(ExtHostContext.ExtHostWorkspace);
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
@@ -60,51 +54,6 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		this._proxy.$acceptWorkspaceData(this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : this._contextService.getWorkspace());
 	}
 
-	$addFolder(extensionName: string, uri: URI, name?: string): Thenable<boolean> {
-		return this.confirmAddRemoveFolder(extensionName, uri, false).then(confirmed => {
-			if (!confirmed) {
-				return TPromise.as(false);
-			}
-
-			return this._workspaceEditingService.addFolders([{ uri, name }], true).then(() => true);
-		});
-	}
-
-	$removeFolder(extensionName: string, uri: URI): Thenable<boolean> {
-		return this.confirmAddRemoveFolder(extensionName, uri, true).then(confirmed => {
-			if (!confirmed) {
-				return TPromise.as(false);
-			}
-
-			return this._workspaceEditingService.removeFolders([uri], true).then(() => true);
-		});
-	}
-
-	private confirmAddRemoveFolder(extensionName, uri: URI, isRemove: boolean): Thenable<boolean> {
-		if (!this._configurationService.getValue<boolean>('workbench.confirmChangesToWorkspaceFromExtensions')) {
-			return TPromise.as(true); // return confirmed if the setting indicates this
-		}
-
-		return this._messageService.confirm({
-			message: isRemove ?
-				localize('folderMessageRemove', "Extension '{0}' wants to remove a folder from the workspace. Please confirm.", extensionName) :
-				localize('folderMessageAdd', "Extension '{0}' wants to add a folder to the workspace. Please confirm.", extensionName),
-			detail: localize('folderPath', "Folder path: {0}", uri.scheme === 'file' ? getPathLabel(uri.fsPath, null, this._environmentService) : uri.toString()),
-			type: 'question',
-			primaryButton: isRemove ? localize('removeFolder', "&&Remove Folder") : localize('addFolder', "&&Add Folder"),
-			checkbox: {
-				label: localize('doNotAskAgain', "Do not ask me again")
-			}
-		}).then(confirmation => {
-			let updateConfirmSettingsPromise: TPromise<void> = TPromise.as(void 0);
-			if (confirmation.confirmed && confirmation.checkboxChecked === true) {
-				updateConfirmSettingsPromise = this._configurationService.updateValue('workbench.confirmChangesToWorkspaceFromExtensions', false, ConfigurationTarget.USER);
-			}
-
-			return updateConfirmSettingsPromise.then(() => confirmation.confirmed);
-		});
-	}
-
 	// --- search ---
 
 	$startSearch(include: string | IRelativePattern, exclude: string | IRelativePattern, maxResults: number, requestId: number): Thenable<URI[]> {

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -403,12 +403,6 @@ export function createApiFactory(
 			set name(value) {
 				throw errors.readonly();
 			},
-			addWorkspaceFolder(uri, name) {
-				return extHostWorkspace.addWorkspaceFolder(extension.displayName || extension.name, uri, name);
-			},
-			removeWorkspaceFolder(folder) {
-				return extHostWorkspace.removeWorkspaceFolder(extension.displayName || extension.name, folder);
-			},
 			onDidChangeWorkspaceFolders: function (listener, thisArgs?, disposables?) {
 				return extHostWorkspace.onDidChangeWorkspace(listener, thisArgs, disposables);
 			},

src/vs/workbench/api/node/extHost.protocol.ts

@@ -331,8 +331,6 @@ export interface MainThreadWorkspaceShape extends IDisposable {
 	$startSearch(include: string | IRelativePattern, exclude: string | IRelativePattern, maxResults: number, requestId: number): Thenable<URI[]>;
 	$cancelSearch(requestId: number): Thenable<boolean>;
 	$saveAll(includeUntitled?: boolean): Thenable<boolean>;
-	$addFolder(extensioName: string, uri: URI, name?: string): Thenable<boolean>;
-	$removeFolder(extensioName: string, uri: URI): Thenable<boolean>;
 }
 
 export interface MainThreadFileSystemShape extends IDisposable {

src/vs/workbench/api/node/extHostWorkspace.ts

@@ -78,18 +78,6 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 		}
 	}
 
-	addWorkspaceFolder(extensionName: string, uri: URI, name?: string): Thenable<boolean> {
-		return this._proxy.$addFolder(extensionName, uri, name);
-	}
-
-	removeWorkspaceFolder(extensionName: string, folder: vscode.WorkspaceFolder): Thenable<boolean> {
-		if (this.getWorkspaceFolders().indexOf(folder) === -1) {
-			return Promise.resolve(false);
-		}
-
-		return this._proxy.$removeFolder(extensionName, folder.uri);
-	}
-
 	getWorkspaceFolder(uri: vscode.Uri, resolveParent?: boolean): vscode.WorkspaceFolder {
 		if (!this._workspace) {
 			return undefined;

src/vs/workbench/electron-browser/main.contribution.ts

@@ -247,11 +247,6 @@ let workbenchProperties: { [path: string]: IJSONSchema; } = {
 		'type': 'boolean',
 		'description': nls.localize('closeOnFileDelete', "Controls if editors showing a file should close automatically when the file is deleted or renamed by some other process. Disabling this will keep the editor open as dirty on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data."),
 		'default': true
-	},
-	'workbench.confirmChangesToWorkspaceFromExtensions': {
-		'type': 'boolean',
-		'description': nls.localize('confirmChangesFromExtensions', "Controls if a confirmation should be shown for extensions that add or remove workspace folders."),
-		'default': true
 	}
 };