Skip to content

ensure prepare rename does not try to register with the client #414

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.

Sign up for GitHub

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
Nov 6, 2020
Merged

ensure prepare rename does not try to register with the client #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Protocol/Document/IPrepareRenameHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Document
[GenerateHandlerMethods]
[GenerateRequestMethods(typeof(ITextDocumentLanguageClient), typeof(ILanguageClient))]
public interface IPrepareRenameHandler : IJsonRpcRequestHandler<PrepareRenameParams, RangeOrPlaceholderRange?>, IRegistration<TextDocumentRegistrationOptions>,
ICapability<RenameCapability>
ICapability<RenameCapability>, IDoesNotParticipateInRegistration
{
}

Expand Down
15 changes: 15 additions & 0 deletions test/Lsp.Tests/Integration/RenameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using OmniSharp.Extensions.LanguageServer.Server;
using Serilog.Events;
using TestingUtils;
using Xunit;
using Xunit.Abstractions;
using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
Expand Down Expand Up @@ -192,6 +193,20 @@ public async Task Should_Handle_Prepare_Rename_With_DefaultBehavior()
result!.IsDefaultBehavior.Should().BeTrue();
}

[Fact]
public async Task Should_Not_Register_Prepare_Rename()
{
var (client, _) = await Initialize(ClientOptionsAction, ServerOptionsAction);
await client.DelayUntil(
c => client.RegistrationManager.CurrentRegistrations.Any(z => z.Method == TextDocumentNames.Rename),
CancellationToken
);

await SettleNext();

client.RegistrationManager.CurrentRegistrations.Should().NotContain(z => z.Method == TextDocumentNames.PrepareRename);
}

private void ServerOptionsAction(LanguageServerOptions obj)
{
obj.OnPrepareRename(
Expand Down