ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 10:38:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a (#7436)

Browse Source 
* Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a

* fix strict null checks
This commit is contained in:
Anthony Dresser
2019-09-30 23:35:45 -07:00
committed by GitHub
parent 6ab03053a0
commit 084524cd2d
196 changed files with 2927 additions and 2547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/services/extensions/common/rpcProtocol.ts
View File

@@ -364,12 +364,16 @@ export class RPCProtocol extends Disposable implements IRPCProtocol {
const pendingReply = this._pendingRPCReplies[callId];
delete this._pendingRPCReplies[callId];
let err: Error | null = null;
if (value && value.$isError) {
err = new Error();
err.name = value.name;
err.message = value.message;
err.stack = value.stack;
let err: any = undefined;
if (value) {
if (value.$isError) {
err = new Error();
err.name = value.name;
err.message = value.message;
err.stack = value.stack;
} else {
err = value;
}
}
pendingReply.resolveErr(err);
}
@@ -725,7 +729,7 @@ class MessageIO {
}
public static serializeReplyErr(req: number, err: any): VSBuffer {
if (err instanceof Error) {
if (err) {
return this._serializeReplyErrEror(req, err);
}
return this._serializeReplyErrEmpty(req);