Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +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-25 18:20:39 +02:00
parent 8949e58e59 4a0488901d
commit 5684c02522
67 changed files with 841 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHostDocuments.ts
View File

@@ -521,7 +521,7 @@ export class MainThreadDocuments {
}
let modelUrl = model.uri;
this._modelIsSynced[modelUrl.toString()] = true;
this._modelToDisposeMap[modelUrl.toString()] = model.addBulkListener2((events) => this._onModelEvents(modelUrl, events));
this._modelToDisposeMap[modelUrl.toString()] = model.addBulkListener((events) => this._onModelEvents(modelUrl, events));
this._proxy._acceptModelAdd({
url: model.uri,
versionId: model.getVersionId(),

2
src/vs/workbench/api/node/mainThreadEditors.ts
View File

@@ -91,7 +91,7 @@ export class MainThreadTextEditor {
this._lastSelection = [ new Selection(1,1,1,1) ];
this._setConfiguration(this._readConfiguration(this._model, this._codeEditor));
this._modelListeners = [];
this._modelListeners.push(this._model.addListener2(EditorCommon.EventType.ModelOptionsChanged, (e) => {
this._modelListeners.push(this._model.onDidChangeOptions((e) => {
this._setConfiguration(this._readConfiguration(this._model, this._codeEditor));
}));