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

Merge remote-tracking branch 'origin/master' into alex/tokenization

Browse Source
This commit is contained in:
Alex Dima
2017-01-06 17:06:26 +01:00
parent a7c53f5e6e 833bc88df8
commit 51b5727501
63 changed files with 448 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,7 +583,7 @@ export class TextEditorOptions extends EditorOptions {
public static from(input: IBaseResourceInput): 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') {
if (input.options.selection || input.options.viewState || input.options.forceOpen || input.options.revealIfVisible || input.options.preserveFocus || input.options.pinned || input.options.inactive || typeof input.options.index === 'number') {
options = new TextEditorOptions();
}
@@ -616,6 +616,10 @@ export class TextEditorOptions extends EditorOptions {
options.revealInCenterIfOutsideViewport = true;
}
if (input.options.viewState) {
options.editorViewState = input.options.viewState;
}
if (typeof input.options.index === 'number') {
options.index = input.options.index;
}