Investigate microsoft#94862

chrmarti · chrmarti · commit 03a7223ee2a0 · 2020-04-21T12:05:54.000+02:00
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -409,7 +409,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				return callback({ cancel: true });
 			}
 
-			return callback({ cancel: false, responseHeaders });
+			return callback({ cancel: false });
 		});
 
 		// Remember that we loaded
diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts
@@ -48,7 +48,13 @@ export async function asJson<T = {}>(context: IRequestContext): Promise<T | null
 		return null;
 	}
 	const buffer = await streamToBuffer(context.stream);
-	return JSON.parse(buffer.toString());
+	const str = buffer.toString();
+	try {
+		return JSON.parse(str);
+	} catch (err) {
+		err.message += ':\n' + str;
+		throw err;
+	}
 }
 
 
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -100,7 +100,7 @@ class WebviewSession extends Disposable {
 						return;
 					}
 				}
-				callback({ cancel: false, responseHeaders: details.responseHeaders });
+				callback({ cancel: false });
 			});
 		}));
 	}

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {`
`409`	`409`	`return callback({ cancel: true });`
`410`	`410`	`}`
`411`	`411`
`412`		`- return callback({ cancel: false, responseHeaders });`
	`412`	`+ return callback({ cancel: false });`
`413`	`413`	`});`
`414`	`414`
`415`	`415`	`// Remember that we loaded`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,13 @@ export async function asJson<T = {}>(context: IRequestContext): Promise<T \| null`
`48`	`48`	`return null;`
`49`	`49`	`}`
`50`	`50`	`const buffer = await streamToBuffer(context.stream);`
`51`		`- return JSON.parse(buffer.toString());`
	`51`	`+ const str = buffer.toString();`
	`52`	`+ try {`
	`53`	`+ return JSON.parse(str);`
	`54`	`+ } catch (err) {`
	`55`	`+ err.message += ':\n' + str;`
	`56`	`+ throw err;`
	`57`	`+ }`
`52`	`58`	`}`
`53`	`59`
`54`	`60`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class WebviewSession extends Disposable {`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`	`102`	`}`
`103`		`- callback({ cancel: false, responseHeaders: details.responseHeaders });`
	`103`	`+ callback({ cancel: false });`
`104`	`104`	`});`
`105`	`105`	`}));`
`106`	`106`	`}`