development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple markdown previews of the same type in the same editor group

Browse source
This commit is contained in:
Matt Bierner 2018-02-26 16:35:05 -08:00
parent e22aac5b52
commit 6b743d8c61
3 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
extensions/markdown/src/features/previewContentProvider.ts
View file

@ -283,7 +283,7 @@ class MarkdownPreview {
private throttleTimer: any;
private initialLine: number | undefined = undefined;
private readonly disposables: vscode.Disposable[] = [];
private firstUpdate = true;
private currentVersion?: { resource: vscode.Uri, version: number };
constructor(
@ -306,6 +306,10 @@ class MarkdownPreview {
this.dispose();
}, null, this.disposables);
this.webview.onDidChangeViewColumn(() => {
this._onDidChangeViewColumnEmitter.fire();
}, null, this.disposables);
this.webview.onDidReceiveMessage(e => {
vscode.commands.executeCommand(e.command, ...e.args);
}, null, this.disposables);
@ -327,18 +331,17 @@ class MarkdownPreview {
private readonly _onDisposeEmitter = new vscode.EventEmitter<void>();
public readonly onDispose = this._onDisposeEmitter.event;
private readonly _onDidChangeViewColumnEmitter = new vscode.EventEmitter<vscode.ViewColumn>();
public readonly onDidChangeViewColumn = this._onDidChangeViewColumnEmitter.event;
public dispose() {
this._onDisposeEmitter.fire();
this._onDisposeEmitter.dispose();
this._onDidChangeViewColumnEmitter.dispose();
this.webview.dispose();
while (this.disposables.length) {
const item = this.disposables.pop();
if (item) {
item.dispose();
}
}
disposeAll(this.disposables);
}
public update(resource: vscode.Uri) {
@ -351,9 +354,10 @@ class MarkdownPreview {
// Schedule update
if (!this.throttleTimer) {
this.throttleTimer = setTimeout(() => this.doUpdate(), resource.fsPath === this.resource.fsPath ? 300 : 0);
this.throttleTimer = setTimeout(() => this.doUpdate(), resource.fsPath === this.resource.fsPath && !this.firstUpdate ? 300 : 0);
}
this.firstUpdate = false;
this.resource = resource;
}
@ -375,6 +379,26 @@ class MarkdownPreview {
return this.resource.fsPath === resource.fsPath;
}
public matchesResource(
otherResource: vscode.Uri,
otherViewColumn: vscode.ViewColumn | undefined,
otherPinned: boolean
): boolean {
if (this.viewColumn !== otherViewColumn) {
return false;
}
if (this.pinned) {
return otherPinned && this.isPreviewOf(otherResource);
} else {
return !otherPinned;
}
}
public matches(otherPreview: MarkdownPreview): boolean {
return this.matchesResource(otherPreview.resource, otherPreview.viewColumn, otherPreview.pinned);
}
public show(viewColumn: vscode.ViewColumn) {
this.webview.show(viewColumn);
}
@ -463,18 +487,8 @@ export class MarkdownPreviewManager {
}
public dispose(): void {
while (this.disposables.length) {
const item = this.disposables.pop();
if (item) {
item.dispose();
}
}
while (this.previews.length) {
const item = this.previews.pop();
if (item) {
item.dispose();
}
}
disposeAll(this.disposables);
disposeAll(this.previews);
}
public refresh() {
@ -505,6 +519,9 @@ export class MarkdownPreviewManager {
this.previews.splice(existing, 1);
}
});
preview.onDidChangeViewColumn(() => {
disposeAll(this.previews.filter(otherPreview => preview !== otherPreview && preview!.matches(otherPreview)));
});
this.previews.push(preview);
}
@ -515,13 +532,17 @@ export class MarkdownPreviewManager {
resource: vscode.Uri,
previewSettings: PreviewSettings
): MarkdownPreview | undefined {
if (!previewSettings.pinned) {
// Only allow a single, non-pinned markdown preview per column
return this.previews.find(preview =>
!preview.pinned && preview.viewColumn === previewSettings.previewColumn);
}
return this.previews.find(preview =>
preview.pinned && preview.viewColumn === previewSettings.previewColumn && preview.isPreviewOf(resource));
preview.matchesResource(resource, previewSettings.previewColumn, previewSettings.pinned));
}
}
function disposeAll(disposables: vscode.Disposable[]) {
while (disposables.length) {
const item = disposables.pop();
if (item) {
item.dispose();
}
}
}

8
src/vs/workbench/api/electron-browser/mainThreadWebview.ts
View file

@ -325,13 +325,6 @@ class WebviewEditor extends BaseWebviewEditor {
super.clearInput();
}
public changePosition(position: Position): void {
if (this.input && this.input instanceof WebviewInput) {
this.input.onDidChangePosition(position);
}
super.changePosition(position);
}
async setInput(input: WebviewInput, options: EditorOptions): TPromise<void> {
if (this.input && this.input.matches(input)) {
return undefined;
@ -345,6 +338,7 @@ class WebviewEditor extends BaseWebviewEditor {
await super.setInput(input, options);
input.onDidChangePosition(this.position);
this.updateWebview(input);
}

6
src/vs/workbench/api/node/extHostWebview.ts
View file

@ -164,8 +164,10 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
const webview = this._webviews.get(handle);
if (webview) {
const newViewColumn = typeConverters.toViewColumn(newPosition);
webview.viewColumn = newViewColumn;
webview.onDidChangeViewColumnEmitter.fire(newViewColumn);
if (webview.viewColumn !== newViewColumn) {
webview.viewColumn = newViewColumn;
webview.onDidChangeViewColumnEmitter.fire(newViewColumn);
}
}
}