roll sample server and extension back to 'just work'

Author: david-driscoll

sample/SampleServer/Program.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.IO.Pipelines;
-using System.IO.Pipes;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -10,7 +7,6 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Server;
 using Serilog;
-using PipeOptions = System.IO.Pipes.PipeOptions;
 
 namespace SampleServer
 {
@@ -32,23 +28,19 @@ static async Task MainAsync(string[] args)
             Log.Logger = new LoggerConfiguration()
                 .Enrich.FromLogContext()
                 .WriteTo.File("log.txt", rollingInterval: RollingInterval.Day)
-                .WriteTo.Debug()
                 .MinimumLevel.Verbose()
               .CreateLogger();
 
-            var pipe = new NamedPipeServerStream("samplepipe", PipeDirection.InOut, -1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
-            await pipe.WaitForConnectionAsync();
-
             Log.Logger.Information("This only goes file...");
 
             IObserver<WorkDoneProgressReport> workDone = null;
 
             var server = await LanguageServer.From(options =>
                 options
-                    .WithInput(pipe)
-                    .WithOutput(pipe)
+                    .WithInput(Console.OpenStandardInput())
+                    .WithOutput(Console.OpenStandardOutput())
                     .ConfigureLogging(x => x
-                        .AddSerilog(Log.Logger)
+                        .AddSerilog()
                         .AddLanguageProtocolLogging()
                         .SetMinimumLevel(LogLevel.Debug))
                     .WithHandler<TextDocumentHandler>()

vscode-testextension/src/extension.ts

@@ -25,42 +25,38 @@ export function activate(context: ExtensionContext) {
     // The server is implemented in node
     let serverExe = "dotnet";
 
-    // let serverExe = 'D:\\Development\\Omnisharp\\csharp-language-server-protocol\\sample\\SampleServer\\bin\\Debug\\netcoreapp2.0\\win7-x64\\SampleServer.exe';
+    // let serverExe = "D:\\Development\\Omnisharp\\csharp-language-server-protocol\\sample\\SampleServer\\bin\\Debug\\netcoreapp2.0\\win7-x64\\SampleServer.exe";
     // let serverExe = "D:/Development/Omnisharp/omnisharp-roslyn/artifacts/publish/OmniSharp.Stdio.Driver/win7-x64/OmniSharp.exe";
     // The debug options for the server
     // let debugOptions = { execArgv: ['-lsp', '-d' };5
 
     // If the extension is launched in debug mode then the debug server options are used
     // Otherwise the run options are used
-    // let serverOptions: ServerOptions = {
-    //     // run: { command: serverExe, args: ['-lsp', '-d'] },
-    //     run: {
-    //         command: serverExe,
-    //         args: [
-    //             "D:/Development/Omnisharp/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"
-    //         ],
-    //         transport: TransportKind.pipe
-    //     },
-    //     // debug: { command: serverExe, args: ['-lsp', '-d'] }
-    //     debug: {
-    //         command: serverExe,
-    //         args: [
-    //             "D:/Development/Omnisharp/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"
-    //         ],
-    //         transport: TransportKind.pipe,
-    //         runtime: '',
-    //     }
-    // };
-    let time = 100;
-    let serverOptions = async () => {
-        await new Promise((r) => setTimeout(r, time));
-        time = 10000;
-        const [reader, writer] = createServerPipeTransport("\\\\.\\pipe\\" + "samplepipe");
-        return {
-            reader,
-            writer,
-        };
+    let serverOptions: ServerOptions = {
+        // run: { command: serverExe, args: ['-lsp', '-d'] },
+        run: {
+            command: serverExe,
+            args: ["D:/Development/Omnisharp/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"],
+            transport: TransportKind.pipe,
+        },
+        // debug: { command: serverExe, args: ['-lsp', '-d'] }
+        debug: {
+            command: serverExe,
+            args: ["D:/Development/Omnisharp/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"],
+            transport: TransportKind.pipe,
+            runtime: "",
+        },
     };
+    // let time = 100;
+    // let serverOptions = async () => {
+    //     await new Promise((r) => setTimeout(r, time));
+    //     time = 10000;
+    //     const [reader, writer] = createServerPipeTransport("\\\\.\\pipe\\" + "samplepipe");
+    //     return {
+    //         reader,
+    //         writer,
+    //     };
+    // };
 
     // Options to control the language client
     let clientOptions: LanguageClientOptions = {