Skip to content

Added SignatureHelp support. #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions src/Client/Clients/TextDocumentClient.SignatureHelp.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using OmniSharp.Extensions.LanguageServer.Client.Utilities;
using OmniSharp.Extensions.LanguageServer.Protocol;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;

namespace OmniSharp.Extensions.LanguageServer.Client.Clients
{
/// <summary>
/// Client for the LSP Text Document API.
/// </summary>
public partial class TextDocumentClient
{
/// <summary>
/// Request signature help at the specified document position.
/// </summary>
/// <param name="filePath">
/// The full file-system path of the text document.
/// </param>
/// <param name="line">
/// The target line (0-based).
/// </param>
/// <param name="column">
/// The target column (0-based).
/// </param>
/// <param name="cancellationToken">
/// An optional <see cref="CancellationToken"/> that can be used to cancel the request.
/// </param>
/// <returns>
/// A <see cref="Task{TResult}"/> that resolves to the completions or <c>null</c> if no completions are available at the specified position.
/// </returns>
public Task<SignatureHelp> SignatureHelp(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken))
{
if (string.IsNullOrWhiteSpace(filePath))
throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath));

var documentUri = DocumentUri.FromFileSystemPath(filePath);

return SignatureHelp(documentUri, line, column, cancellationToken);
}

/// <summary>
/// Request signature help at the specified document position.
/// </summary>
/// <param name="documentUri">
/// The document URI.
/// </param>
/// <param name="line">
/// The target line (0-based).
/// </param>
/// <param name="column">
/// The target column (0-based).
/// </param>
/// <param name="cancellationToken">
/// An optional <see cref="CancellationToken"/> that can be used to cancel the request.
/// </param>
/// <returns>
/// A <see cref="Task{TResult}"/> that resolves to the completions or <c>null</c> if no completions are available at the specified position.
/// </returns>
public Task<SignatureHelp> SignatureHelp(Uri documentUri, int line, int column, CancellationToken cancellationToken = default(CancellationToken))
{
return PositionalRequest<SignatureHelp>(DocumentNames.SignatureHelp, documentUri, line, column, cancellationToken);
}
}
}
67 changes: 67 additions & 0 deletions test/Client.Tests/ClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,73 @@ public async Task Completions_Success()
});
}

/// <summary>
/// Ensure that the language client can successfully request SignatureHelp.
/// </summary>
[Fact(DisplayName = "Language client can successfully request signature help", Skip = "Periodic failures")]
public async Task SignatureHelp_Success()
{
await Connect();

const int line = 5;
const int column = 5;
var expectedDocumentPath = AbsoluteDocumentPath;
var expectedDocumentUri = DocumentUri.FromFileSystemPath(expectedDocumentPath);

var expectedSignatureHelp = new SignatureHelp {
ActiveParameter = 0,
ActiveSignature = 0,
Signatures = new[] {
new SignatureInformation {
Documentation = new StringOrMarkupContent("test documentation"),
Label = "TestSignature",
Parameters = new[] {
new ParameterInformation {
Documentation = "test parameter documentation",
Label = "parameter label"
}
}
}
}
};

ServerDispatcher.HandleRequest<TextDocumentPositionParams, SignatureHelp>(DocumentNames.SignatureHelp, (request, cancellationToken) => {
Assert.NotNull(request.TextDocument);

Assert.Equal(expectedDocumentUri, request.TextDocument.Uri);

Assert.Equal(line, request.Position.Line);
Assert.Equal(column, request.Position.Character);

return Task.FromResult(expectedSignatureHelp);
});

var actualSignatureHelp = await LanguageClient.TextDocument.SignatureHelp(AbsoluteDocumentPath, line, column);

Assert.Equal(expectedSignatureHelp.ActiveParameter, actualSignatureHelp.ActiveParameter);
Assert.Equal(expectedSignatureHelp.ActiveSignature, actualSignatureHelp.ActiveSignature);

var actualSignatures = actualSignatureHelp.Signatures.ToArray();
Assert.Collection(actualSignatures, actualSignature => {
var expectedSignature = expectedSignatureHelp.Signatures.ToArray()[0];

Assert.True(actualSignature.Documentation.HasString);
Assert.Equal(expectedSignature.Documentation.String, actualSignature.Documentation.String);

Assert.Equal(expectedSignature.Label, actualSignature.Label);

var expectedParameters = expectedSignature.Parameters.ToArray();
var actualParameters = actualSignature.Parameters.ToArray();

Assert.Collection(actualParameters, actualParameter => {
var expectedParameter = expectedParameters[0];
Assert.True(actualParameter.Documentation.HasString);
Assert.Equal(expectedParameter.Documentation.String, actualParameter.Documentation.String);
Assert.Equal(expectedParameter.Label, actualParameter.Label);
});
});
}

/// <summary>
/// Ensure that the language client can successfully receive Diagnostics from the server.
/// </summary>
Expand Down