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

Merge branch 'master' into alex/perf

Browse Source
This commit is contained in:
Alex Dima
2016-03-29 17:27:38 +02:00
parent 7fe9aa3bee 25ce394231
commit 012f47208d
324 changed files with 3692 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ export class ExtHostEditors {
if (editor) {
return editor;
} else {
throw new Error('Failed to create editor with id: ' + id);
throw new Error(`Failed to show text document ${document.uri.toString()}, should show in editor #${id}`);
}
});
}
@@ -626,6 +626,10 @@ export class MainThreadEditors {
return this._workbenchEditorService.openEditor(input, position).then(editor => {
if (!editor) {
return;
}
return new TPromise<void>(c => {
// not very nice but the way it is: changes to the editor state aren't
// send to the ext host as they happen but stuff is delayed a little. in