Client methods that take file-system paths now delegate to overloads that take document URIs (#43).

Author: tintoy

src/Client/Clients/TextDocumentClient.Completions.cs

@@ -1,4 +1,5 @@
 using OmniSharp.Extensions.LanguageServer.Models;
+using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -33,7 +34,9 @@ public partial class TextDocumentClient
             if (String.IsNullOrWhiteSpace(filePath))
                 throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath));
 
-            return PositionalRequest<CompletionList>("textDocument/completion", filePath, line, column, cancellationToken);
+            Uri documentUri = DocumentUri.FromFileSystemPath(filePath);
+
+            return Completions(documentUri, line, column, cancellationToken);
         }
 
         /// <summary>

src/Client/Clients/TextDocumentClient.Hover.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
 
 namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
 {
@@ -31,7 +32,12 @@ public partial class TextDocumentClient
         /// </returns>
         public Task<Hover> Hover(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return PositionalRequest<Hover>("textDocument/hover", filePath, line, column, cancellationToken);
+            if (String.IsNullOrWhiteSpace(filePath))
+                throw new ArgumentException("Argument cannot be null, empty, or entirely composed of whitespace: 'filePath'.", nameof(filePath));
+
+            Uri documentUri = DocumentUri.FromFileSystemPath(filePath);
+
+            return Hover(documentUri, line, column, cancellationToken);
         }
 
         /// <summary>

src/Client/Clients/TextDocumentClient.cs

@@ -31,43 +31,6 @@ public TextDocumentClient(LanguageClient client)
         /// </summary>
         public LanguageClient Client { get; }
 
-        /// <summary>
-        ///     Make a request to the server for the specified document position.
-        /// </summary>
-        /// <typeparam name="TResponse">
-        ///     The response payload type.
-        /// </typeparam>
-        /// <param name="method">
-        ///     The name of the operation to invoke.
-        /// </param>
-        /// <param name="filePath">
-        ///     The file-system path of the target document.
-        /// </param>
-        /// <param name="line">
-        ///     The target line numer (0-based).
-        /// </param>
-        /// <param name="column">
-        ///     The target column (0-based).
-        /// </param>
-        /// <param name="cancellationToken">
-        ///     A cancellation token that can be used to cancel the request.
-        /// </param>
-        /// <returns>
-        ///     A <see cref="Task{TResult}"/> representing the request.
-        /// </returns>
-        Task<TResponse> PositionalRequest<TResponse>(string method, string filePath, int line, int column, CancellationToken cancellationToken)
-        {
-            if (String.IsNullOrWhiteSpace(method))
-                throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method));
-
-            if (String.IsNullOrWhiteSpace(filePath))
-                throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath));
-
-            Uri documentUri = DocumentUri.FromFileSystemPath(filePath);
-
-            return PositionalRequest<TResponse>(method, documentUri, line, column, cancellationToken);
-        }
-
         /// <summary>
         ///     Make a request to the server for the specified document position.
         /// </summary>