Skip to content

brought back methods that were removed by accident (#276) #277

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

brought back methods that were removed by accident (#276) #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899eb2f
brought hack methods that were removed by accident (#276)
david-driscoll Aug 4, 2020
ee5f6f9
Added tests!
david-driscoll Aug 7, 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
55 changes: 55 additions & 0 deletions src/Protocol/Window/IShowMessageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using OmniSharp.Extensions.JsonRpc;
using OmniSharp.Extensions.JsonRpc.Generation;
using OmniSharp.Extensions.LanguageServer.Protocol.Client;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using OmniSharp.Extensions.LanguageServer.Protocol.Server;

Expand All @@ -16,4 +18,57 @@ public abstract class ShowMessageHandler : IShowMessageHandler
{
public abstract Task<Unit> Handle(ShowMessageParams request, CancellationToken cancellationToken);
}

public static partial class ShowMessageExtensions
{
public static void Show(this ILanguageServer mediator, ShowMessageParams @params)
{
mediator.ShowMessage(@params);
}

public static void ShowError(this ILanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Error, Message = message });
}

public static void Show(this ILanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Log, Message = message });
}

public static void ShowWarning(this ILanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Warning, Message = message });
}

public static void ShowInfo(this ILanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Info, Message = message });
}

public static void Show(this IWindowLanguageServer mediator, ShowMessageParams @params)
{
mediator.ShowMessage(@params);
}

public static void ShowError(this IWindowLanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Error, Message = message });
}

public static void Show(this IWindowLanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Log, Message = message });
}

public static void ShowWarning(this IWindowLanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Warning, Message = message });
}

public static void ShowInfo(this IWindowLanguageServer mediator, string message)
{
mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Info, Message = message });
}
}
}
161 changes: 161 additions & 0 deletions test/Lsp.Tests/Integration/ShowMessageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Threading.Tasks;
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using NSubstitute;
using OmniSharp.Extensions.JsonRpc.Testing;
using OmniSharp.Extensions.LanguageProtocol.Testing;
using OmniSharp.Extensions.LanguageServer.Client;
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
using OmniSharp.Extensions.LanguageServer.Protocol.Window;
using OmniSharp.Extensions.LanguageServer.Server;
using Xunit;
using Xunit.Abstractions;

namespace Lsp.Tests.Integration
{
public class ShowMessageTests : LanguageProtocolTestBase
{
public ShowMessageTests(ITestOutputHelper outputHelper) : base(new JsonRpcTestOptions()
.ConfigureForXUnit(outputHelper)
.WithSettleTimeSpan(TimeSpan.FromMilliseconds(200))
)
{
}

private readonly List<ShowMessageParams> _receivedMessages = new List<ShowMessageParams>();

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

server.Window.ShowError("Something bad happened...");
server.Window.ShowInfo("Here's something cool...");
server.Window.ShowWarning("Uh-oh...");
server.Window.Show("Just gotta let you know!");
server.Window.Show(new ShowMessageParams() {
Type = MessageType.Log, Message = "1234"
});
server.Window.ShowMessage(new ShowMessageParams() {
Type = MessageType.Log, Message = "1234"
});

await SettleNext();

_receivedMessages.Should().HaveCount(6);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Error);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Info);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Warning);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Log).And.Subject.Count(z => z.Type == MessageType.Log).Should().Be(3);
}

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

server.ShowError("Something bad happened...");
server.ShowInfo("Here's something cool...");
server.ShowWarning("Uh-oh...");
server.Show("Just gotta let you know!");
server.Show(new ShowMessageParams() {
Type = MessageType.Log, Message = "1234"
});
server.ShowMessage(new ShowMessageParams() {
Type = MessageType.Log, Message = "1234"
});

await SettleNext();

_receivedMessages.Should().HaveCount(6);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Error);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Info);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Warning);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Log).And.Subject.Count(z => z.Type == MessageType.Log).Should().Be(3);
}

private void ConfigureClient(LanguageClientOptions options)
{
options.OnShowMessage((request) => { _receivedMessages.Add(request); });
}

private void ConfigureServer(LanguageServerOptions options)
{
// options.OnCodeLens()
}
}
public class LogMessageTests : LanguageProtocolTestBase
{
public LogMessageTests(ITestOutputHelper outputHelper) : base(new JsonRpcTestOptions()
.ConfigureForXUnit(outputHelper)
.WithSettleTimeSpan(TimeSpan.FromMilliseconds(200))
)
{
}

private readonly List<LogMessageParams> _receivedMessages = new List<LogMessageParams>();

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

server.Window.LogError("Something bad happened...");
server.Window.LogInfo("Here's something cool...");
server.Window.LogWarning("Uh-oh...");
server.Window.Log("Just gotta let you know!");
server.Window.Log(new LogMessageParams() {
Type = MessageType.Log, Message = "1234"
});
server.Window.LogMessage(new LogMessageParams() {
Type = MessageType.Log, Message = "1234"
});

await SettleNext();

_receivedMessages.Should().HaveCount(6);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Error);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Info);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Warning);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Log).And.Subject.Count(z => z.Type == MessageType.Log).Should().Be(3);
}

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

server.LogError("Something bad happened...");
server.LogInfo("Here's something cool...");
server.LogWarning("Uh-oh...");
server.Log("Just gotta let you know!");
server.Log(new LogMessageParams() {
Type = MessageType.Log, Message = "1234"
});
server.LogMessage(new LogMessageParams() {
Type = MessageType.Log, Message = "1234"
});

await SettleNext();

_receivedMessages.Should().HaveCount(6);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Error);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Info);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Warning);
_receivedMessages.Should().Contain(z => z.Type == MessageType.Log).And.Subject.Count(z => z.Type == MessageType.Log).Should().Be(3);
}

private void ConfigureClient(LanguageClientOptions options)
{
options.OnLogMessage((request) => { _receivedMessages.Add(request); });
}

private void ConfigureServer(LanguageServerOptions options)
{
// options.OnCodeLens()
}
}
}