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

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

Browse Source
This commit is contained in:
Johannes Rieken
2017-03-23 11:21:16 +01:00
parent c01a616062
commit a6a41fd6c3
5 changed files with 202 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/node/extHostDocumentData.ts
View File

@@ -28,6 +28,7 @@ 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;
@@ -48,6 +49,7 @@ export class ExtHostDocumentData extends MirrorModel2 {
ok(!this._isDisposed);
this._isDisposed = true;
this._isDirty = false;
this._isVisible = false;
}
equalLines({ lines }: ITextSource): boolean {
@@ -72,6 +74,7 @@ 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(); },
@@ -97,6 +100,16 @@ 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');

34
src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
View File

@@ -23,11 +23,13 @@ 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
@@ -40,6 +42,21 @@ 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) {
@@ -67,14 +84,6 @@ 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`);
@@ -90,6 +99,9 @@ export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape
typeConverters.toViewColumn(data.editorPosition)
);
this._editors.set(data.id, editor);
if (documentData._acceptIsVisible(true)) {
visibilityChangedDocuments.add(documentData);
}
}
}
@@ -113,6 +125,12 @@ 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);