Merge pull request #70 from OmniSharp/feature/resolve-routing

Route handlers for `*/resolve` endpoints

Author: david-driscoll

LSP.sln

@@ -1,8 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3F-4112-B932-2DB722A1BACC}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}"
 EndProject

src/Protocol/Document/ICodeLensResolveHandler.cs

@@ -12,5 +12,5 @@ public static partial class DocumentNames
     }
 
     [Parallel, Method(CodeLensResolve)]
-    public interface ICodeLensResolveHandler : IRequestHandler<CodeLens, CodeLens> { }
+    public interface ICodeLensResolveHandler : ICanBeResolvedHandler<CodeLens> { }
 }

src/Protocol/Document/ICompletionResolveHandler.cs

@@ -12,5 +12,5 @@ public static partial class DocumentNames
     }
 
     [Serial, Method(CompletionResolve)]
-    public interface ICompletionResolveHandler : IRequestHandler<CompletionItem, CompletionItem> { }
+    public interface ICompletionResolveHandler : ICanBeResolvedHandler<CompletionItem> { }
 }

src/Protocol/Document/IDocumentLinkHandler.cs

@@ -13,5 +13,5 @@ public static partial class DocumentNames
     }
 
     [Parallel, Method(DocumentLink)]
-    public interface IDocumentLinkHandler : IRequestHandler<DocumentLinkParams, DocumentLink>, IRegistration<DocumentLinkRegistrationOptions>, ICapability<DocumentLinkCapability> { }
+    public interface IDocumentLinkHandler : IRequestHandler<DocumentLinkParams, DocumentLinkContainer>, IRegistration<DocumentLinkRegistrationOptions>, ICapability<DocumentLinkCapability> { }
 }

src/Protocol/Models/CodeLens.cs

@@ -12,7 +12,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
     /// A code lens is _unresolved_ when no command is associated to it. For performance
     /// reasons the creation of a code lens and resolving should be done in two stages.
     /// </summary>
-    public class CodeLens
+    public class CodeLens : ICanBeResolved
     {
         /// <summary>
         /// The range in which this code lens is valid. Should only span a single line.

src/Protocol/Models/CodeLensContainer.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
@@ -33,4 +33,4 @@ public static implicit operator CodeLensContainer(List<CodeLens> items)
             return new CodeLensContainer(items);
         }
     }
-}
+}

src/Protocol/Models/CompletionItem.cs

@@ -5,7 +5,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
-    public class CompletionItem
+    public class CompletionItem : ICanBeResolved
     {
         /// <summary>
         /// The label of this completion item. By default

src/Protocol/Models/CompletionList.cs

@@ -9,14 +9,22 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
     /// Represents a collection of [completion items](#CompletionItem) to be presented
     /// in the editor.
     /// </summary>
-    public class CompletionList
+    public class CompletionList : Container<CompletionItem>
     {
-        public CompletionList(IEnumerable<CompletionItem> items)
+        public CompletionList() : base(Enumerable.Empty<CompletionItem>()) { }
+        public CompletionList(bool isIncomplete) : base(Enumerable.Empty<CompletionItem>())
         {
-            Items = items;
+            IsIncomplete = isIncomplete;
+        }
+
+        public CompletionList(IEnumerable<CompletionItem> items) : base(items) { }
+        public CompletionList(IEnumerable<CompletionItem> items, bool isIncomplete) : base(items)
+        {
+            IsIncomplete = isIncomplete;
         }
 
-        public CompletionList(IEnumerable<CompletionItem> items, bool isIncomplete) : this(items)
+        public CompletionList(params CompletionItem[] items) : base(items) { }
+        public CompletionList(bool isIncomplete, params CompletionItem[] items) : base(items)
         {
             IsIncomplete = isIncomplete;
         }
@@ -30,7 +38,7 @@ public CompletionList(IEnumerable<CompletionItem> items, bool isIncomplete) : th
         /// <summary>
         /// The completion items.
         /// </summary>
-        public IEnumerable<CompletionItem> Items { get; }
+        public IEnumerable<CompletionItem> Items => this;
 
         public static implicit operator CompletionList(CompletionItem[] items)
         {
@@ -49,7 +57,7 @@ public static implicit operator CompletionList(List<CompletionItem> items)
 
         public static implicit operator CompletionItem[] (CompletionList list)
         {
-            return list.Items.ToArray();
+            return list.ToArray();
         }
     }
 }

src/Protocol/Models/ContainerBase.cs

@@ -1,11 +1,12 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
-    public abstract class ContainerBase<T> : IEnumerable<T>
+    public abstract class ContainerBase<T> : IEnumerable<T>, IEquatable<ContainerBase<T>>
     {
         private readonly IEnumerable<T> _items;
 
@@ -14,14 +15,40 @@ public ContainerBase(IEnumerable<T> items)
             _items = items;
         }
 
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as ContainerBase<T>);
+        }
+
+        public bool Equals(ContainerBase<T> other)
+        {
+            return other != null &&
+                   EqualityComparer<IEnumerable<T>>.Default.Equals(_items, other._items);
+        }
+
         public IEnumerator<T> GetEnumerator()
         {
             return _items.GetEnumerator();
         }
 
+        public override int GetHashCode()
+        {
+            return -566117206 + EqualityComparer<IEnumerable<T>>.Default.GetHashCode(_items);
+        }
+
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
         }
+
+        public static bool operator ==(ContainerBase<T> base1, ContainerBase<T> base2)
+        {
+            return EqualityComparer<ContainerBase<T>>.Default.Equals(base1, base2);
+        }
+
+        public static bool operator !=(ContainerBase<T> base1, ContainerBase<T> base2)
+        {
+            return !(base1 == base2);
+        }
     }
 }

src/Protocol/Models/DocumentLinkContainer.cs

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