💄

src/vs/code/electron-main/windows.ts

@@ -448,7 +448,7 @@ export class WindowsManager implements IWindowsMainService {
 					openFilesInNewWindow = true; // only on macOS do we allow to open files in a new window if this is triggered via DOCK context
 				}
 
-				if (!openConfig.cli.extensionDevelopmentPath && windowConfig && (windowConfig.openFilesInNewWindow === 'on' || windowConfig.openFilesInNewWindow === 'off' || <any>windowConfig.openFilesInNewWindow === false /* TODO@Ben migration */)) {
+				if (!openConfig.cli.extensionDevelopmentPath && windowConfig && (windowConfig.openFilesInNewWindow === 'on' || windowConfig.openFilesInNewWindow === 'off')) {
 					openFilesInNewWindow = (windowConfig.openFilesInNewWindow === 'on');
 				}
 			}

src/vs/platform/files/common/files.ts

@@ -476,7 +476,6 @@ export interface IImportResult {
 export interface IFileOperationResult {
 	message: string;
 	fileOperationResult: FileOperationResult;
-	payload?: any;
 }
 
 export enum FileOperationResult {

src/vs/workbench/browser/parts/editor/editorGroupsControl.ts

@@ -962,7 +962,7 @@ export class EditorGroupsControl implements IEditorGroupsControl, IVerticalSashL
 			const editorService = $this.editorService;
 			const groupService = $this.editorGroupService;
 
-			const splitEditor = (typeof splitTo === 'number'); // TODO@Ben ugly split code should benefit from empty group support once available!
+			const splitEditor = (typeof splitTo === 'number');
 			const freeGroup = (stacks.groups.length === 1) ? Position.TWO : Position.THREE;
 
 			// Check for transfer from title control

src/vs/workbench/parts/files/browser/saveErrorHandler.ts

@@ -95,15 +95,6 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 
 		// Dirty write prevention
 		if ((<IFileOperationResult>error).fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
-
-			// TODO@Ben remove me once https://github.com/Microsoft/vscode/issues/13665 is resolved
-			if (error.payload) {
-				error.payload.modelValue = model.getValue();
-				error.payload.modelValueLength = error.payload.modelValue.length;
-
-				console.log(JSON.stringify(error.payload));
-			}
-
 			message = this.instantiationService.createInstance(ResolveSaveConflictMessage, model, null);
 		}
 

src/vs/workbench/services/files/node/fileService.ts

@@ -621,26 +621,9 @@ export class FileService implements IFileService {
 
 						// Find out if content length has changed
 						if (options.etag !== etag(stat.size, options.mtime)) {
-
-							// TODO@Ben remove me once https://github.com/Microsoft/vscode/issues/13665 is resolved
-							let payload: any;
-							if (this.options.verboseLogging) {
-								const contents = fs.readFileSync(absolutePath);
-								const value = contents.toString();
-
-								payload = {
-									diskByteLength: contents.length,
-									diskValueLength: value.length,
-									diskValue: value,
-									options,
-									stat
-								};
-							}
-
 							return TPromise.wrapError(<IFileOperationResult>{
 								message: 'File Modified Since',
-								fileOperationResult: FileOperationResult.FILE_MODIFIED_SINCE,
-								payload
+								fileOperationResult: FileOperationResult.FILE_MODIFIED_SINCE
 							});
 						}
 					}