OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Include code in stringified errors

Browse Source 
This is done by returning the entire error stringified instead of just
the message.

This fixes the issue with the "save as" dialog.
This commit is contained in:
Asher
2019-02-26 15:46:05 -06:00
parent be3f0c437f
commit d556e110cb
7 changed files with 41 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/protocol/src/proto/node.proto
View File

@ -19,13 +19,7 @@ message EvalEventMessage {
message EvalFailedMessage {
uint64 id = 1;
enum Reason {
Timeout = 0;
Exception = 1;
Conflict = 2;
}
Reason reason = 2;
string message = 3;
string response = 2;
}
message EvalDoneMessage {

16
packages/protocol/src/proto/node_pb.d.ts vendored
View File

@ -75,11 +75,8 @@ export class EvalFailedMessage extends jspb.Message {
getId(): number;
setId(value: number): void;
getReason(): EvalFailedMessage.Reason;
setReason(value: EvalFailedMessage.Reason): void;
getMessage(): string;
setMessage(value: string): void;
getResponse(): string;
setResponse(value: string): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): EvalFailedMessage.AsObject;
@ -94,14 +91,7 @@ export class EvalFailedMessage extends jspb.Message {
export namespace EvalFailedMessage {
export type AsObject = {
id: number,
reason: EvalFailedMessage.Reason,
message: string,
}
export enum Reason {
TIMEOUT = 0,
EXCEPTION = 1,
CONFLICT = 2,
response: string,
}
}

57
packages/protocol/src/proto/node_pb.js
View File

@ -14,7 +14,6 @@ var global = Function('return this')();
goog.exportSymbol('proto.EvalDoneMessage', null, global);
goog.exportSymbol('proto.EvalEventMessage', null, global);
goog.exportSymbol('proto.EvalFailedMessage', null, global);
goog.exportSymbol('proto.EvalFailedMessage.Reason', null, global);
goog.exportSymbol('proto.NewEvalMessage', null, global);
/**
@ -554,8 +553,7 @@ proto.EvalFailedMessage.prototype.toObject = function(opt_includeInstance) {
proto.EvalFailedMessage.toObject = function(includeInstance, msg) {
var f, obj = {
id: jspb.Message.getFieldWithDefault(msg, 1, 0),
reason: jspb.Message.getFieldWithDefault(msg, 2, 0),
message: jspb.Message.getFieldWithDefault(msg, 3, "")
response: jspb.Message.getFieldWithDefault(msg, 2, "")
};
if (includeInstance) {
@ -597,12 +595,8 @@ proto.EvalFailedMessage.deserializeBinaryFromReader = function(msg, reader) {
msg.setId(value);
break;
case 2:
var value = /** @type {!proto.EvalFailedMessage.Reason} */ (reader.readEnum());
msg.setReason(value);
break;
case 3:
var value = /** @type {string} */ (reader.readString());
msg.setMessage(value);
msg.setResponse(value);
break;
default:
reader.skipField();
@ -640,32 +634,16 @@ proto.EvalFailedMessage.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = message.getReason();
if (f !== 0.0) {
writer.writeEnum(
f = message.getResponse();
if (f.length > 0) {
writer.writeString(
2,
f
);
}
f = message.getMessage();
if (f.length > 0) {
writer.writeString(
3,
f
);
}
};
/**
* @enum {number}
*/
proto.EvalFailedMessage.Reason = {
TIMEOUT: 0,
EXCEPTION: 1,
CONFLICT: 2
};
/**
* optional uint64 id = 1;
* @return {number}
@ -682,32 +660,17 @@ proto.EvalFailedMessage.prototype.setId = function(value) {
/**
* optional Reason reason = 2;
* @return {!proto.EvalFailedMessage.Reason}
*/
proto.EvalFailedMessage.prototype.getReason = function() {
return /** @type {!proto.EvalFailedMessage.Reason} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
};
/** @param {!proto.EvalFailedMessage.Reason} value */
proto.EvalFailedMessage.prototype.setReason = function(value) {
jspb.Message.setProto3EnumField(this, 2, value);
};
/**
* optional string message = 3;
* optional string response = 2;
* @return {string}
*/
proto.EvalFailedMessage.prototype.getMessage = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
proto.EvalFailedMessage.prototype.getResponse = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
};
/** @param {string} value */
proto.EvalFailedMessage.prototype.setMessage = function(value) {
jspb.Message.setProto3StringField(this, 3, value);
proto.EvalFailedMessage.prototype.setResponse = function(value) {
jspb.Message.setProto3StringField(this, 2, value);
};