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

Merge branch 'master' into ben/stacks

Browse Source
This commit is contained in:
Benjamin Pasero
2016-05-21 08:06:12 +02:00
parent a26c8505fd 23c927e387
commit 6b0f18a91f
409 changed files with 18412 additions and 9764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/node/extHostEditors.ts
View File

@@ -525,7 +525,7 @@ export class MainThreadEditors {
}));
this._proxy._acceptTextEditorAdd({
id: id,
document: textEditor.getModel().getAssociatedResource(),
document: textEditor.getModel().uri,
options: textEditor.getConfiguration(),
selections: textEditor.getSelections(),
editorPosition: this._findEditorPosition(textEditor)
@@ -669,7 +669,7 @@ export class MainThreadEditors {
if (mainThreadEditor) {
let model = mainThreadEditor.getModel();
return this._workbenchEditorService.openEditor({
resource: model.getAssociatedResource(),
resource: model.uri,
options: { preserveFocus: false }
}, position).then(() => { return; });
}