Revert "adding TextDocument#isVisible and internals for a visbility change event, #15723"

This reverts commit a6a41fd6c3.
This commit is contained in:
Johannes Rieken
2017-03-24 12:16:01 +01:00
parent ddae83d371
commit 7d0805e00f
5 changed files with 9 additions and 202 deletions

View File

@@ -23,13 +23,11 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
private readonly _onDidRemoveDocuments = new Emitter<ExtHostDocumentData[]>();
private readonly _onDidChangeVisibleTextEditors = new Emitter<ExtHostTextEditor[]>();
private readonly _onDidChangeActiveTextEditor = new Emitter<ExtHostTextEditor>();
private readonly _onDidChangeVisibleDocuments = new Emitter<ExtHostDocumentData[]>();
readonly onDidAddDocuments: Event<ExtHostDocumentData[]> = this._onDidAddDocuments.event;
readonly onDidRemoveDocuments: Event<ExtHostDocumentData[]> = this._onDidRemoveDocuments.event;
readonly onDidChangeVisibleTextEditors: Event<ExtHostTextEditor[]> = this._onDidChangeVisibleTextEditors.event;
readonly onDidChangeActiveTextEditor: Event<ExtHostTextEditor> = this._onDidChangeActiveTextEditor.event;
readonly onDidChangeVisibleTextDocuments: Event<ExtHostDocumentData[]> = this._onDidChangeVisibleDocuments.event;
constructor(
@IThreadService private _threadService: IThreadService
@@ -42,21 +40,6 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
const removedDocuments: ExtHostDocumentData[] = [];
const addedDocuments: ExtHostDocumentData[] = [];
const removedEditors: ExtHostTextEditor[] = [];
const visibilityChangedDocuments = new Set<ExtHostDocumentData>();
if (delta.removedEditors) {
for (const id of delta.removedEditors) {
const editor = this._editors.get(id);
this._editors.delete(id);
removedEditors.push(editor);
const uri = editor.document.uri.toString();
const data = this._documents.get(uri);
if (data._acceptIsVisible(false)) {
visibilityChangedDocuments.add(data);
}
}
}
if (delta.removedDocuments) {
for (const id of delta.removedDocuments) {
@@ -84,6 +67,14 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
}
}
if (delta.removedEditors) {
for (const id of delta.removedEditors) {
const editor = this._editors.get(id);
this._editors.delete(id);
removedEditors.push(editor);
}
}
if (delta.addedEditors) {
for (const data of delta.addedEditors) {
assert.ok(this._documents.has(data.document.toString()), `document '${data.document}' does not exist`);
@@ -99,9 +90,6 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
typeConverters.toViewColumn(data.editorPosition)
);
this._editors.set(data.id, editor);
if (documentData._acceptIsVisible(true)) {
visibilityChangedDocuments.add(documentData);
}
}
}
@@ -125,12 +113,6 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
this._onDidChangeActiveTextEditor.fire(this.activeEditor());
}
if (visibilityChangedDocuments.size > 0) {
const documents: ExtHostDocumentData[] = [];
visibilityChangedDocuments.forEach(data => documents.push(data));
this._onDidChangeVisibleDocuments.fire(documents);
}
// now that the events are out, dispose removed documents and editors
dispose(removedDocuments);
dispose(removedEditors);