Merge pull request #574 from OmniSharp/streaming-diagnostics-2

Streaming diagnostics

src/OmniSharp.Abstractions/Endpoints.cs

@@ -54,14 +54,18 @@ public static class OmnisharpEndpoints
         public const string CheckReadyStatus = "/checkreadystatus";
         public const string StopServer = "/stopserver";
 
+        public const string Open = "/open";
+        public const string Close = "/close";
+        public const string Diagnostics = "/diagnostics";
+
         public static class V2
         {
             public const string GetCodeActions = "/v2/getcodeactions";
             public const string RunCodeAction = "/v2/runcodeaction";
         }
-        
+
         public const string GetTestStartInfo = "/v2/getteststartinfo";
-        
+
         public const string RunDotNetTest = "/v2/runtest";
     }
 }

src/OmniSharp.Abstractions/Models/v1/DiagnosticMessage.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace OmniSharp.Models
+{
+    public class DiagnosticMessage
+    {
+        public IEnumerable<DiagnosticResult> Results { get; set; }
+    }
+}

src/OmniSharp.Abstractions/Models/v1/DiagnosticResult.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace OmniSharp.Models
+{
+    public class DiagnosticResult
+    {
+        public string FileName { get; set; }
+        public IEnumerable<DiagnosticLocation> QuickFixes { get; set; }
+    }
+}

src/OmniSharp.Abstractions/Models/v1/DiagnosticsRequest.cs

@@ -0,0 +1,15 @@
+using System;
+using OmniSharp.Mef;
+
+namespace OmniSharp.Models
+{
+    [OmniSharpEndpoint(OmnisharpEndpoints.Diagnostics, typeof(DiagnosticsRequest), typeof(DiagnosticsResponse))]
+    public class DiagnosticsRequest : Request
+    {
+    }
+
+    public class DiagnosticsResponse : IAggregateResponse
+    {
+        public IAggregateResponse Merge(IAggregateResponse response) { return response; }
+    }
+}

src/OmniSharp.Abstractions/Models/v1/EventTypes.cs

@@ -2,13 +2,14 @@ namespace OmniSharp.Models
 {
     public static class EventTypes
     {
-        public static readonly string ProjectAdded = "ProjectAdded";
-        public static readonly string ProjectChanged = "ProjectChanged";
-        public static readonly string ProjectRemoved = "ProjectRemoved";
-        public static readonly string Error = "Error";
-        public static readonly string MsBuildProjectDiagnostics = "MsBuildProjectDiagnostics";
-        public static readonly string PackageRestoreStarted = "PackageRestoreStarted";
-        public static readonly string PackageRestoreFinished = "PackageRestoreFinished";
-        public static readonly string UnresolvedDependencies = "UnresolvedDependencies";
+        public static readonly string ProjectAdded = nameof(ProjectAdded);
+        public static readonly string ProjectChanged = nameof(ProjectChanged);
+        public static readonly string ProjectRemoved = nameof(ProjectRemoved);
+        public static readonly string Error = nameof(Error);
+        public static readonly string Diagnostic = nameof(Diagnostic);
+        public static readonly string MsBuildProjectDiagnostics = nameof(MsBuildProjectDiagnostics);
+        public static readonly string PackageRestoreStarted = nameof(PackageRestoreStarted);
+        public static readonly string PackageRestoreFinished = nameof(PackageRestoreFinished);
+        public static readonly string UnresolvedDependencies = nameof(UnresolvedDependencies);
     }
 }

src/OmniSharp.Abstractions/Models/v1/FileCloseRequest.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using OmniSharp.Mef;
+
+namespace OmniSharp.Models
+{
+    [OmniSharpEndpoint(OmnisharpEndpoints.Close, typeof(FileCloseRequest), typeof(FileCloseResponse))]
+    public class FileCloseRequest : Request { }
+}

src/OmniSharp.Abstractions/Models/v1/FileCloseResponse.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace OmniSharp.Models
+{
+    public class FileCloseResponse : IAggregateResponse
+    {
+        public IAggregateResponse Merge(IAggregateResponse response) { return response; }
+    }
+}

src/OmniSharp.Abstractions/Models/v1/FileOpenRequest.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using OmniSharp.Mef;
+
+namespace OmniSharp.Models
+{
+    [OmniSharpEndpoint(OmnisharpEndpoints.Open, typeof(FileOpenRequest), typeof(FileOpenResponse))]
+    public class FileOpenRequest : Request { }
+}

src/OmniSharp.Abstractions/Models/v1/FileOpenResponse.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace OmniSharp.Models
+{
+    public class FileOpenResponse : IAggregateResponse
+    {
+        public IAggregateResponse Merge(IAggregateResponse response) { return response; }
+    }
+}

src/OmniSharp.Abstractions/Models/v1/FindSymbolsRequest.cs

@@ -1,6 +1,6 @@
 using OmniSharp.Mef;
 
-namespace OmniSharp.Models
+namespace OmniSharp.Models
 {
     [OmniSharpEndpoint(OmnisharpEndpoints.FindSymbols, typeof(FindSymbolsRequest), typeof(QuickFixResponse))]
     public class FindSymbolsRequest : IRequest

src/OmniSharp.Abstractions/Services/DiagnosticEventForwarder.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using OmniSharp.Models;
+using OmniSharp.Models.V2;
+using OmniSharp.Services;
+
+namespace OmniSharp.Services
+{
+    [Export, Shared]
+    public class DiagnosticEventForwarder
+    {
+        private readonly IEventEmitter _emitter;
+
+        [ImportingConstructor]
+        public DiagnosticEventForwarder(IEventEmitter emitter)
+        {
+            _emitter = emitter;
+        }
+
+        public bool IsEnabled { get; set; }
+
+        public void Forward(DiagnosticMessage message)
+        {
+            _emitter.Emit(EventTypes.Diagnostic, message);
+        }
+    }
+}

src/OmniSharp.Roslyn.CSharp/Services/Diagnostics/DiagnosticsService.cs

@@ -0,0 +1,43 @@
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using OmniSharp.Mef;
+using OmniSharp.Models;
+using OmniSharp.Services;
+using OmniSharp.Workers.Diagnostics;
+
+namespace OmniSharp.Roslyn.CSharp.Services.Diagnostics
+{
+    [OmniSharpHandler(OmnisharpEndpoints.Diagnostics, LanguageNames.CSharp)]
+    public class DiagnosticsService : RequestHandler<DiagnosticsRequest, DiagnosticsResponse>
+    {
+        private readonly CSharpDiagnosticService _diagnostics;
+        private readonly DiagnosticEventForwarder _forwarder;
+        private readonly OmnisharpWorkspace _workspace;
+
+        [ImportingConstructor]
+        public DiagnosticsService(OmnisharpWorkspace workspace, DiagnosticEventForwarder forwarder, CSharpDiagnosticService diagnostics)
+        {
+            _forwarder = forwarder;
+            _workspace = workspace;
+            _diagnostics = diagnostics;
+        }
+
+        public Task<DiagnosticsResponse> Handle(DiagnosticsRequest request)
+        {
+            if (!_forwarder.IsEnabled)
+            {
+                _forwarder.IsEnabled = true;
+            }
+
+            var documents = request.FileName != null
+                ? new [] { request.FileName }
+                : _workspace.CurrentSolution.Projects.SelectMany(project => project.Documents.Select(x => x.FilePath));
+
+            _diagnostics.QueueDiagnostics(documents.ToArray());
+
+            return Task.FromResult(new DiagnosticsResponse());
+        }
+    }
+}

src/OmniSharp.Roslyn.CSharp/Services/Files/FileCloseService.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using OmniSharp.Mef;
+using OmniSharp.Models;
+
+namespace OmniSharp.Roslyn.CSharp.Services.Files
+{
+    [OmniSharpHandler(OmnisharpEndpoints.Close, LanguageNames.CSharp)]
+    public class FileCloseService : RequestHandler<FileCloseRequest, FileCloseResponse>
+    {
+        private readonly OmnisharpWorkspace _workspace;
+
+        [ImportingConstructor]
+        public FileCloseService(OmnisharpWorkspace workspace)
+        {
+            _workspace = workspace;
+        }
+
+        public Task<FileCloseResponse> Handle(FileCloseRequest request)
+        {
+            var documents = _workspace.GetDocuments(request.FileName);
+            foreach (var document in documents)
+            {
+                _workspace.CloseDocument(document.Id);
+            }
+            return Task.FromResult(new FileCloseResponse());
+        }
+    }
+}

src/OmniSharp.Roslyn.CSharp/Services/Files/FileOpenService.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using OmniSharp.Mef;
+using OmniSharp.Models;
+
+namespace OmniSharp.Roslyn.CSharp.Services.Files
+{
+    [OmniSharpHandler(OmnisharpEndpoints.Open, LanguageNames.CSharp)]
+    public class FileOpenService : RequestHandler<FileOpenRequest, FileOpenResponse>
+    {
+        private readonly OmnisharpWorkspace _workspace;
+
+        [ImportingConstructor]
+        public FileOpenService(OmnisharpWorkspace workspace)
+        {
+            _workspace = workspace;
+        }
+
+        public Task<FileOpenResponse> Handle(FileOpenRequest request)
+        {
+            var documents = _workspace.GetDocuments(request.FileName);
+            foreach (var document in documents)
+            {
+                _workspace.OpenDocument(document.Id, false);
+            }
+            return Task.FromResult(new FileOpenResponse());
+        }
+    }
+}