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

Merge branch 'master' into scm-api

Browse Source
This commit is contained in:
Joao Moreno
2016-11-29 10:02:46 +01:00
parent e174df6ee1 8f0f21e609
commit 76386afcac
33 changed files with 494 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/vs/workbench/api/node/mainThreadDocuments.ts
View File

@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { onUnexpectedError } from 'vs/base/common/errors';
import { toErrorMessage } from 'vs/base/common/errorMessage';
import { EmitterEvent } from 'vs/base/common/eventEmitter';
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -13,6 +12,7 @@ import { IThreadService } from 'vs/workbench/services/thread/common/threadServic
import URI from 'vs/base/common/uri';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IEventService } from 'vs/platform/event/common/event';
import { getResource } from 'vs/workbench/common/editor';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { TextFileModelChangeEvent, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -21,12 +21,14 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { ExtHostContext, MainThreadDocumentsShape, ExtHostDocumentsShape } from './extHost.protocol';
import { ITextModelResolverService } from 'vs/editor/common/services/resolverService';
import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
export class MainThreadDocuments extends MainThreadDocumentsShape {
private _modelService: IModelService;
private _modeService: IModeService;
private _textModelResolverService: ITextModelResolverService;
private _textFileService: ITextFileService;
private _codeEditorService: ICodeEditorService;
private _editorService: IWorkbenchEditorService;
private _fileService: IFileService;
private _untitledEditorService: IUntitledEditorService;
@@ -43,6 +45,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
@IModeService modeService: IModeService,
@IEventService eventService: IEventService,
@ITextFileService textFileService: ITextFileService,
@ICodeEditorService codeEditorService: ICodeEditorService,
@IWorkbenchEditorService editorService: IWorkbenchEditorService,
@IFileService fileService: IFileService,
@ITextModelResolverService textModelResolverService: ITextModelResolverService,
@@ -53,6 +56,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
this._modeService = modeService;
this._textModelResolverService = textModelResolverService;
this._textFileService = textFileService;
this._codeEditorService = codeEditorService;
this._editorService = editorService;
this._fileService = fileService;
this._untitledEditorService = untitledEditorService;
@@ -254,22 +258,32 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
const toBeDisposed: URI[] = [];
TPromise.join(Object.keys(this._virtualDocumentSet).map(key => {
let resource = URI.parse(key);
return this._editorService.createInput({ resource }).then(input => {
if (!this._editorService.isVisible(input, true)) {
toBeDisposed.push(resource);
}
if (input) {
input.dispose();
}
});
})).then(() => {
for (let resource of toBeDisposed) {
this._modelService.destroyModel(resource);
delete this._virtualDocumentSet[resource.toString()];
// list of uris used in editors
const activeResources: { [uri: string]: boolean } = Object.create(null);
for (const editor of this._codeEditorService.listCodeEditors()) {
if (editor.getModel()) {
activeResources[editor.getModel().uri.toString()] = true;
}
}, onUnexpectedError);
}
for (const workbenchEditor of this._editorService.getVisibleEditors()) {
const uri = getResource(workbenchEditor.input);
if (uri) {
activeResources[uri.toString()] = true;
}
}
// intersect with virtual documents
for (let uri in this._virtualDocumentSet) {
if (!activeResources[uri]) {
toBeDisposed.push(URI.parse(uri));
}
}
// dispose unused virtual documents
for (let resource of toBeDisposed) {
this._modelService.destroyModel(resource);
delete this._virtualDocumentSet[resource.toString()];
}
}
}