Skip to content

Commit

Permalink
Revert "adding TextDocument#isVisible and internals for a visbility c…
Browse files Browse the repository at this point in the history
…hange event, #15723"

This reverts commit a6a41fd.
  • Loading branch information
jrieken committed Mar 24, 2017
1 parent ddae83d commit 7d0805e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 202 deletions.
12 changes: 0 additions & 12 deletions extensions/vscode-api-tests/src/workspace.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,18 +160,6 @@ suite('workspace-namespace', () => {
});
});

test('openTextDocument, visible/invisible', function () {
return createRandomFile().then(file => {
return workspace.openTextDocument(file);
}).then(doc => {
assert.equal(doc.isVisible, false);
return window.showTextDocument(doc).then(editor => {
assert.ok(editor.document === doc);
assert.equal(doc.isVisible, true);
});
});
});

test('events: onDidOpenTextDocument, onDidChangeTextDocument, onDidSaveTextDocument', () => {
return createRandomFile().then(file => {
let disposables: Disposable[] = [];
Expand Down
7 changes: 1 addition & 6 deletions src/vs/vscode.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,7 @@ declare module 'vscode' {
readonly version: number;

/**
* `true` if this document is showing in one or more [editors](#TextEditor).
*/
readonly isVisible: boolean;

/**
* `true` if there are unpersisted changes.
* true if there are unpersisted changes.
*/
readonly isDirty: boolean;

Expand Down
13 changes: 0 additions & 13 deletions src/vs/workbench/api/node/extHostDocumentData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export class ExtHostDocumentData extends MirrorModel2 {
private _proxy: MainThreadDocumentsShape;
private _languageId: string;
private _isDirty: boolean;
private _isVisible: boolean = false;
private _document: vscode.TextDocument;
private _textLines: vscode.TextLine[] = [];
private _isDisposed: boolean = false;
Expand All @@ -49,7 +48,6 @@ export class ExtHostDocumentData extends MirrorModel2 {
ok(!this._isDisposed);
this._isDisposed = true;
this._isDirty = false;
this._isVisible = false;
}

equalLines({ lines }: ITextSource): boolean {
Expand All @@ -74,7 +72,6 @@ export class ExtHostDocumentData extends MirrorModel2 {
get isUntitled() { return data._uri.scheme !== 'file'; },
get languageId() { return data._languageId; },
get version() { return data._versionId; },
get isVisible() { return data._isVisible; },
get isDirty() { return data._isDirty; },
save() { return data._save(); },
getText(range?) { return range ? data._getTextInRange(range) : data.getText(); },
Expand All @@ -100,16 +97,6 @@ export class ExtHostDocumentData extends MirrorModel2 {
this._isDirty = isDirty;
}

_acceptIsVisible(value: boolean): boolean {
ok(!this._isDisposed);
if (this._isVisible === value) {
return false;
} else {
this._isVisible = value;
return true;
}
}

private _save(): TPromise<boolean> {
if (this._isDisposed) {
return TPromise.wrapError<boolean>('Document has been closed');
Expand Down
34 changes: 8 additions & 26 deletions src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down Expand Up @@ -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`);
Expand All @@ -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);
}
}
}

Expand All @@ -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);
Expand Down
145 changes: 0 additions & 145 deletions src/vs/workbench/test/node/api/extHostDocumentsAndEditors.test.ts

This file was deleted.

0 comments on commit 7d0805e

Please sign in to comment.