merged with latest changes, renamed DocumentSymbolInformationOrDocumentSymbol

Author: david-driscoll

src/Protocol/Document/Client/DocumentSymbolExtensions.cs

@@ -9,9 +9,9 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Client
 {
     public static class DocumentSymbolExtensions
     {
-        public static Task<DocumentSymbolInformationOrDocumentSymbolContainer> DocumentSymbol(this ILanguageClientDocument mediator, DocumentSymbolParams @params)
+        public static Task<SymbolInformationOrDocumentSymbolContainer> DocumentSymbol(this ILanguageClientDocument mediator, DocumentSymbolParams @params)
         {
-            return mediator.SendRequest<DocumentSymbolParams, DocumentSymbolInformationOrDocumentSymbolContainer>(DocumentNames.DocumentSymbol, @params);
+            return mediator.SendRequest<DocumentSymbolParams, SymbolInformationOrDocumentSymbolContainer>(DocumentNames.DocumentSymbol, @params);
         }
     }
 }

src/Protocol/Document/Server/IDocumentSymbolHandler.cs

@@ -8,5 +8,5 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Server
 {
     using static DocumentNames;
     [Parallel, Method(DocumentSymbol)]
-    public interface IDocumentSymbolHandler : IJsonRpcRequestHandler<DocumentSymbolParams, DocumentSymbolInformationOrDocumentSymbolContainer>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DocumentSymbolCapability> { }
+    public interface IDocumentSymbolHandler : IJsonRpcRequestHandler<DocumentSymbolParams, SymbolInformationOrDocumentSymbolContainer>, IRegistration<TextDocumentRegistrationOptions>, ICapability<DocumentSymbolCapability> { }
 }

src/Protocol/Models/DocumentSymbolInformationOrDocumentSymbolContainer.cs

@@ -4,7 +4,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
-    public class DocumentSymbolParams : ITextDocumentIdentifierParams, IRequest<DocumentSymbolInformationOrDocumentSymbolContainer>
+    public class DocumentSymbolParams : ITextDocumentIdentifierParams, IRequest<SymbolInformationOrDocumentSymbolContainer>
     {
         /// <summary>
         /// The text document.

src/Protocol/Models/DocumentSymbolParams.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    public class SymbolInformationOrDocumentSymbolContainer : Container<SymbolInformationOrDocumentSymbol>
+    {
+        public SymbolInformationOrDocumentSymbolContainer() : this(Enumerable.Empty<SymbolInformationOrDocumentSymbol>())
+        {
+        }
+
+        public SymbolInformationOrDocumentSymbolContainer(IEnumerable<SymbolInformationOrDocumentSymbol> items) : base(items)
+        {
+        }
+
+        public SymbolInformationOrDocumentSymbolContainer(params SymbolInformationOrDocumentSymbol[] items) : base(items)
+        {
+        }
+
+        public static implicit operator SymbolInformationOrDocumentSymbolContainer(SymbolInformationOrDocumentSymbol[] items)
+        {
+            return new SymbolInformationOrDocumentSymbolContainer(items);
+        }
+
+        public static implicit operator SymbolInformationOrDocumentSymbolContainer(Collection<SymbolInformationOrDocumentSymbol> items)
+        {
+            return new SymbolInformationOrDocumentSymbolContainer(items);
+        }
+
+        public static implicit operator SymbolInformationOrDocumentSymbolContainer(List<SymbolInformationOrDocumentSymbol> items)
+        {
+            return new SymbolInformationOrDocumentSymbolContainer(items);
+        }
+    }
+}

src/Protocol/Models/DocumentSymbolInformationOrDocumentSymbol.cs renamed to src/Protocol/Models/SymbolInformationOrDocumentSymbol.cs

@@ -40,5 +40,4 @@ public override CommandOrCodeAction ReadJson(JsonReader reader, Type objectType,
 
         public override bool CanRead => true;
     }
-    //DocumentSymbolInformationOrDocumentSymbolConverter
 }