From c545b7437265757452bd028b666259f80d47e0d1 Mon Sep 17 00:00:00 2001 From: Benjamin Russell Date: Thu, 25 May 2017 17:59:47 -0700 Subject: [PATCH] Fixing issue where error objects were not serialized with camelcase property names (#360) --- .../Hosting/Protocol/MessageWriter.cs | 7 +++++++ .../Hosting/Protocol/RequestContext.cs | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs index 2bb2badc..e77942b4 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs @@ -6,6 +6,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; +using Microsoft.SqlTools.Hosting.Contracts; using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.Hosting.Protocol.Serializers; using Microsoft.SqlTools.Utility; @@ -132,6 +133,12 @@ namespace Microsoft.SqlTools.Hosting.Protocol contentObject)); } + public async Task WriteError(string method, string requestId, Error error) + { + JToken contentObject = JToken.FromObject(error, contentSerializer); + await this.WriteMessage(Message.ResponseError(requestId, method, contentObject)); + } + #endregion } } diff --git a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs index 55847271..1ff30f9d 100644 --- a/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs +++ b/src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs @@ -47,11 +47,10 @@ namespace Microsoft.SqlTools.Hosting.Protocol Message = errorMessage, Code = errorCode }; - return this.messageWriter.WriteMessage( - Message.ResponseError( + return this.messageWriter.WriteError( requestMessage.Id, requestMessage.Method, - JToken.FromObject(error))); + error); } public virtual Task SendError(Exception e)