Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-18 18:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

notebooks: show a more friendly error if preloads fail

Browse Source 
Fixes https://github.com/microsoft/vscode/issues/105946
This commit is contained in:
Connor Peet
2020-09-28 15:45:23 -07:00
parent 219a470363
commit b2e7c41d64
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+15 -20
View File
@@ -148,7 +148,8 @@ export interface IFocusOutputMessage {
}
export interface IPreloadResource {
uri: string
originalUri: string;
uri: string;
}
export interface IUpdatePreloadResourceMessage {
@@ -800,19 +801,15 @@ var requirejs = (function() {
await this._loaded;
const resources: IPreloadResource[] = [];
preloads = preloads.map(preload => {
if (this.environmentService.isExtensionDevelopment && (preload.scheme === 'http' || preload.scheme === 'https')) {
return preload;
}
return asWebviewUri(this.environmentService, this.id, preload);
});
for (const preload of preloads) {
const uri = this.environmentService.isExtensionDevelopment && (preload.scheme === 'http' || preload.scheme === 'https')
? preload : asWebviewUri(this.environmentService, this.id, preload);
preloads.forEach(e => {
if (!this._preloadsCache.has(e.toString())) {
resources.push({ uri: e.toString() });
this._preloadsCache.add(e.toString());
if (!this._preloadsCache.has(uri.toString())) {
resources.push({ uri: uri.toString(), originalUri: preload.toString() });
this._preloadsCache.add(uri.toString());
}
});
}
if (!resources.length) {
return;
@@ -833,19 +830,17 @@ var requirejs = (function() {
const resources: IPreloadResource[] = [];
const extensionLocations: URI[] = [];
for (const rendererInfo of renderers) {
const preloads = [rendererInfo.entrypoint, ...rendererInfo.preloads]
.map(preload => asWebviewUri(this.environmentService, this.id, preload));
extensionLocations.push(rendererInfo.extensionLocation);
preloads.forEach(e => {
const resource: IPreloadResource = { uri: e.toString() };
for (const preload of [rendererInfo.entrypoint, ...rendererInfo.preloads]) {
const uri = asWebviewUri(this.environmentService, this.id, preload);
const resource: IPreloadResource = { uri: uri.toString(), originalUri: preload.toString() };
requiredPreloads.push(resource);
if (!this._preloadsCache.has(e.toString())) {
if (!this._preloadsCache.has(uri.toString())) {
resources.push(resource);
this._preloadsCache.add(e.toString());
this._preloadsCache.add(uri.toString());
}
});
}
}
if (!resources.length) {
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+20 -6
View File
@@ -308,7 +308,7 @@ function webviewPreloads() {
* Map of preload resource URIs to promises that resolve one the resource
* loads or errors.
*/
const preloadPromises = new Map<string, Promise<void>>();
const preloadPromises = new Map<string, Promise<string | undefined /* error string, or undefined if ok */>>();
const queuedOuputActions = new Map<string, Promise<void>>();
/**
@@ -341,7 +341,7 @@ function webviewPreloads() {
switch (event.data.type) {
case 'html':
enqueueOutputAction(event.data, async data => {
await Promise.all(data.requiredPreloads.map(p => preloadPromises.get(p.uri)));
const preloadErrs = await Promise.all(data.requiredPreloads.map(p => preloadPromises.get(p.uri)));
if (!queuedOuputActions.has(data.outputId)) { // output was cleared while loading
return;
}
@@ -378,6 +378,18 @@ function webviewPreloads() {
outputNode.innerHTML = content.htmlContent;
cellOutputContainer.appendChild(outputNode);
domEval(outputNode);
} else if (preloadErrs.some(e => !!e)) {
outputNode.innerText = `Error loading preloads:`;
const errList = document.createElement('ul');
for (const err of preloadErrs) {
if (err) {
const item = document.createElement('li');
item.innerText = err;
errList.appendChild(item);
}
}
outputNode.appendChild(errList);
cellOutputContainer.appendChild(outputNode);
} else {
onDidCreateOutput.fire([data.apiNamespace, {
element: outputNode,
@@ -465,13 +477,15 @@ function webviewPreloads() {
const resources = event.data.resources;
const preloadsContainer = document.getElementById('__vscode_preloads')!;
for (let i = 0; i < resources.length; i++) {
const { uri } = resources[i];
const { uri, originalUri } = resources[i];
const scriptTag = document.createElement('script');
scriptTag.setAttribute('src', uri);
preloadsContainer.appendChild(scriptTag);
preloadPromises.set(uri, new Promise<void>(resolve => {
scriptTag.addEventListener('load', () => resolve());
scriptTag.addEventListener('error', () => resolve());
preloadPromises.set(uri, new Promise<string | undefined>(resolve => {
scriptTag.addEventListener('load', () => resolve(undefined));
scriptTag.addEventListener('error', () =>
resolve(`Network error loading ${originalUri}, does the path exist?`)
);
}));
}
break;