Merge branch 'master' into format_keystroke

OmniSharp · Dec 5, 2017 · 2b1fa3e · 2b1fa3e · Pmarc78 · Dec 10, 2017
2 parents 7fea1ad + 099a2c1
commit 2b1fa3e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/OmniSharp.Stdio/Host.cs b/src/OmniSharp.Stdio/Host.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using OmniSharp.Endpoint;
 using OmniSharp.Mef;
 using OmniSharp.Models.UpdateBuffer;
@@ -160,6 +161,11 @@ public void Start()
                         }
                         catch (Exception e)
                         {
+                            if (e is AggregateException aggregateEx)
+                            {
+                                e = aggregateEx.Flatten().InnerException;
+                            }
+
                             _writer.WriteLine(new EventPacket()
                             {
                                 Event = "error",
@@ -218,6 +224,11 @@ private async Task HandleRequest(string json, ILogger logger)
             }
             catch (Exception e)
             {
+                if (e is AggregateException aggregateEx)
+                {
+                    e = aggregateEx.Flatten().InnerException;
+                }
+
                 // updating the response object here so that the ResponseStream
                 // prints the latest state when being closed
                 response.Success = false;
@@ -241,7 +252,7 @@ void LogRequest(string json, ILogger logger)
             try
             {
                 builder.AppendLine("************ Request ************");
-                builder.Append(json);
+                builder.Append(JToken.Parse(json).ToString(Formatting.Indented));
                 logger.LogDebug(builder.ToString());
             }
             finally
@@ -256,7 +267,7 @@ void LogResponse(string json, ILogger logger)
             try
             {
                 builder.AppendLine("************  Response ************ ");
-                builder.Append(json);
+                builder.Append(JToken.Parse(json).ToString(Formatting.Indented));
                 logger.LogDebug(builder.ToString());
             }
             finally