development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 18:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

return early

Browse source
This commit is contained in:
Matt Bierner 2021-05-21 16:32:37 -07:00
parent b314536e56
commit 4c4ec402e7
No known key found for this signature in database
GPG key ID: 099C331567E11888
1 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
View file

@ -152,60 +152,62 @@ export class WebviewViewPane extends ViewPane {
}
private activate() {
if (!this._activated) {
this._activated = true;
const webviewId = `webviewView-${this.id.replace(/[^a-z0-9]/gi, '-')}`.toLowerCase();
const webview = this.webviewService.createWebviewOverlay(webviewId, {}, {}, undefined);
webview.state = this.viewState[storageKeys.webviewState];
this._webview.value = webview;
if (this._container) {
this._webview.value?.layoutWebviewOverElement(this._container);
}
this._webviewDisposables.add(toDisposable(() => {
this._webview.value?.release(this);
}));
this._webviewDisposables.add(webview.onDidUpdateState(() => {
this.viewState[storageKeys.webviewState] = webview.state;
}));
this._webviewDisposables.add(new WebviewWindowDragMonitor(() => this._webview.value));
const source = this._webviewDisposables.add(new CancellationTokenSource());
this.withProgress(async () => {
await this.extensionService.activateByEvent(`onView:${this.id}`);
let self = this;
const webviewView: WebviewView = {
webview,
onDidChangeVisibility: this.onDidChangeBodyVisibility,
onDispose: this.onDispose,
get title(): string | undefined { return self.setTitle; },
set title(value: string | undefined) { self.updateTitle(value); },
get description(): string | undefined { return self.titleDescription; },
set description(value: string | undefined) { self.updateTitleDescription(value); },
dispose: () => {
// Only reset and clear the webview itself. Don't dispose of the view container
this._activated = false;
this._webview.clear();
this._webviewDisposables.clear();
},
show: (preserveFocus) => {
this.viewService.openView(this.id, !preserveFocus);
}
};
await this.webviewViewService.resolve(this.id, webviewView, source.token);
});
if (this._activated) {
return;
}
this._activated = true;
const webviewId = `webviewView-${this.id.replace(/[^a-z0-9]/gi, '-')}`.toLowerCase();
const webview = this.webviewService.createWebviewOverlay(webviewId, {}, {}, undefined);
webview.state = this.viewState[storageKeys.webviewState];
this._webview.value = webview;
if (this._container) {
this._webview.value?.layoutWebviewOverElement(this._container);
}
this._webviewDisposables.add(toDisposable(() => {
this._webview.value?.release(this);
}));
this._webviewDisposables.add(webview.onDidUpdateState(() => {
this.viewState[storageKeys.webviewState] = webview.state;
}));
this._webviewDisposables.add(new WebviewWindowDragMonitor(() => this._webview.value));
const source = this._webviewDisposables.add(new CancellationTokenSource());
this.withProgress(async () => {
await this.extensionService.activateByEvent(`onView:${this.id}`);
let self = this;
const webviewView: WebviewView = {
webview,
onDidChangeVisibility: this.onDidChangeBodyVisibility,
onDispose: this.onDispose,
get title(): string | undefined { return self.setTitle; },
set title(value: string | undefined) { self.updateTitle(value); },
get description(): string | undefined { return self.titleDescription; },
set description(value: string | undefined) { self.updateTitleDescription(value); },
dispose: () => {
// Only reset and clear the webview itself. Don't dispose of the view container
this._activated = false;
this._webview.clear();
this._webviewDisposables.clear();
},
show: (preserveFocus) => {
this.viewService.openView(this.id, !preserveFocus);
}
};
await this.webviewViewService.resolve(this.id, webviewView, source.token);
});
}
protected override updateTitle(value: string | undefined) {