grid - cleanup

src/vs/workbench/parts/files/common/dirtyFilesTracker.ts

@@ -11,7 +11,6 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { VIEWLET_ID } from 'vs/workbench/parts/files/common/files';
 import { TextFileModelChangeEvent, ITextFileService, AutoSaveMode, ModelState } from 'vs/workbench/services/textfile/common/textfiles';
 import { platform, Platform } from 'vs/base/common/platform';
-import { Position } from 'vs/platform/editor/common/editor';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -31,7 +30,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 	constructor(
 		@ITextFileService private textFileService: ITextFileService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@INextEditorGroupsService privateeditorGroupService: INextEditorGroupsService,
+		@INextEditorGroupsService private editorGroupService: INextEditorGroupsService,
 		@INextEditorService private editorService: INextEditorService,
 		@IActivityService private activityService: IActivityService,
 		@IWindowService private windowService: IWindowService,
@@ -91,7 +90,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 
 	private doOpenDirtyResources(resources: URI[]): void {
 		const activeEditor = this.editorService.activeControl;
-		const activePosition = activeEditor ? activeEditor.group : Position.ONE;
+		const activeGroup = activeEditor ? activeEditor.group : this.editorGroupService.activeGroup.id;
 
 		// Open
 		this.editorService.openEditors(resources.map(resource => {
@@ -99,7 +98,7 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 				resource,
 				options: { inactive: true, pinned: true, preserveFocus: true }
 			};
-		}), activePosition).then(undefined, errors.onUnexpectedError);
+		}), activeGroup).then(undefined, errors.onUnexpectedError);
 	}
 
 	private onTextFilesSaved(e: TextFileModelChangeEvent[]): void {

src/vs/workbench/parts/files/electron-browser/fileCommands.ts

@@ -41,7 +41,7 @@ import { Schemas } from 'vs/base/common/network';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/nextEditorService';
-import { INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/nextEditorGroupsService';
+import { INextEditorGroupsService } from 'vs/workbench/services/group/common/nextEditorGroupsService';
 
 // Commands
 
@@ -266,12 +266,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	},
 	id: OPEN_TO_SIDE_COMMAND_ID, handler: (accessor, resource: URI | object) => {
 		const editorService = accessor.get(INextEditorService);
-		const editorGroupService = accessor.get(INextEditorGroupsService);
 		const listService = accessor.get(IListService);
 		const fileService = accessor.get(IFileService);
 		const tree = listService.lastFocusedList;
 		const resources = getMultiSelectedResources(resource, listService, editorService);
-		const activeGroup = editorGroupService.activeGroup;
 
 		// Remove highlight
 		if (tree instanceof Tree) {
@@ -282,15 +280,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		if (resources.length) {
 			return fileService.resolveFiles(resources.map(resource => ({ resource }))).then(resolved => {
 				const editors = resolved.filter(r => r.success && !r.stat.isDirectory).map(r => ({
-					resource: r.stat.resource,
-					options: { preserveFocus: false }
+					resource: r.stat.resource
 				}));
 
-				return editorService.openEditors(editors, SIDE_GROUP).then(() => {
-					if (activeGroup) {
-						editorGroupService.focusGroup(editorGroupService.findNeighbourGroup(activeGroup, GroupDirection.RIGHT));
-					}
-				});
+				return editorService.openEditors(editors, SIDE_GROUP);
 			});
 		}
 

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

@@ -77,10 +77,10 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	private registerListeners(): void {
 		this.toUnbind.push(this.textFileService.models.onModelSaved(e => this.onFileSavedOrReverted(e.resource)));
 		this.toUnbind.push(this.textFileService.models.onModelReverted(e => this.onFileSavedOrReverted(e.resource)));
-		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onEditorsChanged()));
+		this.toUnbind.push(this.editorService.onDidActiveEditorChange(() => this.onActiveEditorChanged()));
 	}
 
-	private onEditorsChanged(): void {
+	private onActiveEditorChanged(): void {
 		let isActiveEditorSaveConflictResolution = false;
 		let activeConflictResolutionResource: URI;
 
@@ -317,7 +317,7 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
 
 	const editor = editorService.activeControl;
 	const input = editor.input;
-	const position = editor.group;
+	const group = editor.group;
 
 	resolverService.createModelReference(resource).then(reference => {
 		const model = reference.object as ITextFileEditorModel;
@@ -335,12 +335,12 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
 			return model.save().then(() => {
 
 				// Reopen file input
-				return editorService.openEditor({ resource: model.getResource() }, position).then(() => {
+				return editorService.openEditor({ resource: model.getResource() }, group).then(() => {
 
 					// Clean up
 					input.dispose();
 					reference.dispose();
-					editorService.closeEditor(input, position);
+					editorService.closeEditor(input, group);
 				});
 			});
 		});
@@ -353,7 +353,7 @@ export const revertLocalChangesCommand = (accessor: ServicesAccessor, resource:
 
 	const editor = editorService.activeControl;
 	const input = editor.input;
-	const position = editor.group;
+	const group = editor.group;
 
 	resolverService.createModelReference(resource).then(reference => {
 		const model = reference.object as ITextFileEditorModel;
@@ -364,12 +364,12 @@ export const revertLocalChangesCommand = (accessor: ServicesAccessor, resource:
 		return model.revert().then(() => {
 
 			// Reopen file input
-			return editorService.openEditor({ resource: model.getResource() }, position).then(() => {
+			return editorService.openEditor({ resource: model.getResource() }, group).then(() => {
 
 				// Clean up
 				input.dispose();
 				reference.dispose();
-				editorService.closeEditor(input, position);
+				editorService.closeEditor(input, group);
 			});
 		});
 	});