Skip to content

Fixed issue in when partial item handler would not return results correctly #275

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 3 commits into from
Aug 3, 2020
Merged

Fixed issue in when partial item handler would not return results correctly #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a178545
Re-enabled the dap standard tests
david-driscoll Aug 3, 2020
83e8f13
Fixed an issue where a method implemented using partial items would n…
david-driscoll Aug 3, 2020
24d8426
Revert "Re-enabled the dap standard tests"
david-driscoll Aug 3, 2020
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
18 changes: 9 additions & 9 deletions src/Protocol/DelegatingHandlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Reactive.Linq;
using System.Reactive.Subjects;
Expand Down Expand Up @@ -377,7 +377,7 @@ async Task<TResponse> IRequestHandler<TItem, TResponse>.Handle(TItem request,
CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<TItem>.Noop)
{
_handler(request, observer, _capability, cancellationToken);
await observer;
Expand Down Expand Up @@ -435,7 +435,7 @@ public PartialResult(Guid id, Action<TItem, IObserver<TItem>, CancellationToken>
async Task<TResponse> IRequestHandler<TItem, TResponse>.Handle(TItem request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<TItem>.Noop)
{
_handler(request, observer, cancellationToken);
await observer;
Expand Down Expand Up @@ -491,7 +491,7 @@ public PartialResultCapability(Guid id, Action<TItem, TCapability, IObserver<TIt
async Task<TResponse> IRequestHandler<TItem, TResponse>.Handle(TItem request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<TItem>.Noop)
{
_handler(request, _capability, observer, cancellationToken);
await observer;
Expand Down Expand Up @@ -547,7 +547,7 @@ public PartialResult(Guid id, Action<TItem, IObserver<TItem>, CancellationToken>
async Task<TResponse> IRequestHandler<TItem, TResponse>.Handle(TItem request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<TItem>.Noop)
{
_handler(request, observer, cancellationToken);
await observer;
Expand Down Expand Up @@ -604,7 +604,7 @@ public PartialResults(Guid id, Action<TParams, IObserver<IEnumerable<TItem>>, TC
async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<IEnumerable<TItem>>.Noop)
{
_handler(request, observer, _capability, cancellationToken);
await observer;
Expand Down Expand Up @@ -668,7 +668,7 @@ public PartialResults(Guid id, Action<TParams, IObserver<IEnumerable<TItem>>, Ca
async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<IEnumerable<TItem>>.Noop)
{
_handler(request, observer, cancellationToken);
await observer;
Expand Down Expand Up @@ -729,7 +729,7 @@ public PartialResultsCapability(Guid id, Action<TParams, TCapability, IObserver<
async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<IEnumerable<TItem>>.Noop)
{
_handler(request, _capability, observer, cancellationToken);
await observer;
Expand Down Expand Up @@ -791,7 +791,7 @@ public PartialResults(Guid id, Action<TParams, IObserver<IEnumerable<TItem>>, Ca
async Task<TResponse> IRequestHandler<TParams, TResponse>.Handle(TParams request, CancellationToken cancellationToken)
{
var observer = _progressManager.For(request, cancellationToken);
if (observer != null)
if (observer != ProgressObserver<IEnumerable<TItem>>.Noop)
{
_handler(request, observer, cancellationToken);
await observer;
Expand Down
15 changes: 14 additions & 1 deletion test/Lsp.Tests/Integration/PartialItemTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive;
Expand Down Expand Up @@ -56,6 +56,19 @@ await client.TextDocument.RequestCodeLens(new CodeLensParams() {
items.Select(z => z.Command.Name).Should().ContainInOrder("CodeLens 1", "CodeLens 2", "CodeLens 3");
}

[Fact]
public async Task Should_Behave_Like_An_Observable_Without_Progress_Support()
{
var (client, server) = await Initialize(ConfigureClient, ConfigureServerWithDelegateCodeLens);

var response = await client.SendRequest(new CodeLensParams() {
TextDocument = new TextDocumentIdentifier(@"c:\test.cs")
}, CancellationToken);

response.Should().HaveCount(3);
response.Select(z => z.Command.Name).Should().ContainInOrder("CodeLens 1", "CodeLens 2", "CodeLens 3");
}

[Fact]
public async Task Should_Behave_Like_An_Observable_With_WorkDone()
{
Expand Down