uncaught exception from ProxyChannel.fromService (fix microsoft#192365) (microsoft#194387)

bpasero · web-flow · commit e3b1667192c5 · 2023-09-28T11:16:51.000+01:00
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
@@ -1129,7 +1129,11 @@ export namespace ProxyChannel {
 						}
 					}
 
-					return target.apply(handler, args);
+					let res = target.apply(handler, args);
+					if (!(res instanceof Promise)) {
+						res = Promise.resolve(res);
+					}
+					return res;
 				}
 
 				throw new ErrorNoTelemetry(`Method not found: ${command}`);

Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,11 @@ export namespace ProxyChannel {`
`1129`	`1129`	`}`
`1130`	`1130`	`}`
`1131`	`1131`
`1132`		`- return target.apply(handler, args);`
	`1132`	`+ let res = target.apply(handler, args);`
	`1133`	`+ if (!(res instanceof Promise)) {`
	`1134`	`+ res = Promise.resolve(res);`
	`1135`	`+ }`
	`1136`	`+ return res;`
`1133`	`1137`	`}`
`1134`	`1138`
`1135`	`1139`	throw new ErrorNoTelemetry(`Method not found: ${command}`);