override -> overwrite, #10659

microsoft · Jun 20, 2018 · f0ec28b · f0ec28b
1 parent 738fa55
commit f0ec28b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -677,7 +677,7 @@ suite('workspace-namespace', () => {
 		assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), 'before');
 
 		we = new vscode.WorkspaceEdit();
-		we.createFile(docUri, { override: true });
+		we.createFile(docUri, { overwrite: true });
 		assert.ok(await vscode.workspace.applyEdit(we));
 		// todo@ben
 		// assert.equal((await vscode.workspace.openTextDocument(docUri)).getText(), '');

diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -899,7 +899,7 @@ export function isResourceTextEdit(thing: any): thing is ResourceTextEdit {
 export interface ResourceFileEdit {
 	oldUri: URI;
 	newUri: URI;
-	options: { override: boolean };
+	options: { overwrite: boolean };
 }
 
 export interface ResourceTextEdit {

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -5101,7 +5101,7 @@ declare namespace monaco.languages {
 		oldUri: Uri;
 		newUri: Uri;
 		options: {
-			override: boolean;
+			overwrite: boolean;
 		};
 	}
 

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -621,9 +621,9 @@ declare module 'vscode' {
 	//#region joh: https://github.com/Microsoft/vscode/issues/10659
 
 	export interface WorkspaceEdit {
-		createFile(uri: Uri, options?: { override?: boolean }): void;
+		createFile(uri: Uri, options?: { overwrite?: boolean }): void;
 		deleteFile(uri: Uri): void;
-		renameFile(oldUri: Uri, newUri: Uri, options?: { override?: boolean }): void;
+		renameFile(oldUri: Uri, newUri: Uri, options?: { overwrite?: boolean }): void;
 
 		// replaceText(uri: Uri, range: Range, newText: string): void;
 		// insertText(uri: Uri, position: Position, newText: string): void;

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -766,7 +766,7 @@ export interface WorkspaceSymbolsDto extends IdObject {
 export interface ResourceFileEditDto {
 	oldUri: UriComponents;
 	newUri: UriComponents;
-	options: { override?: boolean };
+	options: { overwrite?: boolean };
 }
 
 export interface ResourceTextEditDto {

diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
@@ -499,7 +499,7 @@ export interface IFileOperation {
 	_type: 1;
 	from: URI;
 	to: URI;
-	options?: { override?: boolean };
+	options?: { overwrite?: boolean };
 }
 
 export interface IFileTextEdit {
@@ -512,11 +512,11 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 
 	private _edits = new Array<IFileOperation | IFileTextEdit>();
 
-	renameFile(from: vscode.Uri, to: vscode.Uri, options?: { override?: boolean }): void {
+	renameFile(from: vscode.Uri, to: vscode.Uri, options?: { overwrite?: boolean }): void {
 		this._edits.push({ _type: 1, from, to, options });
 	}
 
-	createFile(uri: vscode.Uri, options?: { override?: boolean }): void {
+	createFile(uri: vscode.Uri, options?: { overwrite?: boolean }): void {
 		this.renameFile(undefined, uri, options);
 	}
 
@@ -593,8 +593,8 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		return values(textEdits);
 	}
 
-	allEntries(): ([URI, TextEdit[]] | [URI, URI, { override?: boolean }])[] {
-		let res: ([URI, TextEdit[]] | [URI, URI, { override?: boolean }])[] = [];
+	allEntries(): ([URI, TextEdit[]] | [URI, URI, { overwrite?: boolean }])[] {
+		let res: ([URI, TextEdit[]] | [URI, URI, { overwrite?: boolean }])[] = [];
 		for (let edit of this._edits) {
 			if (edit._type === 1) {
 				res.push([edit.from, edit.to, edit.options]);

diff --git a/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/electron-browser/bulkEditService.ts
@@ -5,6 +5,7 @@
 'use strict';
 
 
+import { mergeSort } from 'vs/base/common/arrays';
 import { getPathLabel } from 'vs/base/common/labels';
 import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
@@ -27,7 +28,6 @@ import { emptyProgressRunner, IProgress, IProgressRunner } from 'vs/platform/pro
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { mergeSort } from 'vs/base/common/arrays';
 
 abstract class Recording {
 
@@ -335,12 +335,13 @@ export class BulkEdit {
 		for (const edit of edits) {
 			progress.report(undefined);
 
+			let overwrite = edit.options && edit.options.overwrite;
 			if (edit.newUri && edit.oldUri) {
-				await this._textFileService.move(edit.oldUri, edit.newUri, edit.options && edit.options.override);
+				await this._textFileService.move(edit.oldUri, edit.newUri, overwrite);
 			} else if (!edit.newUri && edit.oldUri) {
 				await this._textFileService.delete(edit.oldUri, true);
 			} else if (edit.newUri && !edit.oldUri) {
-				await this._fileService.createFile(edit.newUri, undefined, { overwrite: edit.options && edit.options.override });
+				await this._fileService.createFile(edit.newUri, undefined, { overwrite });
 			}
 		}
 	}

diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
@@ -386,12 +386,12 @@ suite('ExtHostTypes', function () {
 		const all = edit.allEntries();
 		assert.equal(all.length, 4);
 
-		function isFileChange(thing: [URI, types.TextEdit[]] | [URI, URI, { override?: boolean }]): thing is [URI, URI, { override?: boolean }] {
+		function isFileChange(thing: [URI, types.TextEdit[]] | [URI, URI, { overwrite?: boolean }]): thing is [URI, URI, { overwrite?: boolean }] {
 			const [f, s] = thing;
 			return URI.isUri(f) && URI.isUri(s);
 		}
 
-		function isTextChange(thing: [URI, types.TextEdit[]] | [URI, URI, { override?: boolean }]): thing is [URI, types.TextEdit[]] {
+		function isTextChange(thing: [URI, types.TextEdit[]] | [URI, URI, { overwrite?: boolean }]): thing is [URI, types.TextEdit[]] {
 			const [f, s] = thing;
 			return URI.isUri(f) && Array.isArray(s);
 		}