Merge pull request #628 from DustinCampbell/fix-encoding

Fix OmniSharp --encoding switch to apply to both stdin and stdout
OmniSharp · Aug 27, 2016 · 9c835ea · 9c835ea
2 parents 36f4a96 + 982d980
commit 9c835ea
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/OmniSharp.Host/Program.cs b/src/OmniSharp.Host/Program.cs
@@ -91,6 +91,15 @@ public static void Main(string[] args)
             var config = new ConfigurationBuilder()
                 .AddCommandLine(new[] { "--server.urls", $"http://{serverInterface}:{serverPort}" });
 
+            // If the --encoding switch was specified, we need to set the InputEncoding and OutputEncoding before
+            // constructing the SharedConsoleWriter. Otherwise, it might be created with the wrong encoding since
+            // it wraps around Console.Out, which gets recreated when OutputEncoding is set.
+            if (transportType == TransportType.Stdio && encoding != null)
+            {
+                Console.InputEncoding = encoding;
+                Console.OutputEncoding = encoding;
+            }
+
             var writer = new SharedConsoleWriter();
 
             var builder = new WebHostBuilder()
@@ -107,11 +116,6 @@ public static void Main(string[] args)
 
             if (transportType == TransportType.Stdio)
             {
-                if (encoding != null)
-                {
-                    Console.InputEncoding = encoding;
-                    Console.OutputEncoding = encoding;
-                }
                 builder.UseServer(new StdioServer(Console.In, writer));
             }
             else