Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - introduce IResourceDiffInput (for #17063)

Browse Source
This commit is contained in:
Benjamin Pasero
2016-12-20 16:50:20 +01:00
parent b09b9a3a1b
commit 57f3b4e824
6 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/common/editor.ts
View File

@@ -11,7 +11,7 @@ import types = require('vs/base/common/types');
import URI from 'vs/base/common/uri';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IEditor, ICommonCodeEditor, IEditorViewState, IEditorOptions as ICodeEditorOptions, IModel } from 'vs/editor/common/editorCommon';
import { IEditorInput, IEditorModel, IEditorOptions, ITextEditorOptions, IResourceInput, Position } from 'vs/platform/editor/common/editor';
import { IEditorInput, IEditorModel, IEditorOptions, ITextEditorOptions, IResourceInput, IResourceDiffInput, Position } from 'vs/platform/editor/common/editor';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
import { SyncDescriptor, AsyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -577,7 +577,7 @@ export class TextEditorOptions extends EditorOptions {
private editorViewState: IEditorViewState;
private editorOptions: ICodeEditorOptions;
public static from(input: IResourceInput): TextEditorOptions {
public static from(input: IResourceInput | IResourceDiffInput): TextEditorOptions {
let options: TextEditorOptions = null;
if (input && input.options) {
if (input.options.selection || input.options.forceOpen || input.options.revealIfVisible || input.options.preserveFocus || input.options.pinned || input.options.inactive || typeof input.options.index === 'number') {