wip /resolve route resolution

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/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/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);
+        }
+    }
+}

src/Protocol/Models/ICanBeResolved.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json.Linq;
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
+
+namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
+{
+    /// <summary>
+    /// Common interface for types that support resolution.
+    /// </summary>
+    public interface ICanBeResolved
+    {
+        /// <summary>
+        /// A data entry field that is preserved for resolve requests
+        /// </summary>
+        [Optional]
+        JToken Data { get; set; }
+    }
+}

src/Protocol/Models/Location.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
-    public class Location
+    public class Location : IEquatable<Location>
     {
         /// <summary>
         /// The uri of the document
@@ -15,5 +16,35 @@ public class Location
         /// The range in side the document given by the uri
         /// </summary>
         public Range Range { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Location);
+        }
+
+        public bool Equals(Location other)
+        {
+            return other != null &&
+                   EqualityComparer<Uri>.Default.Equals(Uri, other.Uri) &&
+                   EqualityComparer<Range>.Default.Equals(Range, other.Range);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = 1486144663;
+            hashCode = hashCode * -1521134295 + EqualityComparer<Uri>.Default.GetHashCode(Uri);
+            hashCode = hashCode * -1521134295 + EqualityComparer<Range>.Default.GetHashCode(Range);
+            return hashCode;
+        }
+
+        public static bool operator ==(Location location1, Location location2)
+        {
+            return EqualityComparer<Location>.Default.Equals(location1, location2);
+        }
+
+        public static bool operator !=(Location location1, Location location2)
+        {
+            return !(location1 == location2);
+        }
     }
 }

src/Protocol/Models/Position.cs

@@ -1,9 +1,11 @@
-using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
-    public class Position
+    public class Position : IEquatable<Position>
     {
         public Position()
         {
@@ -24,5 +26,35 @@ public Position(long line, long character)
         /// Character offset on a line in a document (zero-based).
         /// </summary>
         public long Character { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as Position);
+        }
+
+        public bool Equals(Position other)
+        {
+            return other != null &&
+                   Line == other.Line &&
+                   Character == other.Character;
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = 1927683087;
+            hashCode = hashCode * -1521134295 + Line.GetHashCode();
+            hashCode = hashCode * -1521134295 + Character.GetHashCode();
+            return hashCode;
+        }
+
+        public static bool operator ==(Position position1, Position position2)
+        {
+            return EqualityComparer<Position>.Default.Equals(position1, position2);
+        }
+
+        public static bool operator !=(Position position1, Position position2)
+        {
+            return !(position1 == position2);
+        }
     }
 }