diff --git a/LSP.sln b/LSP.sln index 085107475..b22028854 100644 --- a/LSP.sln +++ b/LSP.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 +VisualStudioVersion = 15.0.27004.2009 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3F-4112-B932-2DB722A1BACC}" EndProject @@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{AE4D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonRpc", "src\JsonRpc\JsonRpc.csproj", "{9AF43FA2-EF35-435E-B59E-724877E44DDA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lsp", "src\Lsp\Lsp.csproj", "{50EA648A-67D3-4127-9517-EC7C1426E2E7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonRpc.Tests", "test\JsonRpc.Tests\JsonRpc.Tests.csproj", "{35F9B883-36D0-4F3B-A191-9BBD05B798A7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lsp.Tests", "test\Lsp.Tests\Lsp.Tests.csproj", "{482B180B-FD5C-4705-BBE1-094C905F1E1F}" @@ -35,6 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "src\Client\Client EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.Tests", "test\Client.Tests\Client.Tests.csproj", "{97437BE1-2EC3-4F6B-AC75-C3E099040A07}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Protocol", "src\Protocol\Protocol.csproj", "{92B331E9-5225-428D-AE82-37F5F46156A3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "src\Server\Server.csproj", "{E540868F-438E-4F7F-BBB7-010D6CB18A57}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,18 +59,6 @@ Global {9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x64.Build.0 = Release|Any CPU {9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x86.ActiveCfg = Release|Any CPU {9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x86.Build.0 = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x64.ActiveCfg = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x64.Build.0 = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x86.ActiveCfg = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x86.Build.0 = Debug|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|Any CPU.Build.0 = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x64.ActiveCfg = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x64.Build.0 = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x86.ActiveCfg = Release|Any CPU - {50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x86.Build.0 = Release|Any CPU {35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -129,18 +119,43 @@ Global {97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x64.Build.0 = Release|Any CPU {97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x86.ActiveCfg = Release|Any CPU {97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x86.Build.0 = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x64.ActiveCfg = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x64.Build.0 = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x86.ActiveCfg = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x86.Build.0 = Debug|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|Any CPU.Build.0 = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x64.ActiveCfg = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x64.Build.0 = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x86.ActiveCfg = Release|Any CPU + {92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x86.Build.0 = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x64.ActiveCfg = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x64.Build.0 = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x86.ActiveCfg = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x86.Build.0 = Debug|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|Any CPU.Build.0 = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x64.ActiveCfg = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x64.Build.0 = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x86.ActiveCfg = Release|Any CPU + {E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {9AF43FA2-EF35-435E-B59E-724877E44DDA} = {D764E024-3D3F-4112-B932-2DB722A1BACC} - {50EA648A-67D3-4127-9517-EC7C1426E2E7} = {D764E024-3D3F-4112-B932-2DB722A1BACC} {35F9B883-36D0-4F3B-A191-9BBD05B798A7} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA} {482B180B-FD5C-4705-BBE1-094C905F1E1F} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA} {F2067F5F-FA4E-4990-B301-E7898FC4C45F} = {A316FCEC-81AD-45FB-93EE-C62CA09300DC} {417E95B2-5AB9-49D5-B7CD-12255472E2E7} = {D764E024-3D3F-4112-B932-2DB722A1BACC} {97437BE1-2EC3-4F6B-AC75-C3E099040A07} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA} + {92B331E9-5225-428D-AE82-37F5F46156A3} = {D764E024-3D3F-4112-B932-2DB722A1BACC} + {E540868F-438E-4F7F-BBB7-010D6CB18A57} = {D764E024-3D3F-4112-B932-2DB722A1BACC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D38DD0EC-D095-4BCD-B8AF-2D788AF3B9AE} diff --git a/sample/SampleServer/Program.cs b/sample/SampleServer/Program.cs index d9839c1d9..583e8af35 100644 --- a/sample/SampleServer/Program.cs +++ b/sample/SampleServer/Program.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using OmniSharp.Extensions.LanguageServer; +using OmniSharp.Extensions.LanguageServer.Server; namespace SampleServer { diff --git a/sample/SampleServer/SampleServer.csproj b/sample/SampleServer/SampleServer.csproj index da7a95171..829fbb6f8 100644 --- a/sample/SampleServer/SampleServer.csproj +++ b/sample/SampleServer/SampleServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/sample/SampleServer/TextDocumentHandler.cs b/sample/SampleServer/TextDocumentHandler.cs index b85a7d9fc..233aff09f 100644 --- a/sample/SampleServer/TextDocumentHandler.cs +++ b/sample/SampleServer/TextDocumentHandler.cs @@ -1,12 +1,11 @@ using System; using System.Threading.Tasks; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; +using OmniSharp.Extensions.LanguageServer.Server; namespace SampleServer { @@ -105,4 +104,4 @@ public TextDocumentAttributes GetTextDocumentAttributes(Uri uri) return new TextDocumentAttributes(uri, "csharp"); } } -} \ No newline at end of file +} diff --git a/src/Client/Client.csproj b/src/Client/Client.csproj index a64afa939..c0d87044b 100644 --- a/src/Client/Client.csproj +++ b/src/Client/Client.csproj @@ -4,7 +4,7 @@ netstandard2.0 AnyCPU OmniSharp.Extensions.LanguageClient - OmniSharp.Extensions.LanguageServerProtocol.Client + OmniSharp.Extensions.LanguageServer.Client @@ -16,6 +16,6 @@ - + diff --git a/src/Client/Clients/TextDocumentClient.Completions.cs b/src/Client/Clients/TextDocumentClient.Completions.cs index fd54700ed..8a85496cb 100644 --- a/src/Client/Clients/TextDocumentClient.Completions.cs +++ b/src/Client/Clients/TextDocumentClient.Completions.cs @@ -1,10 +1,11 @@ -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities; 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.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Text Document API. @@ -31,7 +32,7 @@ public partial class TextDocumentClient /// public Task Completions(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken)) { - if (String.IsNullOrWhiteSpace(filePath)) + 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); @@ -59,7 +60,7 @@ public partial class TextDocumentClient /// public Task Completions(Uri documentUri, int line, int column, CancellationToken cancellationToken = default(CancellationToken)) { - return PositionalRequest("textDocument/completion", documentUri, line, column, cancellationToken); + return PositionalRequest(DocumentNames.Completion, documentUri, line, column, cancellationToken); } } } diff --git a/src/Client/Clients/TextDocumentClient.Diagnostics.cs b/src/Client/Clients/TextDocumentClient.Diagnostics.cs index 4cc773875..afd032e75 100644 --- a/src/Client/Clients/TextDocumentClient.Diagnostics.cs +++ b/src/Client/Clients/TextDocumentClient.Diagnostics.cs @@ -1,11 +1,9 @@ -using OmniSharp.Extensions.LanguageServer.Models; using System; using System.Collections.Generic; -using System.IO; -using System.Threading; -using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Text Document API. @@ -29,12 +27,13 @@ public IDisposable OnPublishDiagnostics(PublishDiagnosticsHandler handler) if (handler == null) throw new ArgumentNullException(nameof(handler)); - return Client.HandleNotification("textDocument/publishDiagnostics", notification => + return Client.HandleNotification(DocumentNames.PublishDiagnostics, notification => { + if (notification.Diagnostics == null) if (notification.Diagnostics == null) return; // Invalid notification. - List diagnostics = new List(); + var diagnostics = new List(); if (notification.Diagnostics != null) diagnostics.AddRange(notification.Diagnostics); diff --git a/src/Client/Clients/TextDocumentClient.Hover.cs b/src/Client/Clients/TextDocumentClient.Hover.cs index c028bfd65..5f853c6a7 100644 --- a/src/Client/Clients/TextDocumentClient.Hover.cs +++ b/src/Client/Clients/TextDocumentClient.Hover.cs @@ -1,11 +1,11 @@ -using OmniSharp.Extensions.LanguageServer.Models; using System; -using System.IO; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities; +using OmniSharp.Extensions.LanguageServer.Client.Utilities; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Text Document API. @@ -32,7 +32,7 @@ public partial class TextDocumentClient /// public Task Hover(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken)) { - if (String.IsNullOrWhiteSpace(filePath)) + 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); @@ -60,7 +60,7 @@ public partial class TextDocumentClient /// public Task Hover(Uri documentUri, int line, int column, CancellationToken cancellationToken = default(CancellationToken)) { - return PositionalRequest("textDocument/hover", documentUri, line, column, cancellationToken); + return PositionalRequest(DocumentNames.Hover, documentUri, line, column, cancellationToken); } } } diff --git a/src/Client/Clients/TextDocumentClient.Sync.cs b/src/Client/Clients/TextDocumentClient.Sync.cs index 0cd9d0454..e41549dfc 100644 --- a/src/Client/Clients/TextDocumentClient.Sync.cs +++ b/src/Client/Clients/TextDocumentClient.Sync.cs @@ -1,11 +1,10 @@ -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities; using System; using System.IO; -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.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Text Document API. @@ -29,7 +28,7 @@ public partial class TextDocumentClient /// public void DidOpen(string filePath, string languageId, int version = 0) { - if (String.IsNullOrWhiteSpace(filePath)) + if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath)); string text = null; @@ -61,7 +60,7 @@ public void DidOpen(string filePath, string languageId, int version = 0) /// public void DidOpen(string filePath, string languageId, string text, int version = 0) { - if (String.IsNullOrWhiteSpace(filePath)) + 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); @@ -89,7 +88,7 @@ public void DidOpen(Uri documentUri, string languageId, string text, int version if (documentUri == null) throw new ArgumentNullException(nameof(documentUri)); - Client.SendNotification("textDocument/didOpen", new DidOpenTextDocumentParams + Client.SendNotification(DocumentNames.DidOpen, new DidOpenTextDocumentParams { TextDocument = new TextDocumentItem { @@ -120,7 +119,7 @@ public void DidOpen(Uri documentUri, string languageId, string text, int version /// public void DidChange(string filePath, string languageId, int version = 0) { - if (String.IsNullOrWhiteSpace(filePath)) + if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath)); string text = null; @@ -155,7 +154,7 @@ public void DidChange(string filePath, string languageId, int version = 0) /// public void DidChange(string filePath, string languageId, string text, int version = 0) { - if (String.IsNullOrWhiteSpace(filePath)) + 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); @@ -186,7 +185,7 @@ public void DidChange(Uri documentUri, string languageId, string text, int versi if (documentUri == null) throw new ArgumentNullException(nameof(documentUri)); - Client.SendNotification("textDocument/didChange", new DidChangeTextDocumentParams + Client.SendNotification(DocumentNames.DidChange, new DidChangeTextDocumentParams { TextDocument = new VersionedTextDocumentIdentifier { @@ -211,7 +210,7 @@ public void DidChange(Uri documentUri, string languageId, string text, int versi /// public void DidClose(string filePath) { - if (String.IsNullOrWhiteSpace(filePath)) + if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath)); DidClose( @@ -230,7 +229,7 @@ public void DidClose(Uri documentUri) if (documentUri == null) throw new ArgumentNullException(nameof(documentUri)); - Client.SendNotification("textDocument/didClose", new DidCloseTextDocumentParams + Client.SendNotification(DocumentNames.DidClose, new DidCloseTextDocumentParams { TextDocument = new TextDocumentItem { @@ -247,7 +246,7 @@ public void DidClose(Uri documentUri) /// public void DidSave(string filePath) { - if (String.IsNullOrWhiteSpace(filePath)) + if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath)); DidSave( @@ -266,7 +265,7 @@ public void DidSave(Uri documentUri) if (documentUri == null) throw new ArgumentNullException(nameof(documentUri)); - Client.SendNotification("textDocument/didSave", new DidSaveTextDocumentParams + Client.SendNotification(DocumentNames.DidSave, new DidSaveTextDocumentParams { TextDocument = new TextDocumentItem { diff --git a/src/Client/Clients/TextDocumentClient.cs b/src/Client/Clients/TextDocumentClient.cs index bde0d3107..5fa0676e4 100644 --- a/src/Client/Clients/TextDocumentClient.cs +++ b/src/Client/Clients/TextDocumentClient.cs @@ -1,11 +1,9 @@ -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities; using System; -using System.IO; using System.Threading; using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Text Document API. @@ -57,7 +55,7 @@ public TextDocumentClient(LanguageClient client) /// async Task PositionalRequest(string method, Uri documentUri, int line, int column, CancellationToken cancellationToken) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (documentUri == null) diff --git a/src/Client/Clients/WindowClient.cs b/src/Client/Clients/WindowClient.cs index 77d20120a..a8965e2e6 100644 --- a/src/Client/Clients/WindowClient.cs +++ b/src/Client/Clients/WindowClient.cs @@ -1,7 +1,8 @@ -using OmniSharp.Extensions.LanguageServer.Models; using System; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Window API. @@ -41,7 +42,7 @@ public IDisposable OnLogMessage(LogMessageHandler handler) if (handler == null) throw new ArgumentNullException(nameof(handler)); - return Client.HandleNotification("window/logMessage", + return Client.HandleNotification(WindowNames.LogMessage, notification => handler(notification.Message, notification.Type) ); } diff --git a/src/Client/Clients/WorkspaceClient.cs b/src/Client/Clients/WorkspaceClient.cs index c2d21f840..de4f9d625 100644 --- a/src/Client/Clients/WorkspaceClient.cs +++ b/src/Client/Clients/WorkspaceClient.cs @@ -1,7 +1,8 @@ -using Newtonsoft.Json.Linq; -using System; +using System; +using Newtonsoft.Json.Linq; +using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients +namespace OmniSharp.Extensions.LanguageServer.Client.Clients { /// /// Client for the LSP Workspace API. @@ -38,7 +39,7 @@ public void DidChangeConfiguration(JObject configuration) if (configuration == null) throw new ArgumentNullException(nameof(configuration)); - Client.SendNotification("workspace/didChangeConfiguration", new JObject( + Client.SendNotification(WorkspaceNames.DidChangeConfiguration, new JObject( new JProperty("settings", configuration) )); } diff --git a/src/Client/Dispatcher/LspDispatcher.cs b/src/Client/Dispatcher/LspDispatcher.cs index 2282b27ad..c4a90fc04 100644 --- a/src/Client/Dispatcher/LspDispatcher.cs +++ b/src/Client/Dispatcher/LspDispatcher.cs @@ -1,12 +1,12 @@ -using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using System; +using System; using System.Collections.Concurrent; using System.Reactive.Disposables; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher +namespace OmniSharp.Extensions.LanguageServer.Client.Dispatcher { /// /// Dispatches requests and notifications from a language server to a language client. @@ -60,7 +60,7 @@ public IDisposable RegisterHandler(IHandler handler) /// public async Task TryHandleEmptyNotification(string method) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (_handlers.TryGetValue(method, out IHandler handler) && handler is IInvokeEmptyNotificationHandler emptyNotificationHandler) @@ -87,7 +87,7 @@ public async Task TryHandleEmptyNotification(string method) /// public async Task TryHandleNotification(string method, JObject notification) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (_handlers.TryGetValue(method, out IHandler handler) && handler is IInvokeNotificationHandler notificationHandler) @@ -117,7 +117,7 @@ public async Task TryHandleNotification(string method, JObject notificatio /// public Task TryHandleRequest(string method, JObject request, CancellationToken cancellationToken) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (_handlers.TryGetValue(method, out IHandler handler) && handler is IInvokeRequestHandler requestHandler) diff --git a/src/Client/Dispatcher/LspDispatcherExtensions.cs b/src/Client/Dispatcher/LspDispatcherExtensions.cs index cacbbe6b2..b492ef8ae 100644 --- a/src/Client/Dispatcher/LspDispatcherExtensions.cs +++ b/src/Client/Dispatcher/LspDispatcherExtensions.cs @@ -1,7 +1,7 @@ -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using System; +using System; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher +namespace OmniSharp.Extensions.LanguageServer.Client.Dispatcher { /// /// Extension methods for enabling various styles of handler registration. @@ -28,7 +28,7 @@ public static IDisposable HandleEmptyNotification(this LspDispatcher clientDispa if (clientDispatcher == null) throw new ArgumentNullException(nameof(clientDispatcher)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -62,7 +62,7 @@ public static IDisposable HandleNotification(this LspDispatcher c if (clientDispatcher == null) throw new ArgumentNullException(nameof(clientDispatcher)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -96,7 +96,7 @@ public static IDisposable HandleRequest(this LspDispatcher clientDispa if (clientDispatcher == null) throw new ArgumentNullException(nameof(clientDispatcher)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -133,7 +133,7 @@ public static IDisposable HandleRequest(this LspDispatcher if (clientDispatcher == null) throw new ArgumentNullException(nameof(clientDispatcher)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) diff --git a/src/Client/Exceptions.cs b/src/Client/Exceptions.cs index 92a2c38e5..4352a6926 100644 --- a/src/Client/Exceptions.cs +++ b/src/Client/Exceptions.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client +namespace OmniSharp.Extensions.LanguageServer.Client { /// /// Exception raised when a Language Server Protocol error is encountered. @@ -91,7 +91,7 @@ public LspRequestException(string message, string requestId) public LspRequestException(string message, string requestId, int errorCode) : base(message) { - RequestId = !String.IsNullOrWhiteSpace(requestId) ? requestId : UnknownRequestId; + RequestId = !string.IsNullOrWhiteSpace(requestId) ? requestId : UnknownRequestId; ErrorCode = errorCode; } @@ -130,7 +130,7 @@ public LspRequestException(string message, string requestId, Exception inner) public LspRequestException(string message, string requestId, int errorCode, Exception inner) : base(message, inner) { - RequestId = !String.IsNullOrWhiteSpace(requestId) ? requestId : UnknownRequestId; + RequestId = !string.IsNullOrWhiteSpace(requestId) ? requestId : UnknownRequestId; ErrorCode = errorCode; } @@ -202,7 +202,7 @@ public class LspMethodNotSupportedException public LspMethodNotSupportedException(string method, string requestId) : base($"Method not found: '{method}'.", requestId, LspErrorCodes.MethodNotSupported) { - Method = !String.IsNullOrWhiteSpace(method) ? method : "(unknown)"; + Method = !string.IsNullOrWhiteSpace(method) ? method : "(unknown)"; } /// diff --git a/src/Client/HandlerDelegates.cs b/src/Client/HandlerDelegates.cs index c67679899..088064960 100644 --- a/src/Client/HandlerDelegates.cs +++ b/src/Client/HandlerDelegates.cs @@ -1,10 +1,10 @@ -using OmniSharp.Extensions.LanguageServer.Models; using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client +namespace OmniSharp.Extensions.LanguageServer.Client { /// /// A handler for empty notifications. diff --git a/src/Client/Handlers/DelegateEmptyNotificationHandler.cs b/src/Client/Handlers/DelegateEmptyNotificationHandler.cs index e6d4be8a0..a0d164d44 100644 --- a/src/Client/Handlers/DelegateEmptyNotificationHandler.cs +++ b/src/Client/Handlers/DelegateEmptyNotificationHandler.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// A delegate-based handler for empty notifications. diff --git a/src/Client/Handlers/DelegateHandler.cs b/src/Client/Handlers/DelegateHandler.cs index 86b4169fd..3813e4288 100644 --- a/src/Client/Handlers/DelegateHandler.cs +++ b/src/Client/Handlers/DelegateHandler.cs @@ -1,6 +1,6 @@ using System; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// The base class for delegate-based message handlers. @@ -16,7 +16,7 @@ public abstract class DelegateHandler /// protected DelegateHandler(string method) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); Method = method; diff --git a/src/Client/Handlers/DelegateNotificationHandler.cs b/src/Client/Handlers/DelegateNotificationHandler.cs index 1aad278ce..b935e2b57 100644 --- a/src/Client/Handlers/DelegateNotificationHandler.cs +++ b/src/Client/Handlers/DelegateNotificationHandler.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json.Linq; -using System; +using System; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// A delegate-based handler for notifications. diff --git a/src/Client/Handlers/DelegateRequestHandler.cs b/src/Client/Handlers/DelegateRequestHandler.cs index 988aafc81..be2dcf09c 100644 --- a/src/Client/Handlers/DelegateRequestHandler.cs +++ b/src/Client/Handlers/DelegateRequestHandler.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json.Linq; -using System; +using System; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// A delegate-based handler for requests whose responses have no payload (i.e. void return type). diff --git a/src/Client/Handlers/DelegateRequestResponseHandler.cs b/src/Client/Handlers/DelegateRequestResponseHandler.cs index 8384508b1..006ba190f 100644 --- a/src/Client/Handlers/DelegateRequestResponseHandler.cs +++ b/src/Client/Handlers/DelegateRequestResponseHandler.cs @@ -1,9 +1,9 @@ -using Newtonsoft.Json.Linq; -using System; +using System; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// A delegate-based handler for requests whose responses have payloads. diff --git a/src/Client/Handlers/DynamicRegistrationHandler.cs b/src/Client/Handlers/DynamicRegistrationHandler.cs index 37f1402c3..188f135b9 100644 --- a/src/Client/Handlers/DynamicRegistrationHandler.cs +++ b/src/Client/Handlers/DynamicRegistrationHandler.cs @@ -1,10 +1,9 @@ -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using Newtonsoft.Json.Linq; -using System; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// Handler for "client/registerCapability". diff --git a/src/Client/Handlers/IHandler.cs b/src/Client/Handlers/IHandler.cs index 3ac672423..c206c4ab3 100644 --- a/src/Client/Handlers/IHandler.cs +++ b/src/Client/Handlers/IHandler.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// Represents a client-side message handler. diff --git a/src/Client/Handlers/IInvokeEmptyNotificationHandler.cs b/src/Client/Handlers/IInvokeEmptyNotificationHandler.cs index fe0ad2eba..8f9f073d4 100644 --- a/src/Client/Handlers/IInvokeEmptyNotificationHandler.cs +++ b/src/Client/Handlers/IInvokeEmptyNotificationHandler.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// Represents a handler for empty notifications. diff --git a/src/Client/Handlers/IInvokeNotificationHandler.cs b/src/Client/Handlers/IInvokeNotificationHandler.cs index d34868749..e6aaedcf3 100644 --- a/src/Client/Handlers/IInvokeNotificationHandler.cs +++ b/src/Client/Handlers/IInvokeNotificationHandler.cs @@ -1,7 +1,7 @@ -using Newtonsoft.Json.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// Represents a handler for notifications. diff --git a/src/Client/Handlers/IInvokeRequestHandler.cs b/src/Client/Handlers/IInvokeRequestHandler.cs index bfc251ca7..480ceaa18 100644 --- a/src/Client/Handlers/IInvokeRequestHandler.cs +++ b/src/Client/Handlers/IInvokeRequestHandler.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json.Linq; -using System.Threading; +using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// Represents a handler for requests. diff --git a/src/Client/Handlers/JsonRpcEmptyNotificationHandler.cs b/src/Client/Handlers/JsonRpcEmptyNotificationHandler.cs index a4a2e7c95..b3c86f5eb 100644 --- a/src/Client/Handlers/JsonRpcEmptyNotificationHandler.cs +++ b/src/Client/Handlers/JsonRpcEmptyNotificationHandler.cs @@ -1,8 +1,8 @@ -using OmniSharp.Extensions.JsonRpc; -using System; +using System; using System.Threading.Tasks; +using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// An empty notification handler that invokes a JSON-RPC . diff --git a/src/Client/Handlers/JsonRpcHandler.cs b/src/Client/Handlers/JsonRpcHandler.cs index d9af687fe..c49d7a592 100644 --- a/src/Client/Handlers/JsonRpcHandler.cs +++ b/src/Client/Handlers/JsonRpcHandler.cs @@ -1,7 +1,7 @@ -using OmniSharp.Extensions.JsonRpc; -using System; +using System; +using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// The base class for message handlers based on JSON-RPC s. @@ -17,7 +17,7 @@ public abstract class JsonRpcHandler /// protected JsonRpcHandler(string method) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); Method = method; diff --git a/src/Client/Handlers/JsonRpcNotificationHandler.cs b/src/Client/Handlers/JsonRpcNotificationHandler.cs index 95a9f2315..b035dd0f6 100644 --- a/src/Client/Handlers/JsonRpcNotificationHandler.cs +++ b/src/Client/Handlers/JsonRpcNotificationHandler.cs @@ -1,9 +1,9 @@ -using OmniSharp.Extensions.JsonRpc; -using Newtonsoft.Json.Linq; -using System; +using System; using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers +namespace OmniSharp.Extensions.LanguageServer.Client.Handlers { /// /// A notification handler that invokes a JSON-RPC . diff --git a/src/Client/LanguageClient.cs b/src/Client/LanguageClient.cs index 863b8fa42..b5e9aab78 100644 --- a/src/Client/LanguageClient.cs +++ b/src/Client/LanguageClient.cs @@ -1,20 +1,18 @@ -using Newtonsoft.Json.Linq; -using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Processes; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Logging; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Clients; using System; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; - -namespace OmniSharp.Extensions.LanguageServerProtocol.Client +using Microsoft.Extensions.Logging; +using OmniSharp.Extensions.LanguageServer.Client.Clients; +using OmniSharp.Extensions.LanguageServer.Client.Dispatcher; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; +using OmniSharp.Extensions.LanguageServer.Client.Processes; +using OmniSharp.Extensions.LanguageServer.Client.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; + +namespace OmniSharp.Extensions.LanguageServer.Client { /// /// A client for the Language Server Protocol. @@ -111,10 +109,10 @@ public LanguageClient(ILoggerFactory loggerFactory, ServerProcess process) /// public void Dispose() { - LspConnection connection = Interlocked.Exchange(ref _connection, null); + var connection = Interlocked.Exchange(ref _connection, null); connection?.Dispose(); - ServerProcess serverProcess = Interlocked.Exchange(ref _process, null); + var serverProcess = Interlocked.Exchange(ref _process, null); serverProcess?.Dispose(); } @@ -218,7 +216,7 @@ public Task HasShutdown /// The workspace root. /// /// - /// An optional representing additional options to send to the server. + /// An optional representing additional options to send to the server. /// /// /// An optional that can be used to cancel the operation. @@ -240,7 +238,7 @@ public Task HasShutdown { await Start(); - InitializeParams initializeParams = new InitializeParams + var initializeParams = new InitializeParams { RootPath = workspaceRoot, Capabilities = ClientCapabilities, @@ -250,7 +248,7 @@ public Task HasShutdown Log.LogDebug("Sending 'initialize' message to language server..."); - InitializeResult result = await SendRequest("initialize", initializeParams, cancellationToken).ConfigureAwait(false); + var result = await SendRequest("initialize", initializeParams, cancellationToken).ConfigureAwait(false); if (result == null) throw new LspException("Server replied to 'initialize' request with a null response."); @@ -284,7 +282,7 @@ public Task HasShutdown /// public async Task Shutdown() { - LspConnection connection = _connection; + var connection = _connection; if (connection != null) { if (connection.IsOpen) @@ -297,7 +295,7 @@ public async Task Shutdown() await connection.HasHasDisconnected; } - ServerProcess serverProcess = _process; + var serverProcess = _process; if (serverProcess != null) { if (serverProcess.IsRunning) @@ -327,7 +325,7 @@ public async Task Shutdown() /// public void SendNotification(string method) { - LspConnection connection = _connection; + var connection = _connection; if (connection == null || !connection.IsOpen) throw new InvalidOperationException("Not connected to the language server."); @@ -345,7 +343,7 @@ public void SendNotification(string method) /// public void SendNotification(string method, object notification) { - LspConnection connection = _connection; + var connection = _connection; if (connection == null || !connection.IsOpen) throw new InvalidOperationException("Not connected to the language server."); @@ -369,7 +367,7 @@ public void SendNotification(string method, object notification) /// public Task SendRequest(string method, object request, CancellationToken cancellationToken = default(CancellationToken)) { - LspConnection connection = _connection; + var connection = _connection; if (connection == null || !connection.IsOpen) throw new InvalidOperationException("Not connected to the language server."); @@ -396,7 +394,7 @@ public void SendNotification(string method, object notification) /// public Task SendRequest(string method, object request, CancellationToken cancellation = default(CancellationToken)) { - LspConnection connection = _connection; + var connection = _connection; if (connection == null || !connection.IsOpen) throw new InvalidOperationException("Not connected to the language server."); @@ -446,7 +444,7 @@ async void ServerProcess_Exit(object sender, EventArgs args) { Log.LogDebug("Server process has exited; language client is shutting down..."); - LspConnection connection = Interlocked.Exchange(ref _connection, null); + var connection = Interlocked.Exchange(ref _connection, null); if (connection != null) { using (connection) diff --git a/src/Client/LanguageClientRegistration.cs b/src/Client/LanguageClientRegistration.cs index 8e8804d51..af273e9da 100644 --- a/src/Client/LanguageClientRegistration.cs +++ b/src/Client/LanguageClientRegistration.cs @@ -1,8 +1,8 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using System; +using System; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client +namespace OmniSharp.Extensions.LanguageServer.Client { /// /// Extension methods for enabling various styles of handler registration. @@ -29,7 +29,7 @@ public static IDisposable HandleNotification(this LanguageClient languageClient, if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -60,7 +60,7 @@ public static IDisposable HandleNotification(this LanguageClient languageClient, if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -95,7 +95,7 @@ public static IDisposable HandleNotification(this LanguageClient if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -129,7 +129,7 @@ public static IDisposable HandleNotification(this LanguageClient if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -163,7 +163,7 @@ public static IDisposable HandleRequest(this LanguageClient languageCl if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -200,7 +200,7 @@ public static IDisposable HandleRequest(this LanguageClient if (languageClient == null) throw new ArgumentNullException(nameof(languageClient)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) diff --git a/src/Client/Logging/LoggerExtensions.cs b/src/Client/Logging/LoggerExtensions.cs index 18cdb96b1..d86a3d91a 100644 --- a/src/Client/Logging/LoggerExtensions.cs +++ b/src/Client/Logging/LoggerExtensions.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.Logging; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Logging +namespace OmniSharp.Extensions.LanguageServer.Client.Logging { /// /// Extension methods for . diff --git a/src/Client/LspErrorCodes.cs b/src/Client/LspErrorCodes.cs index bbe3e20fc..26564a2a7 100644 --- a/src/Client/LspErrorCodes.cs +++ b/src/Client/LspErrorCodes.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServerProtocol.Client +namespace OmniSharp.Extensions.LanguageServer.Client { /// /// Well-known LSP error codes. diff --git a/src/Client/Processes/NamedPipeServerProcess.cs b/src/Client/Processes/NamedPipeServerProcess.cs index cee15fc34..a70a7b217 100644 --- a/src/Client/Processes/NamedPipeServerProcess.cs +++ b/src/Client/Processes/NamedPipeServerProcess.cs @@ -1,10 +1,9 @@ -using Microsoft.Extensions.Logging; -using System.Collections.Generic; -using System.IO; +using System.IO; using System.IO.Pipes; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Processes +namespace OmniSharp.Extensions.LanguageServer.Client.Processes { /// /// A is a that creates named pipe streams to connect a language client to a language server in the same process. diff --git a/src/Client/Processes/ServerProcess.cs b/src/Client/Processes/ServerProcess.cs index c476926aa..da21a4a1a 100644 --- a/src/Client/Processes/ServerProcess.cs +++ b/src/Client/Processes/ServerProcess.cs @@ -1,10 +1,9 @@ -using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Logging; -using System; +using System; using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Processes +namespace OmniSharp.Extensions.LanguageServer.Client.Processes { /// /// A is responsible for launching or attaching to a language server, providing access to its input and output streams, and tracking its lifetime. diff --git a/src/Client/Processes/StdioServerProcess.cs b/src/Client/Processes/StdioServerProcess.cs index 7ca36d44e..8295085e1 100644 --- a/src/Client/Processes/StdioServerProcess.cs +++ b/src/Client/Processes/StdioServerProcess.cs @@ -1,11 +1,11 @@ -using Microsoft.Extensions.Logging; -using System; +using System; using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Processes +namespace OmniSharp.Extensions.LanguageServer.Client.Processes { /// /// A is a that launches its server as an external process and communicates with it over STDIN / STDOUT. diff --git a/src/Client/Protocol/ClientMessage.cs b/src/Client/Protocol/ClientMessage.cs index 0c6594a31..cb45a9101 100644 --- a/src/Client/Protocol/ClientMessage.cs +++ b/src/Client/Protocol/ClientMessage.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol +namespace OmniSharp.Extensions.LanguageServer.Client.Protocol { /// /// The client-side representation of an LSP message. diff --git a/src/Client/Protocol/ErrorMessage.cs b/src/Client/Protocol/ErrorMessage.cs index c0bfe6a9f..a2549be1e 100644 --- a/src/Client/Protocol/ErrorMessage.cs +++ b/src/Client/Protocol/ErrorMessage.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol +namespace OmniSharp.Extensions.LanguageServer.Client.Protocol { /// /// A JSON-RPC error message. diff --git a/src/Client/Protocol/LspConnection.cs b/src/Client/Protocol/LspConnection.cs index b500e4f02..fd4111f2b 100644 --- a/src/Client/Protocol/LspConnection.cs +++ b/src/Client/Protocol/LspConnection.cs @@ -1,22 +1,22 @@ -using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Logging; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; - +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Client.Dispatcher; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; +using OmniSharp.Extensions.LanguageServer.Client.Logging; +using OmniSharp.Extensions.LanguageServer.Protocol; using JsonRpcMessages = OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol +namespace OmniSharp.Extensions.LanguageServer.Client.Protocol { /// /// An asynchronous connection using the LSP protocol over s. @@ -294,7 +294,7 @@ public void Disconnect(bool flushOutgoing = false) /// public void SendEmptyNotification(string method) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (!IsOpen) @@ -318,7 +318,7 @@ public void SendEmptyNotification(string method) /// public void SendNotification(string method, object notification) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (notification == null) @@ -352,7 +352,7 @@ public void SendNotification(string method, object notification) /// public async Task SendRequest(string method, object request, CancellationToken cancellationToken = default(CancellationToken)) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (request == null) @@ -375,7 +375,7 @@ public void SendNotification(string method, object notification) { _outgoing.TryAdd(new ClientMessage { - Method = "$/cancelRequest", + Method = GeneralNames.CancelRequest, Params = new JObject( new JProperty("id", requestId) ) @@ -415,7 +415,7 @@ public void SendNotification(string method, object notification) /// public async Task SendRequest(string method, object request, CancellationToken cancellationToken = default(CancellationToken)) { - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (request == null) @@ -438,7 +438,7 @@ public void SendNotification(string method, object notification) { _outgoing.TryAdd(new ClientMessage { - Method = "$/cancelRequest", + Method = GeneralNames.CancelRequest, Params = new JObject( new JProperty("id", requestId) ) @@ -714,7 +714,7 @@ async Task ReceiveMessage() string headers = HeaderEncoding.GetString(headerBuffer, 0, bytesRead); Log.LogDebug("Got raw headers: {Headers}", headers); - if (String.IsNullOrWhiteSpace(headers)) + if (string.IsNullOrWhiteSpace(headers)) return null; // Stream closed. Log.LogDebug("Read response headers {Headers}.", headers); @@ -807,7 +807,7 @@ async Task DispatchLoop() if (message.Id != null) { // Request. - if (message.Method == "$/cancelRequest") + if (message.Method == GeneralNames.CancelRequest) CancelRequest(message); else DispatchRequest(message); diff --git a/src/Client/Protocol/LspConnectionExtensions.cs b/src/Client/Protocol/LspConnectionExtensions.cs index b97192cae..a9f961d73 100644 --- a/src/Client/Protocol/LspConnectionExtensions.cs +++ b/src/Client/Protocol/LspConnectionExtensions.cs @@ -1,7 +1,7 @@ -using OmniSharp.Extensions.LanguageServerProtocol.Client.Handlers; -using System; +using System; +using OmniSharp.Extensions.LanguageServer.Client.Handlers; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol +namespace OmniSharp.Extensions.LanguageServer.Client.Protocol { /// /// Extension methods for enabling various styles of handler registration. @@ -28,7 +28,7 @@ public static IDisposable HandleEmptyNotification(this LspConnection clientConne if (clientConnection == null) throw new ArgumentNullException(nameof(clientConnection)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -62,7 +62,7 @@ public static IDisposable HandleNotification(this LspConnection c if (clientConnection == null) throw new ArgumentNullException(nameof(clientConnection)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -96,7 +96,7 @@ public static IDisposable HandleRequest(this LspConnection clientConne if (clientConnection == null) throw new ArgumentNullException(nameof(clientConnection)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) @@ -133,7 +133,7 @@ public static IDisposable HandleRequest(this LspConnection if (clientConnection == null) throw new ArgumentNullException(nameof(clientConnection)); - if (String.IsNullOrWhiteSpace(method)) + if (string.IsNullOrWhiteSpace(method)) throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(method)}.", nameof(method)); if (handler == null) diff --git a/src/Client/Protocol/ServerMessage.cs b/src/Client/Protocol/ServerMessage.cs index b79a4098a..4ce33cb8f 100644 --- a/src/Client/Protocol/ServerMessage.cs +++ b/src/Client/Protocol/ServerMessage.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol +namespace OmniSharp.Extensions.LanguageServer.Client.Protocol { /// /// The server-side representation of an LSP message. diff --git a/src/Client/Utilities/DocumentUri.cs b/src/Client/Utilities/DocumentUri.cs index c7e86480d..b3d775d3c 100644 --- a/src/Client/Utilities/DocumentUri.cs +++ b/src/Client/Utilities/DocumentUri.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities +namespace OmniSharp.Extensions.LanguageServer.Client.Utilities { /// /// Helper methods for working with LSP document URIs. @@ -49,7 +49,7 @@ public static string GetFileSystemPath(Uri documentUri) /// public static Uri FromFileSystemPath(string fileSystemPath) { - if (String.IsNullOrWhiteSpace(fileSystemPath)) + if (string.IsNullOrWhiteSpace(fileSystemPath)) throw new ArgumentException("Argument cannot be null, empty, or entirely composed of whitespace: 'fileSystemPath'.", nameof(fileSystemPath)); if (!Path.IsPathRooted(fileSystemPath)) diff --git a/src/Lsp/Capabilities/Client/ClientVersion.cs b/src/Lsp/Capabilities/Client/ClientVersion.cs deleted file mode 100644 index fefaafdfa..000000000 --- a/src/Lsp/Capabilities/Client/ClientVersion.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public enum ClientVersion - { - Lsp2, - Lsp3 - } -} \ No newline at end of file diff --git a/src/Lsp/Capabilities/Client/CodeActionCapability.cs b/src/Lsp/Capabilities/Client/CodeActionCapability.cs deleted file mode 100644 index dbb01f2cc..000000000 --- a/src/Lsp/Capabilities/Client/CodeActionCapability.cs +++ /dev/null @@ -1,7 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class CodeActionCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/CodeLensCapability.cs b/src/Lsp/Capabilities/Client/CodeLensCapability.cs deleted file mode 100644 index 881153dd1..000000000 --- a/src/Lsp/Capabilities/Client/CodeLensCapability.cs +++ /dev/null @@ -1,7 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class CodeLensCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/DefinitionCapability.cs b/src/Lsp/Capabilities/Client/DefinitionCapability.cs deleted file mode 100644 index ad4337b2e..000000000 --- a/src/Lsp/Capabilities/Client/DefinitionCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class DefinitionCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/DidChangeWatchedFilesCapability.cs b/src/Lsp/Capabilities/Client/DidChangeWatchedFilesCapability.cs deleted file mode 100644 index 516034b74..000000000 --- a/src/Lsp/Capabilities/Client/DidChangeWatchedFilesCapability.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class DidChangeWatchedFilesCapability : DynamicCapability { } -} diff --git a/src/Lsp/Capabilities/Client/DocumentLinkCapability.cs b/src/Lsp/Capabilities/Client/DocumentLinkCapability.cs deleted file mode 100644 index 4544edc96..000000000 --- a/src/Lsp/Capabilities/Client/DocumentLinkCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class DocumentLinkCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/DocumentSymbolCapability.cs b/src/Lsp/Capabilities/Client/DocumentSymbolCapability.cs deleted file mode 100644 index ac747e53a..000000000 --- a/src/Lsp/Capabilities/Client/DocumentSymbolCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/ExecuteCommandCapability.cs b/src/Lsp/Capabilities/Client/ExecuteCommandCapability.cs deleted file mode 100644 index c798b34a6..000000000 --- a/src/Lsp/Capabilities/Client/ExecuteCommandCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class ExecuteCommandCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/HoverCapability.cs b/src/Lsp/Capabilities/Client/HoverCapability.cs deleted file mode 100644 index de996d043..000000000 --- a/src/Lsp/Capabilities/Client/HoverCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class HoverCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/ReferencesCapability.cs b/src/Lsp/Capabilities/Client/ReferencesCapability.cs deleted file mode 100644 index 17d34f7c8..000000000 --- a/src/Lsp/Capabilities/Client/ReferencesCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class ReferencesCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/RenameCapability.cs b/src/Lsp/Capabilities/Client/RenameCapability.cs deleted file mode 100644 index 8f7395e38..000000000 --- a/src/Lsp/Capabilities/Client/RenameCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class RenameCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/SignatureHelpCapability.cs b/src/Lsp/Capabilities/Client/SignatureHelpCapability.cs deleted file mode 100644 index c181ee674..000000000 --- a/src/Lsp/Capabilities/Client/SignatureHelpCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class SignatureHelpCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Capabilities/Client/WorkspaceSymbolCapability.cs b/src/Lsp/Capabilities/Client/WorkspaceSymbolCapability.cs deleted file mode 100644 index 56ed3a3f5..000000000 --- a/src/Lsp/Capabilities/Client/WorkspaceSymbolCapability.cs +++ /dev/null @@ -1,6 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client -{ - public class WorkspaceSymbolCapability : DynamicCapability, ConnectedCapability { } -} diff --git a/src/Lsp/Handlers/ExitEventHandler.cs b/src/Lsp/Handlers/ExitEventHandler.cs deleted file mode 100644 index e6d97c613..000000000 --- a/src/Lsp/Handlers/ExitEventHandler.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace OmniSharp.Extensions.LanguageServer.Handlers -{ - public delegate void ExitEventHandler(int exitCode); -} \ No newline at end of file diff --git a/src/Lsp/InitializeDelegate.cs b/src/Lsp/InitializeDelegate.cs deleted file mode 100644 index 0d2348bf0..000000000 --- a/src/Lsp/InitializeDelegate.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer.Models; - -namespace OmniSharp.Extensions.LanguageServer -{ - public delegate Task InitializeDelegate(InitializeParams request); -} \ No newline at end of file diff --git a/src/Lsp/LanguageServerLoggerProvider.cs b/src/Lsp/LanguageServerLoggerProvider.cs deleted file mode 100644 index eb71f941d..000000000 --- a/src/Lsp/LanguageServerLoggerProvider.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Threading; -using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer.Protocol; -using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Handlers; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; -using Microsoft.Extensions.Logging; - -namespace OmniSharp.Extensions.LanguageServer -{ - class LanguageServerLoggerProvider : ILoggerProvider - { - private readonly LanguageServer _languageServer; - - public LanguageServerLoggerProvider(LanguageServer languageServer) - { - _languageServer = languageServer; - } - - public ILogger CreateLogger(string categoryName) - { - return new LanguageServerLogger(_languageServer); - } - - public void Dispose() - { - } - } -} diff --git a/src/Lsp/Methods/DynamicNotification.cs b/src/Lsp/Methods/DynamicNotification.cs deleted file mode 100644 index bd38c9d78..000000000 --- a/src/Lsp/Methods/DynamicNotification.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; - -namespace OmniSharp.Extensions.LanguageServer.Methods -{ - public class DynamicNotification - { - public DynamicNotification(string method, Type registrationType) - { - Method = method; - RegistrationType = registrationType; - } - - public DynamicNotification(string method, Type registrationType, Type paramsType) : this(method, registrationType) - { - ParamsType = paramsType; - } - - public string Method { get; } - - public Type ParamsType { get; } - - public Type RegistrationType { get; } - } -} \ No newline at end of file diff --git a/src/Lsp/Methods/DynamicRequest.cs b/src/Lsp/Methods/DynamicRequest.cs deleted file mode 100644 index cb979bd76..000000000 --- a/src/Lsp/Methods/DynamicRequest.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; - -namespace OmniSharp.Extensions.LanguageServer.Methods -{ - public class DynamicRequest - { - public DynamicRequest(string method, Type registrationType) - { - Method = method; - RegistrationType = registrationType; - } - - public DynamicRequest(string method, Type registrationType, Type paramsType) : this(method, registrationType) - { - ParamsType = paramsType; - } - - public DynamicRequest(string method, Type registrationType, Type paramsType, Type responseType) : this(method, registrationType, paramsType) - { - ResponseType = responseType; - } - - public DynamicRequest(string method, Type registrationType, Type paramsType, Type responseType, Type errorType) : this(method, registrationType, paramsType, responseType) - { - ErrorType = errorType; - } - - public string Method { get; } - public Type ParamsType { get; } - public Type ResponseType { get; } - public Type ErrorType { get; } - - public Type RegistrationType { get; } - } -} \ No newline at end of file diff --git a/src/Lsp/Methods/Method.cs b/src/Lsp/Methods/Method.cs deleted file mode 100644 index c32006481..000000000 --- a/src/Lsp/Methods/Method.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace OmniSharp.Extensions.LanguageServer.Methods -{ - public class Request : Request - { - public Request(string method) : base(method, typeof(TParams)) { } - } - - public class DynamicRequest : DynamicRequest - { - public DynamicRequest(string method) : base(method, typeof(TRegistration), typeof(TParams)) { } - } - - public class Request : Request - { - public Request(string method) : base(method, typeof(TParams), typeof(TResponse)) { } - } - - public class DynamicRequest : DynamicRequest - { - public DynamicRequest(string method) : base(method, typeof(TRegistration), typeof(TParams), typeof(TResponse)) { } - } - - public class Request : Request - { - public Request(string method) : base(method, typeof(TParams), typeof(TResponse), typeof(TError)) { } - } - - public class DynamicRequest : DynamicRequest - { - public DynamicRequest(string method) : base(method, typeof(TRegistration), typeof(TParams), typeof(TResponse), typeof(TError)) { } - } -} \ No newline at end of file diff --git a/src/Lsp/Methods/Notification.cs b/src/Lsp/Methods/Notification.cs deleted file mode 100644 index dec80ece8..000000000 --- a/src/Lsp/Methods/Notification.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; - -namespace OmniSharp.Extensions.LanguageServer.Methods -{ - public class Notification - { - public Notification(string method) - { - Method = method; - } - - public Notification(string method, Type paramsType) : this(method) - { - ParamsType = paramsType; - } - - public string Method { get; } - public Type ParamsType { get; } - } - - public class Notification : Notification - { - public Notification(string method) : base(method, typeof(TParams)) { } - } - - public class DynamicNotification : DynamicNotification - { - public DynamicNotification(string method) : base(method, typeof(TRegistration)) { } - } - - public class DynamicNotification : DynamicNotification - { - public DynamicNotification(string method) : base(method, typeof(TRegistration), typeof(TParams)) { } - } -} \ No newline at end of file diff --git a/src/Lsp/Methods/Request.cs b/src/Lsp/Methods/Request.cs deleted file mode 100644 index 3cecf3dfa..000000000 --- a/src/Lsp/Methods/Request.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; - -namespace OmniSharp.Extensions.LanguageServer.Methods -{ - public class Request - { - public Request(string method) - { - Method = method; - } - - public Request(string method, Type paramsType) : this(method) - { - ParamsType = paramsType; - } - - public Request(string method, Type paramsType, Type responseType) : this(method, paramsType) - { - ResponseType = responseType; - } - - public Request(string method, Type paramsType, Type responseType, Type errorType) : this(method, paramsType, responseType) - { - ErrorType = errorType; - } - - public string Method { get; } - public Type ParamsType { get; } - public Type ResponseType { get; } - public Type ErrorType { get; } - } -} \ No newline at end of file diff --git a/src/Lsp/Protocol/Document/ICodeActionHandler.cs b/src/Lsp/Protocol/Document/ICodeActionHandler.cs deleted file mode 100644 index db3154c6e..000000000 --- a/src/Lsp/Protocol/Document/ICodeActionHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/codeAction")] - public interface ICodeActionHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/ICodeLensHandler.cs b/src/Lsp/Protocol/Document/ICodeLensHandler.cs deleted file mode 100644 index 6fcbe603a..000000000 --- a/src/Lsp/Protocol/Document/ICodeLensHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/codeLens")] - public interface ICodeLensHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/ICodeLensResolveHandler.cs b/src/Lsp/Protocol/Document/ICodeLensResolveHandler.cs deleted file mode 100644 index c9662bd65..000000000 --- a/src/Lsp/Protocol/Document/ICodeLensResolveHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("codeLens/resolve")] - public interface ICodeLensResolveHandler : IRequestHandler { } -} diff --git a/src/Lsp/Protocol/Document/ICompletionHandler.cs b/src/Lsp/Protocol/Document/ICompletionHandler.cs deleted file mode 100644 index 857b77c9d..000000000 --- a/src/Lsp/Protocol/Document/ICompletionHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/completion")] - public interface ICompletionHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/ICompletionResolveHandler.cs b/src/Lsp/Protocol/Document/ICompletionResolveHandler.cs deleted file mode 100644 index ed668d993..000000000 --- a/src/Lsp/Protocol/Document/ICompletionResolveHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("completionItem/resolve")] - public interface ICompletionResolveHandler : IRequestHandler { } -} diff --git a/src/Lsp/Protocol/Document/IDocumentLinkHandler.cs b/src/Lsp/Protocol/Document/IDocumentLinkHandler.cs deleted file mode 100644 index 1b43e6443..000000000 --- a/src/Lsp/Protocol/Document/IDocumentLinkHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/documentLink")] - public interface IDocumentLinkHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IDocumentLinkResolveHandler.cs b/src/Lsp/Protocol/Document/IDocumentLinkResolveHandler.cs deleted file mode 100644 index cda9d7a2c..000000000 --- a/src/Lsp/Protocol/Document/IDocumentLinkResolveHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("documentLink/resolve")] - public interface IDocumentLinkResolveHandler : IRequestHandler { } -} diff --git a/src/Lsp/Protocol/Document/IDocumentRangeFormattingHandler.cs b/src/Lsp/Protocol/Document/IDocumentRangeFormattingHandler.cs deleted file mode 100644 index 40633c626..000000000 --- a/src/Lsp/Protocol/Document/IDocumentRangeFormattingHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -namespace OmniSharp.Extensions.LanguageServer.Protocol.Document -{ - [Serial, Method("textDocument/rangeFormatting")] - public interface IDocumentRangeFormattingHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IDocumentSymbolHandler.cs b/src/Lsp/Protocol/Document/IDocumentSymbolHandler.cs deleted file mode 100644 index bdd645ec8..000000000 --- a/src/Lsp/Protocol/Document/IDocumentSymbolHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/documentSymbol")] - public interface IDocumentSymbolHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IHoverHandler.cs b/src/Lsp/Protocol/Document/IHoverHandler.cs deleted file mode 100644 index f2a3c4625..000000000 --- a/src/Lsp/Protocol/Document/IHoverHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/hover")] - public interface IHoverHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IReferencesHandler.cs b/src/Lsp/Protocol/Document/IReferencesHandler.cs deleted file mode 100644 index edc60374d..000000000 --- a/src/Lsp/Protocol/Document/IReferencesHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/references")] - public interface IReferencesHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IRenameHandler.cs b/src/Lsp/Protocol/Document/IRenameHandler.cs deleted file mode 100644 index d61ca26c2..000000000 --- a/src/Lsp/Protocol/Document/IRenameHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("textDocument/rename")] - public interface IRenameHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/ISignatureHelpHandler.cs b/src/Lsp/Protocol/Document/ISignatureHelpHandler.cs deleted file mode 100644 index c616732cc..000000000 --- a/src/Lsp/Protocol/Document/ISignatureHelpHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("textDocument/signatureHelp")] - public interface ISignatureHelpHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs b/src/Lsp/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs deleted file mode 100644 index be9566bc8..000000000 --- a/src/Lsp/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("textDocument/willSaveWaitUntil")] - public interface IWillSaveWaitUntilTextDocumentHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Document/PublishDiagnosticsExtensions.cs b/src/Lsp/Protocol/Document/PublishDiagnosticsExtensions.cs deleted file mode 100644 index 8a5a9616d..000000000 --- a/src/Lsp/Protocol/Document/PublishDiagnosticsExtensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - public static class PublishDiagnosticsExtensions - { - public static void PublishDiagnostics(this ILanguageServer mediator, PublishDiagnosticsParams @params) - { - mediator.SendNotification("textDocument/publishDiagnostics", @params); - } - } -} \ No newline at end of file diff --git a/src/Lsp/Protocol/General/CancelRequestExtensions.cs b/src/Lsp/Protocol/General/CancelRequestExtensions.cs deleted file mode 100644 index a78a8f308..000000000 --- a/src/Lsp/Protocol/General/CancelRequestExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - public static class CancelRequestExtensions - { - public static void CancelRequest(this ILanguageServer mediator, CancelParams @params) - { - mediator.SendNotification("$/cancelRequest", @params); - } - - public static void CancelRequest(this ILanguageServer mediator, string id) - { - mediator.SendNotification("$/cancelRequest", new CancelParams() { Id = id }); - } - - public static void CancelRequest(this ILanguageServer mediator, long id) - { - mediator.SendNotification("$/cancelRequest", new CancelParams() { Id = id }); - } - } -} diff --git a/src/Lsp/Protocol/General/ICancelRequestHandler.cs b/src/Lsp/Protocol/General/ICancelRequestHandler.cs deleted file mode 100644 index 1a2051dcb..000000000 --- a/src/Lsp/Protocol/General/ICancelRequestHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("$/cancelRequest")] - public interface ICancelRequestHandler : INotificationHandler { } -} diff --git a/src/Lsp/Protocol/Window/SendTelemetryExtensions.cs b/src/Lsp/Protocol/Window/SendTelemetryExtensions.cs deleted file mode 100644 index 13c0b6c52..000000000 --- a/src/Lsp/Protocol/Window/SendTelemetryExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using OmniSharp.Extensions.LanguageServer; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - public static class SendTelemetryExtensions - { - public static void SendTelemetry(this ILanguageServer mediator, object @params) - { - mediator.SendNotification("telemetry/event", @params); - } - } -} \ No newline at end of file diff --git a/src/Lsp/Protocol/Window/ShowMessageRequestExtensions.cs b/src/Lsp/Protocol/Window/ShowMessageRequestExtensions.cs deleted file mode 100644 index 874d316ad..000000000 --- a/src/Lsp/Protocol/Window/ShowMessageRequestExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - public static class ShowMessageRequestExtensions - { - public static Task ShowMessage(this ILanguageServer mediator, ShowMessageRequestParams @params) - { - return mediator.SendRequest("window/showMessageRequest", @params); - } - - public static Task Show(this ILanguageServer mediator, ShowMessageRequestParams @params) - { - return mediator.ShowMessage(@params); - } - - public static Task Request(this ILanguageServer mediator, ShowMessageRequestParams @params) - { - return mediator.ShowMessage(@params); - } - } -} diff --git a/src/Lsp/Protocol/Workspace/ApplyEditExtensions.cs b/src/Lsp/Protocol/Workspace/ApplyEditExtensions.cs deleted file mode 100644 index fb16a7240..000000000 --- a/src/Lsp/Protocol/Workspace/ApplyEditExtensions.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - public static class ApplyEditExtensions - { - public static Task ApplyEdit(this ILanguageServer mediator, ApplyWorkspaceEditParams @params) - { - return mediator.SendRequest("workspace/applyEdit", @params); - } - } -} \ No newline at end of file diff --git a/src/Lsp/Protocol/Workspace/IDidChangeConfigurationHandler.cs b/src/Lsp/Protocol/Workspace/IDidChangeConfigurationHandler.cs deleted file mode 100644 index 2e1e2982f..000000000 --- a/src/Lsp/Protocol/Workspace/IDidChangeConfigurationHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("workspace/didChangeConfiguration")] - public interface IDidChangeConfigurationHandler : INotificationHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs b/src/Lsp/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs deleted file mode 100644 index ac0d7fa41..000000000 --- a/src/Lsp/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("workspace/didChangeWatchedFiles")] - public interface IDidChangeWatchedFilesHandler : INotificationHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Workspace/IExecuteCommandHandler.cs b/src/Lsp/Protocol/Workspace/IExecuteCommandHandler.cs deleted file mode 100644 index 9ff3eee10..000000000 --- a/src/Lsp/Protocol/Workspace/IExecuteCommandHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Serial, Method("workspace/executeCommand")] - public interface IExecuteCommandHandler : IRequestHandler, IRegistration, ICapability { } -} diff --git a/src/Lsp/Protocol/Workspace/IWorkspaceSymbolsHandler.cs b/src/Lsp/Protocol/Workspace/IWorkspaceSymbolsHandler.cs deleted file mode 100644 index fbc644cb6..000000000 --- a/src/Lsp/Protocol/Workspace/IWorkspaceSymbolsHandler.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; - -// ReSharper disable CheckNamespace - -namespace OmniSharp.Extensions.LanguageServer.Protocol -{ - [Parallel, Method("workspace/symbol")] - public interface IWorkspaceSymbolsHandler : IRequestHandler, ICapability { } -} diff --git a/src/Lsp/Capabilities/Client/ClientCapabilities.cs b/src/Protocol/Client/Capabilities/ClientCapabilities.cs similarity index 91% rename from src/Lsp/Capabilities/Client/ClientCapabilities.cs rename to src/Protocol/Client/Capabilities/ClientCapabilities.cs index 4cc05e8ff..0be24d49b 100644 --- a/src/Lsp/Capabilities/Client/ClientCapabilities.cs +++ b/src/Protocol/Client/Capabilities/ClientCapabilities.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ClientCapabilities diff --git a/src/Lsp/Capabilities/Client/ClientCapabilitiesExtensions.cs b/src/Protocol/Client/Capabilities/ClientCapabilitiesExtensions.cs similarity index 91% rename from src/Lsp/Capabilities/Client/ClientCapabilitiesExtensions.cs rename to src/Protocol/Client/Capabilities/ClientCapabilitiesExtensions.cs index 3e15b8a78..6ea3460eb 100644 --- a/src/Lsp/Capabilities/Client/ClientCapabilitiesExtensions.cs +++ b/src/Protocol/Client/Capabilities/ClientCapabilitiesExtensions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public static class ClientCapabilitiesExtensions { diff --git a/src/Protocol/Client/Capabilities/ClientVersion.cs b/src/Protocol/Client/Capabilities/ClientVersion.cs new file mode 100644 index 000000000..cfc228f5c --- /dev/null +++ b/src/Protocol/Client/Capabilities/ClientVersion.cs @@ -0,0 +1,8 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public enum ClientVersion + { + Lsp2, + Lsp3 + } +} \ No newline at end of file diff --git a/src/Protocol/Client/Capabilities/CodeActionCapability.cs b/src/Protocol/Client/Capabilities/CodeActionCapability.cs new file mode 100644 index 000000000..93e318eaa --- /dev/null +++ b/src/Protocol/Client/Capabilities/CodeActionCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class CodeActionCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Protocol/Client/Capabilities/CodeLensCapability.cs b/src/Protocol/Client/Capabilities/CodeLensCapability.cs new file mode 100644 index 000000000..e463f408c --- /dev/null +++ b/src/Protocol/Client/Capabilities/CodeLensCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class CodeLensCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/CompletionCapability.cs b/src/Protocol/Client/Capabilities/CompletionCapability.cs similarity index 73% rename from src/Lsp/Capabilities/Client/CompletionCapability.cs rename to src/Protocol/Client/Capabilities/CompletionCapability.cs index 95cd2296e..898d401e8 100644 --- a/src/Lsp/Capabilities/Client/CompletionCapability.cs +++ b/src/Protocol/Client/Capabilities/CompletionCapability.cs @@ -1,6 +1,4 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class CompletionCapability : DynamicCapability, ConnectedCapability { diff --git a/src/Lsp/Capabilities/Client/CompletionItemCapability.cs b/src/Protocol/Client/Capabilities/CompletionItemCapability.cs similarity index 89% rename from src/Lsp/Capabilities/Client/CompletionItemCapability.cs rename to src/Protocol/Client/Capabilities/CompletionItemCapability.cs index cb095654d..feb8e38c6 100644 --- a/src/Lsp/Capabilities/Client/CompletionItemCapability.cs +++ b/src/Protocol/Client/Capabilities/CompletionItemCapability.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CompletionItemCapability diff --git a/src/Lsp/Capabilities/Client/ConnectedCapability.cs b/src/Protocol/Client/Capabilities/ConnectedCapability.cs similarity index 63% rename from src/Lsp/Capabilities/Client/ConnectedCapability.cs rename to src/Protocol/Client/Capabilities/ConnectedCapability.cs index d0da8dccc..57976002e 100644 --- a/src/Lsp/Capabilities/Client/ConnectedCapability.cs +++ b/src/Protocol/Client/Capabilities/ConnectedCapability.cs @@ -1,6 +1,6 @@ using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { internal interface ConnectedCapability where T : IJsonRpcHandler diff --git a/src/Protocol/Client/Capabilities/DefinitionCapability.cs b/src/Protocol/Client/Capabilities/DefinitionCapability.cs new file mode 100644 index 000000000..e26e8de67 --- /dev/null +++ b/src/Protocol/Client/Capabilities/DefinitionCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class DefinitionCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/DidChangeConfigurationCapability.cs b/src/Protocol/Client/Capabilities/DidChangeConfigurationCapability.cs similarity index 50% rename from src/Lsp/Capabilities/Client/DidChangeConfigurationCapability.cs rename to src/Protocol/Client/Capabilities/DidChangeConfigurationCapability.cs index b08265356..dbc2360d4 100644 --- a/src/Lsp/Capabilities/Client/DidChangeConfigurationCapability.cs +++ b/src/Protocol/Client/Capabilities/DidChangeConfigurationCapability.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class DidChangeConfigurationCapability : DynamicCapability { } } diff --git a/src/Protocol/Client/Capabilities/DidChangeWatchedFilesCapability.cs b/src/Protocol/Client/Capabilities/DidChangeWatchedFilesCapability.cs new file mode 100644 index 000000000..6f8112da3 --- /dev/null +++ b/src/Protocol/Client/Capabilities/DidChangeWatchedFilesCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class DidChangeWatchedFilesCapability : DynamicCapability { } +} diff --git a/src/Lsp/Capabilities/Client/DocumentFormattingCapability.cs b/src/Protocol/Client/Capabilities/DocumentFormattingCapability.cs similarity index 50% rename from src/Lsp/Capabilities/Client/DocumentFormattingCapability.cs rename to src/Protocol/Client/Capabilities/DocumentFormattingCapability.cs index 1b6b4828a..63481248e 100644 --- a/src/Lsp/Capabilities/Client/DocumentFormattingCapability.cs +++ b/src/Protocol/Client/Capabilities/DocumentFormattingCapability.cs @@ -1,6 +1,4 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class DocumentFormattingCapability : DynamicCapability, ConnectedCapability { } } diff --git a/src/Lsp/Capabilities/Client/DocumentHighlightCapability.cs b/src/Protocol/Client/Capabilities/DocumentHighlightCapability.cs similarity index 50% rename from src/Lsp/Capabilities/Client/DocumentHighlightCapability.cs rename to src/Protocol/Client/Capabilities/DocumentHighlightCapability.cs index 8f6e9ec7c..b688b356b 100644 --- a/src/Lsp/Capabilities/Client/DocumentHighlightCapability.cs +++ b/src/Protocol/Client/Capabilities/DocumentHighlightCapability.cs @@ -1,6 +1,4 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class DocumentHighlightCapability : DynamicCapability, ConnectedCapability { } } diff --git a/src/Protocol/Client/Capabilities/DocumentLinkCapability.cs b/src/Protocol/Client/Capabilities/DocumentLinkCapability.cs new file mode 100644 index 000000000..334999dca --- /dev/null +++ b/src/Protocol/Client/Capabilities/DocumentLinkCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class DocumentLinkCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/DocumentOnTypeFormattingCapability.cs b/src/Protocol/Client/Capabilities/DocumentOnTypeFormattingCapability.cs similarity index 52% rename from src/Lsp/Capabilities/Client/DocumentOnTypeFormattingCapability.cs rename to src/Protocol/Client/Capabilities/DocumentOnTypeFormattingCapability.cs index 95b98912e..cc24b0652 100644 --- a/src/Lsp/Capabilities/Client/DocumentOnTypeFormattingCapability.cs +++ b/src/Protocol/Client/Capabilities/DocumentOnTypeFormattingCapability.cs @@ -1,6 +1,4 @@ -using OmniSharp.Extensions.LanguageServer.Protocol; - -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class DocumentOnTypeFormattingCapability : DynamicCapability, ConnectedCapability { } } diff --git a/src/Lsp/Capabilities/Client/DocumentRangeFormattingCapability.cs b/src/Protocol/Client/Capabilities/DocumentRangeFormattingCapability.cs similarity index 51% rename from src/Lsp/Capabilities/Client/DocumentRangeFormattingCapability.cs rename to src/Protocol/Client/Capabilities/DocumentRangeFormattingCapability.cs index 0919735ab..fa9ce4f25 100644 --- a/src/Lsp/Capabilities/Client/DocumentRangeFormattingCapability.cs +++ b/src/Protocol/Client/Capabilities/DocumentRangeFormattingCapability.cs @@ -1,6 +1,6 @@ -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class DocumentRangeFormattingCapability : DynamicCapability, ConnectedCapability { } } diff --git a/src/Protocol/Client/Capabilities/DocumentSymbolCapability.cs b/src/Protocol/Client/Capabilities/DocumentSymbolCapability.cs new file mode 100644 index 000000000..7e852eec6 --- /dev/null +++ b/src/Protocol/Client/Capabilities/DocumentSymbolCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class DocumentSymbolCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/DynamicCapability.cs b/src/Protocol/Client/Capabilities/DynamicCapability.cs similarity index 82% rename from src/Lsp/Capabilities/Client/DynamicCapability.cs rename to src/Protocol/Client/Capabilities/DynamicCapability.cs index fc0c13251..6e8f44f9b 100644 --- a/src/Lsp/Capabilities/Client/DynamicCapability.cs +++ b/src/Protocol/Client/Capabilities/DynamicCapability.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DynamicCapability diff --git a/src/Protocol/Client/Capabilities/ExecuteCommandCapability.cs b/src/Protocol/Client/Capabilities/ExecuteCommandCapability.cs new file mode 100644 index 000000000..fa4568904 --- /dev/null +++ b/src/Protocol/Client/Capabilities/ExecuteCommandCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class ExecuteCommandCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Protocol/Client/Capabilities/HoverCapability.cs b/src/Protocol/Client/Capabilities/HoverCapability.cs new file mode 100644 index 000000000..3512f1b4c --- /dev/null +++ b/src/Protocol/Client/Capabilities/HoverCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class HoverCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/ISupports.cs b/src/Protocol/Client/Capabilities/ISupports.cs similarity index 67% rename from src/Lsp/Capabilities/Client/ISupports.cs rename to src/Protocol/Client/Capabilities/ISupports.cs index 3b242db3f..5fe244192 100644 --- a/src/Lsp/Capabilities/Client/ISupports.cs +++ b/src/Protocol/Client/Capabilities/ISupports.cs @@ -1,6 +1,6 @@ using System; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public interface ISupports { diff --git a/src/Protocol/Client/Capabilities/ReferencesCapability.cs b/src/Protocol/Client/Capabilities/ReferencesCapability.cs new file mode 100644 index 000000000..857173d4d --- /dev/null +++ b/src/Protocol/Client/Capabilities/ReferencesCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class ReferencesCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Protocol/Client/Capabilities/RenameCapability.cs b/src/Protocol/Client/Capabilities/RenameCapability.cs new file mode 100644 index 000000000..4bf2093f4 --- /dev/null +++ b/src/Protocol/Client/Capabilities/RenameCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class RenameCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Protocol/Client/Capabilities/SignatureHelpCapability.cs b/src/Protocol/Client/Capabilities/SignatureHelpCapability.cs new file mode 100644 index 000000000..90ef3a403 --- /dev/null +++ b/src/Protocol/Client/Capabilities/SignatureHelpCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class SignatureHelpCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Capabilities/Client/Supports.cs b/src/Protocol/Client/Capabilities/Supports.cs similarity index 89% rename from src/Lsp/Capabilities/Client/Supports.cs rename to src/Protocol/Client/Capabilities/Supports.cs index 15308584b..3cbcf7bf9 100644 --- a/src/Lsp/Capabilities/Client/Supports.cs +++ b/src/Protocol/Client/Capabilities/Supports.cs @@ -1,8 +1,8 @@ using System; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonConverter(typeof(SupportsConverter))] public struct Supports : ISupports diff --git a/src/Lsp/Capabilities/Client/SynchronizationCapability.cs b/src/Protocol/Client/Capabilities/SynchronizationCapability.cs similarity index 84% rename from src/Lsp/Capabilities/Client/SynchronizationCapability.cs rename to src/Protocol/Client/Capabilities/SynchronizationCapability.cs index 41800f513..7e9c29087 100644 --- a/src/Lsp/Capabilities/Client/SynchronizationCapability.cs +++ b/src/Protocol/Client/Capabilities/SynchronizationCapability.cs @@ -1,6 +1,6 @@ -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { public class SynchronizationCapability : DynamicCapability, ConnectedCapability { diff --git a/src/Lsp/Capabilities/Client/TextDocumentClientCapabilities.cs b/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs similarity index 98% rename from src/Lsp/Capabilities/Client/TextDocumentClientCapabilities.cs rename to src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs index 0d3f7e20b..f0fcc8eb8 100644 --- a/src/Lsp/Capabilities/Client/TextDocumentClientCapabilities.cs +++ b/src/Protocol/Client/Capabilities/TextDocumentClientCapabilities.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentClientCapabilities diff --git a/src/Lsp/Capabilities/Client/WorkspaceClientCapabilites.cs b/src/Protocol/Client/Capabilities/WorkspaceClientCapabilites.cs similarity index 96% rename from src/Lsp/Capabilities/Client/WorkspaceClientCapabilites.cs rename to src/Protocol/Client/Capabilities/WorkspaceClientCapabilites.cs index 605530355..eaea78ef5 100644 --- a/src/Lsp/Capabilities/Client/WorkspaceClientCapabilites.cs +++ b/src/Protocol/Client/Capabilities/WorkspaceClientCapabilites.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class WorkspaceClientCapabilites diff --git a/src/Lsp/Capabilities/Client/WorkspaceEditCapability.cs b/src/Protocol/Client/Capabilities/WorkspaceEditCapability.cs similarity index 85% rename from src/Lsp/Capabilities/Client/WorkspaceEditCapability.cs rename to src/Protocol/Client/Capabilities/WorkspaceEditCapability.cs index 5ddcdd2e2..68e883c68 100644 --- a/src/Lsp/Capabilities/Client/WorkspaceEditCapability.cs +++ b/src/Protocol/Client/Capabilities/WorkspaceEditCapability.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Client +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class WorkspaceEditCapability diff --git a/src/Protocol/Client/Capabilities/WorkspaceSymbolCapability.cs b/src/Protocol/Client/Capabilities/WorkspaceSymbolCapability.cs new file mode 100644 index 000000000..b56c4dc1a --- /dev/null +++ b/src/Protocol/Client/Capabilities/WorkspaceSymbolCapability.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities +{ + public class WorkspaceSymbolCapability : DynamicCapability, ConnectedCapability { } +} diff --git a/src/Lsp/Protocol/Client/RegisterCapabilityExtensions.cs b/src/Protocol/Client/RegisterCapabilityExtensions.cs similarity index 51% rename from src/Lsp/Protocol/Client/RegisterCapabilityExtensions.cs rename to src/Protocol/Client/RegisterCapabilityExtensions.cs index 0b3ad1de4..1abea6f3d 100644 --- a/src/Lsp/Protocol/Client/RegisterCapabilityExtensions.cs +++ b/src/Protocol/Client/RegisterCapabilityExtensions.cs @@ -1,19 +1,24 @@ -using System; +using System; using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { + public static partial class ClientNames + { + public const string RegisterCapability = "client/registerCapability"; + } + public static class RegisterCapabilityExtensions { - public static async Task RegisterCapability(this ILanguageServer mediator, RegistrationParams @params) + public static async Task RegisterCapability(this IResponseRouter mediator, RegistrationParams @params) { try { - await mediator.SendRequest("client/registerCapability", @params); + await mediator.SendRequest(ClientNames.RegisterCapability, @params); } catch (Exception e) { diff --git a/src/Lsp/Protocol/Client/UnregisterCapabilityExtensions.cs b/src/Protocol/Client/UnregisterCapabilityExtensions.cs similarity index 50% rename from src/Lsp/Protocol/Client/UnregisterCapabilityExtensions.cs rename to src/Protocol/Client/UnregisterCapabilityExtensions.cs index 89b95f009..54e8a8b0e 100644 --- a/src/Lsp/Protocol/Client/UnregisterCapabilityExtensions.cs +++ b/src/Protocol/Client/UnregisterCapabilityExtensions.cs @@ -1,19 +1,24 @@ -using System; +using System; using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { + public static partial class ClientNames + { + public const string UnregisterCapability = "client/unregisterCapability"; + } + public static class UnregisterCapabilityExtensions { - public static async Task UnregisterCapability(this ILanguageServer mediator, UnregistrationParams @params) + public static async Task UnregisterCapability(this IResponseRouter mediator, UnregistrationParams @params) { try { - await mediator.SendRequest("client/unregisterCapability", @params); + await mediator.SendRequest(ClientNames.UnregisterCapability, @params); } catch (Exception e) { diff --git a/src/Protocol/ClientNames.cs b/src/Protocol/ClientNames.cs new file mode 100644 index 000000000..f977ba3d3 --- /dev/null +++ b/src/Protocol/ClientNames.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class ClientNames { } +} \ No newline at end of file diff --git a/src/Lsp/Converters/BooleanNumberStringConverter.cs b/src/Protocol/Converters/BooleanNumberStringConverter.cs similarity index 91% rename from src/Lsp/Converters/BooleanNumberStringConverter.cs rename to src/Protocol/Converters/BooleanNumberStringConverter.cs index 3c752c173..102d25472 100644 --- a/src/Lsp/Converters/BooleanNumberStringConverter.cs +++ b/src/Protocol/Converters/BooleanNumberStringConverter.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class BooleanNumberStringConverter : JsonConverter { diff --git a/src/Lsp/Converters/CompletionListConverter.cs b/src/Protocol/Converters/CompletionListConverter.cs similarity index 92% rename from src/Lsp/Converters/CompletionListConverter.cs rename to src/Protocol/Converters/CompletionListConverter.cs index d2854b5a6..1565dea31 100644 --- a/src/Lsp/Converters/CompletionListConverter.cs +++ b/src/Protocol/Converters/CompletionListConverter.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class CompletionListConverter : JsonConverter { diff --git a/src/Lsp/Converters/DiagnosticCodeConverter.cs b/src/Protocol/Converters/DiagnosticCodeConverter.cs similarity index 89% rename from src/Lsp/Converters/DiagnosticCodeConverter.cs rename to src/Protocol/Converters/DiagnosticCodeConverter.cs index 1d6f8103a..74bcd4e92 100644 --- a/src/Lsp/Converters/DiagnosticCodeConverter.cs +++ b/src/Protocol/Converters/DiagnosticCodeConverter.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class DiagnosticCodeConverter : JsonConverter { diff --git a/src/Lsp/Converters/LocationOrLocationsConverter.cs b/src/Protocol/Converters/LocationOrLocationsConverter.cs similarity index 91% rename from src/Lsp/Converters/LocationOrLocationsConverter.cs rename to src/Protocol/Converters/LocationOrLocationsConverter.cs index e804cfc64..96e49fda9 100644 --- a/src/Lsp/Converters/LocationOrLocationsConverter.cs +++ b/src/Protocol/Converters/LocationOrLocationsConverter.cs @@ -3,9 +3,9 @@ using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class LocationOrLocationsConverter : JsonConverter { diff --git a/src/Lsp/Converters/MarkedStringCollectionConverter.cs b/src/Protocol/Converters/MarkedStringCollectionConverter.cs similarity index 92% rename from src/Lsp/Converters/MarkedStringCollectionConverter.cs rename to src/Protocol/Converters/MarkedStringCollectionConverter.cs index 6c69a7d94..6b39da54f 100644 --- a/src/Lsp/Converters/MarkedStringCollectionConverter.cs +++ b/src/Protocol/Converters/MarkedStringCollectionConverter.cs @@ -3,9 +3,9 @@ using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class MarkedStringCollectionConverter : JsonConverter { diff --git a/src/Lsp/Converters/MarkedStringConverter.cs b/src/Protocol/Converters/MarkedStringConverter.cs similarity index 92% rename from src/Lsp/Converters/MarkedStringConverter.cs rename to src/Protocol/Converters/MarkedStringConverter.cs index afc2c1de4..8db32f928 100644 --- a/src/Lsp/Converters/MarkedStringConverter.cs +++ b/src/Protocol/Converters/MarkedStringConverter.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class MarkedStringConverter : JsonConverter { diff --git a/src/Lsp/Converters/NumberEnumConverter.cs b/src/Protocol/Converters/NumberEnumConverter.cs similarity index 91% rename from src/Lsp/Converters/NumberEnumConverter.cs rename to src/Protocol/Converters/NumberEnumConverter.cs index efa58af68..fedc8fb97 100644 --- a/src/Lsp/Converters/NumberEnumConverter.cs +++ b/src/Protocol/Converters/NumberEnumConverter.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class NumberEnumConverter : JsonConverter { diff --git a/src/Lsp/Converters/SupportsConverter.cs b/src/Protocol/Converters/SupportsConverter.cs similarity index 95% rename from src/Lsp/Converters/SupportsConverter.cs rename to src/Protocol/Converters/SupportsConverter.cs index eba142d0f..86b6fd61f 100644 --- a/src/Lsp/Converters/SupportsConverter.cs +++ b/src/Protocol/Converters/SupportsConverter.cs @@ -1,9 +1,9 @@ using System; using System.Reflection; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class SupportsConverter : JsonConverter { diff --git a/src/Lsp/Converters/TextDocumentSyncConverter.cs b/src/Protocol/Converters/TextDocumentSyncConverter.cs similarity index 88% rename from src/Lsp/Converters/TextDocumentSyncConverter.cs rename to src/Protocol/Converters/TextDocumentSyncConverter.cs index df6ffc233..84ad4bd12 100644 --- a/src/Lsp/Converters/TextDocumentSyncConverter.cs +++ b/src/Protocol/Converters/TextDocumentSyncConverter.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Converters +namespace OmniSharp.Extensions.LanguageServer.Protocol.Converters { class TextDocumentSyncConverter : JsonConverter { diff --git a/src/Protocol/Document/ICodeActionHandler.cs b/src/Protocol/Document/ICodeActionHandler.cs new file mode 100644 index 000000000..63a8fa0a2 --- /dev/null +++ b/src/Protocol/Document/ICodeActionHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string CodeAction = "textDocument/codeAction"; + } + + [Parallel, Method(CodeAction)] + public interface ICodeActionHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/ICodeLensHandler.cs b/src/Protocol/Document/ICodeLensHandler.cs new file mode 100644 index 000000000..35b259219 --- /dev/null +++ b/src/Protocol/Document/ICodeLensHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string CodeLens = "textDocument/codeLens"; + } + + [Parallel, Method(CodeLens)] + public interface ICodeLensHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/ICodeLensResolveHandler.cs b/src/Protocol/Document/ICodeLensResolveHandler.cs new file mode 100644 index 000000000..27c13fdc2 --- /dev/null +++ b/src/Protocol/Document/ICodeLensResolveHandler.cs @@ -0,0 +1,16 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string CodeLensResolve = "codeLens/resolve"; + } + + [Parallel, Method(CodeLensResolve)] + public interface ICodeLensResolveHandler : IRequestHandler { } +} diff --git a/src/Protocol/Document/ICompletionHandler.cs b/src/Protocol/Document/ICompletionHandler.cs new file mode 100644 index 000000000..37e563809 --- /dev/null +++ b/src/Protocol/Document/ICompletionHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string Completion = "textDocument/completion"; + } + + [Parallel, Method(Completion)] + public interface ICompletionHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/ICompletionResolveHandler.cs b/src/Protocol/Document/ICompletionResolveHandler.cs new file mode 100644 index 000000000..66b7bfd7a --- /dev/null +++ b/src/Protocol/Document/ICompletionResolveHandler.cs @@ -0,0 +1,16 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string CompletionResolve = "completionItem/resolve"; + } + + [Serial, Method(CompletionResolve)] + public interface ICompletionResolveHandler : IRequestHandler { } +} diff --git a/src/Lsp/Protocol/Document/IDefinitionHandler.cs b/src/Protocol/Document/IDefinitionHandler.cs similarity index 50% rename from src/Lsp/Protocol/Document/IDefinitionHandler.cs rename to src/Protocol/Document/IDefinitionHandler.cs index 6b008ec62..4886f2223 100644 --- a/src/Lsp/Protocol/Document/IDefinitionHandler.cs +++ b/src/Protocol/Document/IDefinitionHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Parallel, Method("textDocument/definition")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string Definition = "textDocument/definition"; + } + + [Parallel, Method(Definition)] public interface IDefinitionHandler : IRequestHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDidChangeTextDocumentHandler.cs b/src/Protocol/Document/IDidChangeTextDocumentHandler.cs similarity index 51% rename from src/Lsp/Protocol/Document/IDidChangeTextDocumentHandler.cs rename to src/Protocol/Document/IDidChangeTextDocumentHandler.cs index d5da5b61a..e80209283 100644 --- a/src/Lsp/Protocol/Document/IDidChangeTextDocumentHandler.cs +++ b/src/Protocol/Document/IDidChangeTextDocumentHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("textDocument/didChange")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string DidChange = "textDocument/didChange"; + } + + [Serial, Method(DidChange)] public interface IDidChangeTextDocumentHandler : INotificationHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDidCloseTextDocumentHandler.cs b/src/Protocol/Document/IDidCloseTextDocumentHandler.cs similarity index 50% rename from src/Lsp/Protocol/Document/IDidCloseTextDocumentHandler.cs rename to src/Protocol/Document/IDidCloseTextDocumentHandler.cs index 74f6289a5..9f461e7df 100644 --- a/src/Lsp/Protocol/Document/IDidCloseTextDocumentHandler.cs +++ b/src/Protocol/Document/IDidCloseTextDocumentHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Parallel, Method("textDocument/didClose")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string DidClose = "textDocument/didClose"; + } + + [Parallel, Method(DidClose)] public interface IDidCloseTextDocumentHandler : INotificationHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDidOpenTextDocumentHandler.cs b/src/Protocol/Document/IDidOpenTextDocumentHandler.cs similarity index 50% rename from src/Lsp/Protocol/Document/IDidOpenTextDocumentHandler.cs rename to src/Protocol/Document/IDidOpenTextDocumentHandler.cs index ba3e631cb..4beb4fdd6 100644 --- a/src/Lsp/Protocol/Document/IDidOpenTextDocumentHandler.cs +++ b/src/Protocol/Document/IDidOpenTextDocumentHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("textDocument/didOpen")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string DidOpen = "textDocument/didOpen"; + } + + [Serial, Method(DidOpen)] public interface IDidOpenTextDocumentHandler : INotificationHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDidSaveTextDocumentHandler.cs b/src/Protocol/Document/IDidSaveTextDocumentHandler.cs similarity index 51% rename from src/Lsp/Protocol/Document/IDidSaveTextDocumentHandler.cs rename to src/Protocol/Document/IDidSaveTextDocumentHandler.cs index 259f3c0cd..a7affdb5b 100644 --- a/src/Lsp/Protocol/Document/IDidSaveTextDocumentHandler.cs +++ b/src/Protocol/Document/IDidSaveTextDocumentHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("textDocument/didSave")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string DidSave = "textDocument/didSave"; + } + + [Serial, Method(DidSave)] public interface IDidSaveTextDocumentHandler : INotificationHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDocumentFormattingHandler.cs b/src/Protocol/Document/IDocumentFormattingHandler.cs similarity index 51% rename from src/Lsp/Protocol/Document/IDocumentFormattingHandler.cs rename to src/Protocol/Document/IDocumentFormattingHandler.cs index 1931b6bdf..23cb99d05 100644 --- a/src/Lsp/Protocol/Document/IDocumentFormattingHandler.cs +++ b/src/Protocol/Document/IDocumentFormattingHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("textDocument/formatting")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string Formatting = "textDocument/formatting"; + } + + [Serial, Method(Formatting)] public interface IDocumentFormattingHandler : IRequestHandler, IRegistration, ICapability { } } diff --git a/src/Lsp/Protocol/Document/IDocumentHighlightHandler.cs b/src/Protocol/Document/IDocumentHighlightHandler.cs similarity index 50% rename from src/Lsp/Protocol/Document/IDocumentHighlightHandler.cs rename to src/Protocol/Document/IDocumentHighlightHandler.cs index cc67d38de..7d70ea1cd 100644 --- a/src/Lsp/Protocol/Document/IDocumentHighlightHandler.cs +++ b/src/Protocol/Document/IDocumentHighlightHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Parallel, Method("textDocument/documentHighlight")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string DocumentHighlight = "textDocument/documentHighlight"; + } + + [Parallel, Method(DocumentHighlight)] public interface IDocumentHighlightHandler : IRequestHandler, IRegistration, ICapability { } } diff --git a/src/Protocol/Document/IDocumentLinkHandler.cs b/src/Protocol/Document/IDocumentLinkHandler.cs new file mode 100644 index 000000000..0a73f8dfa --- /dev/null +++ b/src/Protocol/Document/IDocumentLinkHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string DocumentLink = "textDocument/documentLink"; + } + + [Parallel, Method(DocumentLink)] + public interface IDocumentLinkHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/IDocumentLinkResolveHandler.cs b/src/Protocol/Document/IDocumentLinkResolveHandler.cs new file mode 100644 index 000000000..240a3eb06 --- /dev/null +++ b/src/Protocol/Document/IDocumentLinkResolveHandler.cs @@ -0,0 +1,16 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string DocumentLinkResolve = "documentLink/resolve"; + } + + [Parallel, Method(DocumentLinkResolve)] + public interface IDocumentLinkResolveHandler : IRequestHandler { } +} diff --git a/src/Lsp/Protocol/Document/IDocumentOnTypeFormatHandler.cs b/src/Protocol/Document/IDocumentOnTypeFormatHandler.cs similarity index 51% rename from src/Lsp/Protocol/Document/IDocumentOnTypeFormatHandler.cs rename to src/Protocol/Document/IDocumentOnTypeFormatHandler.cs index 0d10c9d8b..5b743359c 100644 --- a/src/Lsp/Protocol/Document/IDocumentOnTypeFormatHandler.cs +++ b/src/Protocol/Document/IDocumentOnTypeFormatHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("textDocument/onTypeFormatting")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string OnTypeFormatting = "textDocument/onTypeFormatting"; + } + + [Serial, Method(OnTypeFormatting)] public interface IDocumentOnTypeFormatHandler : IRequestHandler, IRegistration, ICapability { } } diff --git a/src/Protocol/Document/IDocumentRangeFormattingHandler.cs b/src/Protocol/Document/IDocumentRangeFormattingHandler.cs new file mode 100644 index 000000000..cbe570fc7 --- /dev/null +++ b/src/Protocol/Document/IDocumentRangeFormattingHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string RangeFormatting = "textDocument/rangeFormatting"; + } + + [Serial, Method(RangeFormatting)] + public interface IDocumentRangeFormattingHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/IDocumentSymbolHandler.cs b/src/Protocol/Document/IDocumentSymbolHandler.cs new file mode 100644 index 000000000..2f96f0a8c --- /dev/null +++ b/src/Protocol/Document/IDocumentSymbolHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string DocumentSymbol = "textDocument/documentSymbol"; + } + + [Parallel, Method(DocumentSymbol)] + public interface IDocumentSymbolHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/IHoverHandler.cs b/src/Protocol/Document/IHoverHandler.cs new file mode 100644 index 000000000..c45323fa7 --- /dev/null +++ b/src/Protocol/Document/IHoverHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string Hover = "textDocument/hover"; + } + + [Parallel, Method(Hover)] + public interface IHoverHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/IReferencesHandler.cs b/src/Protocol/Document/IReferencesHandler.cs new file mode 100644 index 000000000..4ea334878 --- /dev/null +++ b/src/Protocol/Document/IReferencesHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string References = "textDocument/references"; + } + + [Parallel, Method(References)] + public interface IReferencesHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/IRenameHandler.cs b/src/Protocol/Document/IRenameHandler.cs new file mode 100644 index 000000000..00e7b0c78 --- /dev/null +++ b/src/Protocol/Document/IRenameHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string Rename = "textDocument/rename"; + } + + [Serial, Method(Rename)] + public interface IRenameHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/ISignatureHelpHandler.cs b/src/Protocol/Document/ISignatureHelpHandler.cs new file mode 100644 index 000000000..dd1df362a --- /dev/null +++ b/src/Protocol/Document/ISignatureHelpHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string SignatureHelp = "textDocument/signatureHelp"; + } + + [Parallel, Method(SignatureHelp)] + public interface ISignatureHelpHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Lsp/Protocol/Document/ITextDocumentSyncHandler.cs b/src/Protocol/Document/ITextDocumentSyncHandler.cs similarity index 76% rename from src/Lsp/Protocol/Document/ITextDocumentSyncHandler.cs rename to src/Protocol/Document/ITextDocumentSyncHandler.cs index b70e54a51..0c5f79561 100644 --- a/src/Lsp/Protocol/Document/ITextDocumentSyncHandler.cs +++ b/src/Protocol/Document/ITextDocumentSyncHandler.cs @@ -1,9 +1,10 @@ using System; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Protocol.Document +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol { public interface ITextDocumentSyncHandler : IDidChangeTextDocumentHandler, IDidOpenTextDocumentHandler, IDidCloseTextDocumentHandler, IDidSaveTextDocumentHandler { diff --git a/src/Lsp/Protocol/Document/IWillSaveTextDocumentHandler.cs b/src/Protocol/Document/IWillSaveTextDocumentHandler.cs similarity index 50% rename from src/Lsp/Protocol/Document/IWillSaveTextDocumentHandler.cs rename to src/Protocol/Document/IWillSaveTextDocumentHandler.cs index 97cc67f45..b99d61094 100644 --- a/src/Lsp/Protocol/Document/IWillSaveTextDocumentHandler.cs +++ b/src/Protocol/Document/IWillSaveTextDocumentHandler.cs @@ -1,12 +1,17 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Parallel, Method("textDocument/willSave")] + using static DocumentNames; + public static partial class DocumentNames + { + public const string WillSave = "textDocument/willSave"; + } + + [Parallel, Method(WillSave)] public interface IWillSaveTextDocumentHandler : INotificationHandler, IRegistration, ICapability { } } diff --git a/src/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs b/src/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs new file mode 100644 index 000000000..a5092a54c --- /dev/null +++ b/src/Protocol/Document/IWillSaveWaitUntilTextDocumentHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string WillSaveWaitUntil = "textDocument/willSaveWaitUntil"; + } + + [Serial, Method(WillSaveWaitUntil)] + public interface IWillSaveWaitUntilTextDocumentHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Document/PublishDiagnosticsExtensions.cs b/src/Protocol/Document/PublishDiagnosticsExtensions.cs new file mode 100644 index 000000000..efe80d1f8 --- /dev/null +++ b/src/Protocol/Document/PublishDiagnosticsExtensions.cs @@ -0,0 +1,21 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static DocumentNames; + public static partial class DocumentNames + { + public const string PublishDiagnostics = "textDocument/publishDiagnostics"; + } + + public static class PublishDiagnosticsExtensions + { + public static void PublishDiagnostics(this IResponseRouter mediator, PublishDiagnosticsParams @params) + { + mediator.SendNotification(DocumentNames.PublishDiagnostics, @params); + } + } +} diff --git a/src/Lsp/Protocol/Document/TextDocumentAttributes.cs b/src/Protocol/Document/TextDocumentAttributes.cs similarity index 95% rename from src/Lsp/Protocol/Document/TextDocumentAttributes.cs rename to src/Protocol/Document/TextDocumentAttributes.cs index 8bae913ea..d0aa8cf1b 100644 --- a/src/Lsp/Protocol/Document/TextDocumentAttributes.cs +++ b/src/Protocol/Document/TextDocumentAttributes.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; -namespace OmniSharp.Extensions.LanguageServer.Protocol.Document +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol { public class TextDocumentAttributes : IEquatable { diff --git a/src/Protocol/DocumentNames.cs b/src/Protocol/DocumentNames.cs new file mode 100644 index 000000000..d48e50450 --- /dev/null +++ b/src/Protocol/DocumentNames.cs @@ -0,0 +1,6 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class DocumentNames + { + } +} \ No newline at end of file diff --git a/src/Protocol/General/CancelRequestExtensions.cs b/src/Protocol/General/CancelRequestExtensions.cs new file mode 100644 index 000000000..ef283d5a4 --- /dev/null +++ b/src/Protocol/General/CancelRequestExtensions.cs @@ -0,0 +1,25 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static class CancelRequestExtensions + { + public static void CancelRequest(this IResponseRouter mediator, CancelParams @params) + { + mediator.SendNotification(GeneralNames.CancelRequest, @params); + } + + public static void CancelRequest(this IResponseRouter mediator, string id) + { + mediator.SendNotification(GeneralNames.CancelRequest, new CancelParams() { Id = id }); + } + + public static void CancelRequest(this IResponseRouter mediator, long id) + { + mediator.SendNotification(GeneralNames.CancelRequest, new CancelParams() { Id = id }); + } + } +} diff --git a/src/Protocol/General/ICancelRequestHandler.cs b/src/Protocol/General/ICancelRequestHandler.cs new file mode 100644 index 000000000..df1785199 --- /dev/null +++ b/src/Protocol/General/ICancelRequestHandler.cs @@ -0,0 +1,16 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static GeneralNames; + public static partial class GeneralNames + { + public const string CancelRequest = "$/cancelRequest"; + } + + [Parallel, Method(CancelRequest)] + public interface ICancelRequestHandler : INotificationHandler { } +} diff --git a/src/Lsp/Protocol/General/IExitHandler.cs b/src/Protocol/General/IExitHandler.cs similarity index 54% rename from src/Lsp/Protocol/General/IExitHandler.cs rename to src/Protocol/General/IExitHandler.cs index 37f344c24..4c65263be 100644 --- a/src/Lsp/Protocol/General/IExitHandler.cs +++ b/src/Protocol/General/IExitHandler.cs @@ -4,6 +4,12 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("exit")] + using static GeneralNames; + public static partial class GeneralNames + { + public const string Exit = "exit"; + } + + [Serial, Method(Exit)] public interface IExitHandler : INotificationHandler { } } diff --git a/src/Lsp/Protocol/General/IInitializeHandler.cs b/src/Protocol/General/IInitializeHandler.cs similarity index 55% rename from src/Lsp/Protocol/General/IInitializeHandler.cs rename to src/Protocol/General/IInitializeHandler.cs index edcf3dedf..3628a0581 100644 --- a/src/Lsp/Protocol/General/IInitializeHandler.cs +++ b/src/Protocol/General/IInitializeHandler.cs @@ -1,13 +1,19 @@ using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { + using static GeneralNames; + public static partial class GeneralNames + { + public const string Initialize = "initialize"; + } + /// /// InitializeError /// - [Serial, Method("initialize")] + [Serial, Method(Initialize)] public interface IInitializeHandler : IRequestHandler { } } diff --git a/src/Lsp/Protocol/General/IInitializedHandler.cs b/src/Protocol/General/IInitializedHandler.cs similarity index 52% rename from src/Lsp/Protocol/General/IInitializedHandler.cs rename to src/Protocol/General/IInitializedHandler.cs index d1a2ef05f..a9e80408e 100644 --- a/src/Lsp/Protocol/General/IInitializedHandler.cs +++ b/src/Protocol/General/IInitializedHandler.cs @@ -4,6 +4,12 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("initialized")] + using static GeneralNames; + public static partial class GeneralNames + { + public const string Initialized = "initialized"; + } + + [Serial, Method(Initialized)] public interface IInitializedHandler : INotificationHandler { } } diff --git a/src/Lsp/Protocol/General/IShutdownHandler.cs b/src/Protocol/General/IShutdownHandler.cs similarity index 53% rename from src/Lsp/Protocol/General/IShutdownHandler.cs rename to src/Protocol/General/IShutdownHandler.cs index 39e118ade..a023a47a6 100644 --- a/src/Lsp/Protocol/General/IShutdownHandler.cs +++ b/src/Protocol/General/IShutdownHandler.cs @@ -4,6 +4,12 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol { - [Serial, Method("shutdown")] + using static GeneralNames; + public static partial class GeneralNames + { + public const string Shutdown = "shutdown"; + } + + [Serial, Method(Shutdown)] public interface IShutdownHandler : INotificationHandler { } } diff --git a/src/Protocol/GeneralNames.cs b/src/Protocol/GeneralNames.cs new file mode 100644 index 000000000..07907b94b --- /dev/null +++ b/src/Protocol/GeneralNames.cs @@ -0,0 +1,7 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class GeneralNames + { + + } +} \ No newline at end of file diff --git a/src/Lsp/Abstractions/ICapability.cs b/src/Protocol/ICapability.cs similarity index 64% rename from src/Lsp/Abstractions/ICapability.cs rename to src/Protocol/ICapability.cs index 634e911fc..0337f821f 100644 --- a/src/Lsp/Abstractions/ICapability.cs +++ b/src/Protocol/ICapability.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Protocol { public interface ICapability { diff --git a/src/Lsp/Abstractions/IRegistration.cs b/src/Protocol/IRegistration.cs similarity index 63% rename from src/Lsp/Abstractions/IRegistration.cs rename to src/Protocol/IRegistration.cs index 3bb78bf4f..e57cb5b83 100644 --- a/src/Lsp/Abstractions/IRegistration.cs +++ b/src/Protocol/IRegistration.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Protocol { public interface IRegistration { diff --git a/src/Lsp/Minimatch/Minimatcher.cs b/src/Protocol/Minimatch/Minimatcher.cs similarity index 100% rename from src/Lsp/Minimatch/Minimatcher.cs rename to src/Protocol/Minimatch/Minimatcher.cs diff --git a/src/Lsp/Minimatch/Options.cs b/src/Protocol/Minimatch/Options.cs similarity index 100% rename from src/Lsp/Minimatch/Options.cs rename to src/Protocol/Minimatch/Options.cs diff --git a/src/Lsp/Models/ApplyWorkspaceEditParams.cs b/src/Protocol/Models/ApplyWorkspaceEditParams.cs similarity index 83% rename from src/Lsp/Models/ApplyWorkspaceEditParams.cs rename to src/Protocol/Models/ApplyWorkspaceEditParams.cs index c5bf8522e..e64dfa750 100644 --- a/src/Lsp/Models/ApplyWorkspaceEditParams.cs +++ b/src/Protocol/Models/ApplyWorkspaceEditParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ApplyWorkspaceEditParams diff --git a/src/Lsp/Models/ApplyWorkspaceEditResponse.cs b/src/Protocol/Models/ApplyWorkspaceEditResponse.cs similarity index 84% rename from src/Lsp/Models/ApplyWorkspaceEditResponse.cs rename to src/Protocol/Models/ApplyWorkspaceEditResponse.cs index d58597a66..8989a576f 100644 --- a/src/Lsp/Models/ApplyWorkspaceEditResponse.cs +++ b/src/Protocol/Models/ApplyWorkspaceEditResponse.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ApplyWorkspaceEditResponse diff --git a/src/Lsp/Models/BooleanNumberString.cs b/src/Protocol/Models/BooleanNumberString.cs similarity index 94% rename from src/Lsp/Models/BooleanNumberString.cs rename to src/Protocol/Models/BooleanNumberString.cs index 90fe2ad6f..a00a544da 100644 --- a/src/Lsp/Models/BooleanNumberString.cs +++ b/src/Protocol/Models/BooleanNumberString.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(BooleanNumberStringConverter))] public struct BooleanNumberString diff --git a/src/Lsp/Models/CancelParams.cs b/src/Protocol/Models/CancelParams.cs similarity index 82% rename from src/Lsp/Models/CancelParams.cs rename to src/Protocol/Models/CancelParams.cs index 788da1bba..f9f372a1e 100644 --- a/src/Lsp/Models/CancelParams.cs +++ b/src/Protocol/Models/CancelParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CancelParams diff --git a/src/Lsp/Models/CodeActionContext.cs b/src/Protocol/Models/CodeActionContext.cs similarity index 88% rename from src/Lsp/Models/CodeActionContext.cs rename to src/Protocol/Models/CodeActionContext.cs index d333ef37a..0623bb238 100644 --- a/src/Lsp/Models/CodeActionContext.cs +++ b/src/Protocol/Models/CodeActionContext.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Contains additional diagnostic information about the context in which diff --git a/src/Lsp/Models/CodeActionParams.cs b/src/Protocol/Models/CodeActionParams.cs similarity index 92% rename from src/Lsp/Models/CodeActionParams.cs rename to src/Protocol/Models/CodeActionParams.cs index dae6dba90..0abb42f98 100644 --- a/src/Lsp/Models/CodeActionParams.cs +++ b/src/Protocol/Models/CodeActionParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Params for the CodeActionRequest diff --git a/src/Lsp/Models/CodeLens.cs b/src/Protocol/Models/CodeLens.cs similarity index 95% rename from src/Lsp/Models/CodeLens.cs rename to src/Protocol/Models/CodeLens.cs index 1a0e76018..3b1c20284 100644 --- a/src/Lsp/Models/CodeLens.cs +++ b/src/Protocol/Models/CodeLens.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A code lens represents a command that should be shown along with diff --git a/src/Lsp/Models/CodeLensContainer.cs b/src/Protocol/Models/CodeLensContainer.cs similarity index 93% rename from src/Lsp/Models/CodeLensContainer.cs rename to src/Protocol/Models/CodeLensContainer.cs index 89601df9c..44b4f7c91 100644 --- a/src/Lsp/Models/CodeLensContainer.cs +++ b/src/Protocol/Models/CodeLensContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class CodeLensContainer : Container { diff --git a/src/Lsp/Models/CodeLensParams.cs b/src/Protocol/Models/CodeLensParams.cs similarity index 85% rename from src/Lsp/Models/CodeLensParams.cs rename to src/Protocol/Models/CodeLensParams.cs index d3dd4a6d8..146e6680c 100644 --- a/src/Lsp/Models/CodeLensParams.cs +++ b/src/Protocol/Models/CodeLensParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CodeLensParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/CodeLensRegistrationOptions.cs b/src/Protocol/Models/CodeLensRegistrationOptions.cs similarity index 88% rename from src/Lsp/Models/CodeLensRegistrationOptions.cs rename to src/Protocol/Models/CodeLensRegistrationOptions.cs index 76057002d..dd7457909 100644 --- a/src/Lsp/Models/CodeLensRegistrationOptions.cs +++ b/src/Protocol/Models/CodeLensRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CodeLensRegistrationOptions : TextDocumentRegistrationOptions, ICodeLensOptions diff --git a/src/Lsp/Models/Command.cs b/src/Protocol/Models/Command.cs similarity index 92% rename from src/Lsp/Models/Command.cs rename to src/Protocol/Models/Command.cs index 1a5a4504a..7e976918d 100644 --- a/src/Lsp/Models/Command.cs +++ b/src/Protocol/Models/Command.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class Command diff --git a/src/Lsp/Models/CommandContainer.cs b/src/Protocol/Models/CommandContainer.cs similarity index 93% rename from src/Lsp/Models/CommandContainer.cs rename to src/Protocol/Models/CommandContainer.cs index 1e4a91c06..64641d505 100644 --- a/src/Lsp/Models/CommandContainer.cs +++ b/src/Protocol/Models/CommandContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class CommandContainer : Container { diff --git a/src/Lsp/Models/CompletionItem.cs b/src/Protocol/Models/CompletionItem.cs similarity index 98% rename from src/Lsp/Models/CompletionItem.cs rename to src/Protocol/Models/CompletionItem.cs index 2f573a012..ee9b71538 100644 --- a/src/Lsp/Models/CompletionItem.cs +++ b/src/Protocol/Models/CompletionItem.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CompletionItem diff --git a/src/Lsp/Models/CompletionItemKind.cs b/src/Protocol/Models/CompletionItemKind.cs similarity index 82% rename from src/Lsp/Models/CompletionItemKind.cs rename to src/Protocol/Models/CompletionItemKind.cs index c4973229c..97eff631b 100644 --- a/src/Lsp/Models/CompletionItemKind.cs +++ b/src/Protocol/Models/CompletionItemKind.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The kind of a completion entry. diff --git a/src/Lsp/Models/CompletionList.cs b/src/Protocol/Models/CompletionList.cs similarity index 92% rename from src/Lsp/Models/CompletionList.cs rename to src/Protocol/Models/CompletionList.cs index 483380b69..22dc1368f 100644 --- a/src/Lsp/Models/CompletionList.cs +++ b/src/Protocol/Models/CompletionList.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using System.Linq; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Represents a collection of [completion items](#CompletionItem) to be presented diff --git a/src/Lsp/Models/CompletionRegistrationOptions.cs b/src/Protocol/Models/CompletionRegistrationOptions.cs similarity index 92% rename from src/Lsp/Models/CompletionRegistrationOptions.cs rename to src/Protocol/Models/CompletionRegistrationOptions.cs index f722d8f9c..def25fcc1 100644 --- a/src/Lsp/Models/CompletionRegistrationOptions.cs +++ b/src/Protocol/Models/CompletionRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class CompletionRegistrationOptions : TextDocumentRegistrationOptions, ICompletionOptions diff --git a/src/Lsp/Models/Container.cs b/src/Protocol/Models/Container.cs similarity index 92% rename from src/Lsp/Models/Container.cs rename to src/Protocol/Models/Container.cs index 8788da653..2528d2d61 100644 --- a/src/Lsp/Models/Container.cs +++ b/src/Protocol/Models/Container.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class Container : ContainerBase { diff --git a/src/Lsp/Models/ContainerBase.cs b/src/Protocol/Models/ContainerBase.cs similarity index 91% rename from src/Lsp/Models/ContainerBase.cs rename to src/Protocol/Models/ContainerBase.cs index e5f28ce4a..e52c4a36b 100644 --- a/src/Lsp/Models/ContainerBase.cs +++ b/src/Protocol/Models/ContainerBase.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonArray(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public abstract class ContainerBase : IEnumerable diff --git a/src/Lsp/Models/Diagnostic.cs b/src/Protocol/Models/Diagnostic.cs similarity index 95% rename from src/Lsp/Models/Diagnostic.cs rename to src/Protocol/Models/Diagnostic.cs index 6c793c919..7db34a5a5 100644 --- a/src/Lsp/Models/Diagnostic.cs +++ b/src/Protocol/Models/Diagnostic.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] diff --git a/src/Lsp/Models/DiagnosticCode.cs b/src/Protocol/Models/DiagnosticCode.cs similarity index 87% rename from src/Lsp/Models/DiagnosticCode.cs rename to src/Protocol/Models/DiagnosticCode.cs index 9011c9a65..0f4d37d7d 100644 --- a/src/Lsp/Models/DiagnosticCode.cs +++ b/src/Protocol/Models/DiagnosticCode.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(DiagnosticCodeConverter))] public struct DiagnosticCode diff --git a/src/Lsp/Models/DiagnosticSeverity.cs b/src/Protocol/Models/DiagnosticSeverity.cs similarity index 80% rename from src/Lsp/Models/DiagnosticSeverity.cs rename to src/Protocol/Models/DiagnosticSeverity.cs index 0dacb11a7..eb5237069 100644 --- a/src/Lsp/Models/DiagnosticSeverity.cs +++ b/src/Protocol/Models/DiagnosticSeverity.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(NumberEnumConverter))] public enum DiagnosticSeverity diff --git a/src/Lsp/Models/DidChangeConfigurationParams.cs b/src/Protocol/Models/DidChangeConfigurationParams.cs similarity index 87% rename from src/Lsp/Models/DidChangeConfigurationParams.cs rename to src/Protocol/Models/DidChangeConfigurationParams.cs index b8815eace..6135f590b 100644 --- a/src/Lsp/Models/DidChangeConfigurationParams.cs +++ b/src/Protocol/Models/DidChangeConfigurationParams.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidChangeConfigurationParams diff --git a/src/Lsp/Models/DidChangeTextDocumentParams.cs b/src/Protocol/Models/DidChangeTextDocumentParams.cs similarity index 85% rename from src/Lsp/Models/DidChangeTextDocumentParams.cs rename to src/Protocol/Models/DidChangeTextDocumentParams.cs index 69685638e..f72faea2b 100644 --- a/src/Lsp/Models/DidChangeTextDocumentParams.cs +++ b/src/Protocol/Models/DidChangeTextDocumentParams.cs @@ -1,8 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidChangeTextDocumentParams diff --git a/src/Lsp/Models/DidChangeWatchedFilesParams.cs b/src/Protocol/Models/DidChangeWatchedFilesParams.cs similarity index 84% rename from src/Lsp/Models/DidChangeWatchedFilesParams.cs rename to src/Protocol/Models/DidChangeWatchedFilesParams.cs index c4144fad2..ca40b2083 100644 --- a/src/Lsp/Models/DidChangeWatchedFilesParams.cs +++ b/src/Protocol/Models/DidChangeWatchedFilesParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidChangeWatchedFilesParams diff --git a/src/Lsp/Models/DidCloseTextDocumentParams.cs b/src/Protocol/Models/DidCloseTextDocumentParams.cs similarity index 85% rename from src/Lsp/Models/DidCloseTextDocumentParams.cs rename to src/Protocol/Models/DidCloseTextDocumentParams.cs index ca6ade380..3a82befce 100644 --- a/src/Lsp/Models/DidCloseTextDocumentParams.cs +++ b/src/Protocol/Models/DidCloseTextDocumentParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidCloseTextDocumentParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DidOpenTextDocumentParams.cs b/src/Protocol/Models/DidOpenTextDocumentParams.cs similarity index 75% rename from src/Lsp/Models/DidOpenTextDocumentParams.cs rename to src/Protocol/Models/DidOpenTextDocumentParams.cs index 37a52909a..b8924827c 100644 --- a/src/Lsp/Models/DidOpenTextDocumentParams.cs +++ b/src/Protocol/Models/DidOpenTextDocumentParams.cs @@ -1,8 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidOpenTextDocumentParams diff --git a/src/Lsp/Models/DidSaveTextDocumentParams.cs b/src/Protocol/Models/DidSaveTextDocumentParams.cs similarity index 91% rename from src/Lsp/Models/DidSaveTextDocumentParams.cs rename to src/Protocol/Models/DidSaveTextDocumentParams.cs index c72314585..1822e536b 100644 --- a/src/Lsp/Models/DidSaveTextDocumentParams.cs +++ b/src/Protocol/Models/DidSaveTextDocumentParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DidSaveTextDocumentParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DocumentFilter.cs b/src/Protocol/Models/DocumentFilter.cs similarity index 96% rename from src/Lsp/Models/DocumentFilter.cs rename to src/Protocol/Models/DocumentFilter.cs index 17771d2b3..607277ef4 100644 --- a/src/Lsp/Models/DocumentFilter.cs +++ b/src/Protocol/Models/DocumentFilter.cs @@ -1,12 +1,10 @@ using System.Collections.Generic; -using System.Linq; -using System.Text; using Minimatch; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentFilter diff --git a/src/Lsp/Models/DocumentFormattingParams.cs b/src/Protocol/Models/DocumentFormattingParams.cs similarity index 89% rename from src/Lsp/Models/DocumentFormattingParams.cs rename to src/Protocol/Models/DocumentFormattingParams.cs index 04defc5b1..d1c62317c 100644 --- a/src/Lsp/Models/DocumentFormattingParams.cs +++ b/src/Protocol/Models/DocumentFormattingParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentFormattingParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DocumentHighlight.cs b/src/Protocol/Models/DocumentHighlight.cs similarity index 92% rename from src/Lsp/Models/DocumentHighlight.cs rename to src/Protocol/Models/DocumentHighlight.cs index d49aa85e6..4bd965044 100644 --- a/src/Lsp/Models/DocumentHighlight.cs +++ b/src/Protocol/Models/DocumentHighlight.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A document highlight is a range inside a text document which deserves diff --git a/src/Lsp/Models/DocumentHighlightContainer.cs b/src/Protocol/Models/DocumentHighlightContainer.cs similarity index 94% rename from src/Lsp/Models/DocumentHighlightContainer.cs rename to src/Protocol/Models/DocumentHighlightContainer.cs index 72fe6fc60..755572d8f 100644 --- a/src/Lsp/Models/DocumentHighlightContainer.cs +++ b/src/Protocol/Models/DocumentHighlightContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class DocumentHighlightContainer : Container { diff --git a/src/Lsp/Models/DocumentHighlightKind.cs b/src/Protocol/Models/DocumentHighlightKind.cs similarity index 81% rename from src/Lsp/Models/DocumentHighlightKind.cs rename to src/Protocol/Models/DocumentHighlightKind.cs index 9d915d925..827470dc7 100644 --- a/src/Lsp/Models/DocumentHighlightKind.cs +++ b/src/Protocol/Models/DocumentHighlightKind.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A document highlight kind. diff --git a/src/Lsp/Models/DocumentLink.cs b/src/Protocol/Models/DocumentLink.cs similarity index 92% rename from src/Lsp/Models/DocumentLink.cs rename to src/Protocol/Models/DocumentLink.cs index 58c5da5fe..1bbe38f47 100644 --- a/src/Lsp/Models/DocumentLink.cs +++ b/src/Protocol/Models/DocumentLink.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A document link is a range in a text document that links to an internal or external resource, like another diff --git a/src/Lsp/Models/DocumentLinkParams.cs b/src/Protocol/Models/DocumentLinkParams.cs similarity index 86% rename from src/Lsp/Models/DocumentLinkParams.cs rename to src/Protocol/Models/DocumentLinkParams.cs index e81f2dc16..8e73e71d9 100644 --- a/src/Lsp/Models/DocumentLinkParams.cs +++ b/src/Protocol/Models/DocumentLinkParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentLinkParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DocumentLinkRegistrationOptions.cs b/src/Protocol/Models/DocumentLinkRegistrationOptions.cs similarity index 88% rename from src/Lsp/Models/DocumentLinkRegistrationOptions.cs rename to src/Protocol/Models/DocumentLinkRegistrationOptions.cs index 2bd8c257a..3dcacd34c 100644 --- a/src/Lsp/Models/DocumentLinkRegistrationOptions.cs +++ b/src/Protocol/Models/DocumentLinkRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentLinkRegistrationOptions : TextDocumentRegistrationOptions, IDocumentLinkOptions diff --git a/src/Lsp/Models/DocumentOnTypeFormattingParams.cs b/src/Protocol/Models/DocumentOnTypeFormattingParams.cs similarity index 93% rename from src/Lsp/Models/DocumentOnTypeFormattingParams.cs rename to src/Protocol/Models/DocumentOnTypeFormattingParams.cs index e2d86e64d..48a2be11b 100644 --- a/src/Lsp/Models/DocumentOnTypeFormattingParams.cs +++ b/src/Protocol/Models/DocumentOnTypeFormattingParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentOnTypeFormattingParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DocumentOnTypeFormattingRegistrationOptions.cs b/src/Protocol/Models/DocumentOnTypeFormattingRegistrationOptions.cs similarity index 90% rename from src/Lsp/Models/DocumentOnTypeFormattingRegistrationOptions.cs rename to src/Protocol/Models/DocumentOnTypeFormattingRegistrationOptions.cs index b39f64a26..19b02b67d 100644 --- a/src/Lsp/Models/DocumentOnTypeFormattingRegistrationOptions.cs +++ b/src/Protocol/Models/DocumentOnTypeFormattingRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentOnTypeFormattingRegistrationOptions : TextDocumentRegistrationOptions, IDocumentOnTypeFormattingOptions diff --git a/src/Lsp/Models/DocumentRangeFormattingParams.cs b/src/Protocol/Models/DocumentRangeFormattingParams.cs similarity index 90% rename from src/Lsp/Models/DocumentRangeFormattingParams.cs rename to src/Protocol/Models/DocumentRangeFormattingParams.cs index c5dd2da26..fe4db87cf 100644 --- a/src/Lsp/Models/DocumentRangeFormattingParams.cs +++ b/src/Protocol/Models/DocumentRangeFormattingParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentRangeFormattingParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/DocumentSelector.cs b/src/Protocol/Models/DocumentSelector.cs similarity index 94% rename from src/Lsp/Models/DocumentSelector.cs rename to src/Protocol/Models/DocumentSelector.cs index 8a4b0e8a8..be798f280 100644 --- a/src/Lsp/Models/DocumentSelector.cs +++ b/src/Protocol/Models/DocumentSelector.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A collection of document filters used to identify valid documents diff --git a/src/Lsp/Models/DocumentSymbolParams.cs b/src/Protocol/Models/DocumentSymbolParams.cs similarity index 85% rename from src/Lsp/Models/DocumentSymbolParams.cs rename to src/Protocol/Models/DocumentSymbolParams.cs index 06a834213..12f4f1d97 100644 --- a/src/Lsp/Models/DocumentSymbolParams.cs +++ b/src/Protocol/Models/DocumentSymbolParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class DocumentSymbolParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/ExecuteCommandParams.cs b/src/Protocol/Models/ExecuteCommandParams.cs similarity index 84% rename from src/Lsp/Models/ExecuteCommandParams.cs rename to src/Protocol/Models/ExecuteCommandParams.cs index 4ccccbadc..26a5d492a 100644 --- a/src/Lsp/Models/ExecuteCommandParams.cs +++ b/src/Protocol/Models/ExecuteCommandParams.cs @@ -1,9 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ExecuteCommandParams diff --git a/src/Lsp/Models/ExecuteCommandRegistrationOptions.cs b/src/Protocol/Models/ExecuteCommandRegistrationOptions.cs similarity index 88% rename from src/Lsp/Models/ExecuteCommandRegistrationOptions.cs rename to src/Protocol/Models/ExecuteCommandRegistrationOptions.cs index a2f706c22..57917f65c 100644 --- a/src/Lsp/Models/ExecuteCommandRegistrationOptions.cs +++ b/src/Protocol/Models/ExecuteCommandRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Execute command registration options. diff --git a/src/Lsp/Models/FileChangeType.cs b/src/Protocol/Models/FileChangeType.cs similarity index 79% rename from src/Lsp/Models/FileChangeType.cs rename to src/Protocol/Models/FileChangeType.cs index 0dcd496c8..84f0f6e5a 100644 --- a/src/Lsp/Models/FileChangeType.cs +++ b/src/Protocol/Models/FileChangeType.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The file event type. diff --git a/src/Lsp/Models/FileEvent.cs b/src/Protocol/Models/FileEvent.cs similarity index 89% rename from src/Lsp/Models/FileEvent.cs rename to src/Protocol/Models/FileEvent.cs index b1eb14475..1d5236d39 100644 --- a/src/Lsp/Models/FileEvent.cs +++ b/src/Protocol/Models/FileEvent.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// An event describing a file change. diff --git a/src/Lsp/Models/FormattingOptions.cs b/src/Protocol/Models/FormattingOptions.cs similarity index 94% rename from src/Lsp/Models/FormattingOptions.cs rename to src/Protocol/Models/FormattingOptions.cs index ef9f39f87..3e51972a3 100644 --- a/src/Lsp/Models/FormattingOptions.cs +++ b/src/Protocol/Models/FormattingOptions.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Value-object describing what options formatting should use. diff --git a/src/Lsp/Models/Hover.cs b/src/Protocol/Models/Hover.cs similarity index 91% rename from src/Lsp/Models/Hover.cs rename to src/Protocol/Models/Hover.cs index 83c80a6e7..5580293ab 100644 --- a/src/Lsp/Models/Hover.cs +++ b/src/Protocol/Models/Hover.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The result of a hover request. diff --git a/src/Lsp/Models/ICodeLensOptions.cs b/src/Protocol/Models/ICodeLensOptions.cs similarity index 59% rename from src/Lsp/Models/ICodeLensOptions.cs rename to src/Protocol/Models/ICodeLensOptions.cs index ce5ab4bc6..5a6b0eed6 100644 --- a/src/Lsp/Models/ICodeLensOptions.cs +++ b/src/Protocol/Models/ICodeLensOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ICodeLensOptions { diff --git a/src/Lsp/Models/ICompletionOptions.cs b/src/Protocol/Models/ICompletionOptions.cs similarity index 70% rename from src/Lsp/Models/ICompletionOptions.cs rename to src/Protocol/Models/ICompletionOptions.cs index 90ef8c955..fe7d2a18e 100644 --- a/src/Lsp/Models/ICompletionOptions.cs +++ b/src/Protocol/Models/ICompletionOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ICompletionOptions { diff --git a/src/Lsp/Models/IDocumentLinkOptions.cs b/src/Protocol/Models/IDocumentLinkOptions.cs similarity index 60% rename from src/Lsp/Models/IDocumentLinkOptions.cs rename to src/Protocol/Models/IDocumentLinkOptions.cs index 4d658fc12..f64dca0a4 100644 --- a/src/Lsp/Models/IDocumentLinkOptions.cs +++ b/src/Protocol/Models/IDocumentLinkOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface IDocumentLinkOptions { diff --git a/src/Lsp/Models/IDocumentOnTypeFormattingOptions.cs b/src/Protocol/Models/IDocumentOnTypeFormattingOptions.cs similarity index 73% rename from src/Lsp/Models/IDocumentOnTypeFormattingOptions.cs rename to src/Protocol/Models/IDocumentOnTypeFormattingOptions.cs index 67a5612d2..d8113eb82 100644 --- a/src/Lsp/Models/IDocumentOnTypeFormattingOptions.cs +++ b/src/Protocol/Models/IDocumentOnTypeFormattingOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface IDocumentOnTypeFormattingOptions { diff --git a/src/Lsp/Models/IExecuteCommandOptions.cs b/src/Protocol/Models/IExecuteCommandOptions.cs similarity index 62% rename from src/Lsp/Models/IExecuteCommandOptions.cs rename to src/Protocol/Models/IExecuteCommandOptions.cs index a939ca881..8f091e534 100644 --- a/src/Lsp/Models/IExecuteCommandOptions.cs +++ b/src/Protocol/Models/IExecuteCommandOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface IExecuteCommandOptions { diff --git a/src/Lsp/Models/ISignatureHelpOptions.cs b/src/Protocol/Models/ISignatureHelpOptions.cs similarity index 65% rename from src/Lsp/Models/ISignatureHelpOptions.cs rename to src/Protocol/Models/ISignatureHelpOptions.cs index 645961dea..240f05c71 100644 --- a/src/Lsp/Models/ISignatureHelpOptions.cs +++ b/src/Protocol/Models/ISignatureHelpOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ISignatureHelpOptions { diff --git a/src/Lsp/Models/ISynchronizationOptions.cs b/src/Protocol/Models/ISynchronizationOptions.cs similarity index 90% rename from src/Lsp/Models/ISynchronizationOptions.cs rename to src/Protocol/Models/ISynchronizationOptions.cs index 710720c82..be73366db 100644 --- a/src/Lsp/Models/ISynchronizationOptions.cs +++ b/src/Protocol/Models/ISynchronizationOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ISynchronizationOptions { diff --git a/src/Lsp/Models/ITextDocumentIdentifierParams.cs b/src/Protocol/Models/ITextDocumentIdentifierParams.cs similarity index 64% rename from src/Lsp/Models/ITextDocumentIdentifierParams.cs rename to src/Protocol/Models/ITextDocumentIdentifierParams.cs index e3d902968..313e08bad 100644 --- a/src/Lsp/Models/ITextDocumentIdentifierParams.cs +++ b/src/Protocol/Models/ITextDocumentIdentifierParams.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ITextDocumentIdentifierParams { diff --git a/src/Lsp/Models/ITextDocumentRegistrationOptions.cs b/src/Protocol/Models/ITextDocumentRegistrationOptions.cs similarity index 65% rename from src/Lsp/Models/ITextDocumentRegistrationOptions.cs rename to src/Protocol/Models/ITextDocumentRegistrationOptions.cs index 5912a6bb3..c5758198e 100644 --- a/src/Lsp/Models/ITextDocumentRegistrationOptions.cs +++ b/src/Protocol/Models/ITextDocumentRegistrationOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public interface ITextDocumentRegistrationOptions { diff --git a/src/Lsp/Models/InitializeError.cs b/src/Protocol/Models/InitializeError.cs similarity index 87% rename from src/Lsp/Models/InitializeError.cs rename to src/Protocol/Models/InitializeError.cs index 00697f802..bbc6dfc07 100644 --- a/src/Lsp/Models/InitializeError.cs +++ b/src/Protocol/Models/InitializeError.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class InitializeError diff --git a/src/Lsp/Models/InitializeParams.cs b/src/Protocol/Models/InitializeParams.cs similarity index 93% rename from src/Lsp/Models/InitializeParams.cs rename to src/Protocol/Models/InitializeParams.cs index 32b195d3b..0a918f893 100644 --- a/src/Lsp/Models/InitializeParams.cs +++ b/src/Protocol/Models/InitializeParams.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class InitializeParams diff --git a/src/Lsp/Models/InitializeResult.cs b/src/Protocol/Models/InitializeResult.cs similarity index 72% rename from src/Lsp/Models/InitializeResult.cs rename to src/Protocol/Models/InitializeResult.cs index a9d867738..6ac278802 100644 --- a/src/Lsp/Models/InitializeResult.cs +++ b/src/Protocol/Models/InitializeResult.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class InitializeResult diff --git a/src/Lsp/Models/InitializeTrace.cs b/src/Protocol/Models/InitializeTrace.cs similarity index 76% rename from src/Lsp/Models/InitializeTrace.cs rename to src/Protocol/Models/InitializeTrace.cs index 8e8b633c7..fc533c524 100644 --- a/src/Lsp/Models/InitializeTrace.cs +++ b/src/Protocol/Models/InitializeTrace.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(StringEnumConverter))] public enum InitializeTrace diff --git a/src/Lsp/Models/InsertTextFormat.cs b/src/Protocol/Models/InsertTextFormat.cs similarity index 88% rename from src/Lsp/Models/InsertTextFormat.cs rename to src/Protocol/Models/InsertTextFormat.cs index f90966764..2a8c9cd33 100644 --- a/src/Lsp/Models/InsertTextFormat.cs +++ b/src/Protocol/Models/InsertTextFormat.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Defines whether the insert text in a completion item should be interpreted as diff --git a/src/Lsp/Models/Location.cs b/src/Protocol/Models/Location.cs similarity index 88% rename from src/Lsp/Models/Location.cs rename to src/Protocol/Models/Location.cs index 00445b016..602daeddf 100644 --- a/src/Lsp/Models/Location.cs +++ b/src/Protocol/Models/Location.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class Location diff --git a/src/Lsp/Models/LocationContainer.cs b/src/Protocol/Models/LocationContainer.cs similarity index 93% rename from src/Lsp/Models/LocationContainer.cs rename to src/Protocol/Models/LocationContainer.cs index 15f8bac85..861dcc61a 100644 --- a/src/Lsp/Models/LocationContainer.cs +++ b/src/Protocol/Models/LocationContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class LocationContainer : Container { diff --git a/src/Lsp/Models/LocationOrLocations.cs b/src/Protocol/Models/LocationOrLocations.cs similarity index 88% rename from src/Lsp/Models/LocationOrLocations.cs rename to src/Protocol/Models/LocationOrLocations.cs index da95fb467..1c7ccba39 100644 --- a/src/Lsp/Models/LocationOrLocations.cs +++ b/src/Protocol/Models/LocationOrLocations.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using System.Linq; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(LocationOrLocationsConverter))] public class LocationOrLocations : ContainerBase diff --git a/src/Lsp/Models/LogMessageParams.cs b/src/Protocol/Models/LogMessageParams.cs similarity index 87% rename from src/Lsp/Models/LogMessageParams.cs rename to src/Protocol/Models/LogMessageParams.cs index b2b652ca9..129eab279 100644 --- a/src/Lsp/Models/LogMessageParams.cs +++ b/src/Protocol/Models/LogMessageParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class LogMessageParams diff --git a/src/Lsp/Models/MarkedString.cs b/src/Protocol/Models/MarkedString.cs similarity index 91% rename from src/Lsp/Models/MarkedString.cs rename to src/Protocol/Models/MarkedString.cs index 28135ed60..2f6e8246b 100644 --- a/src/Lsp/Models/MarkedString.cs +++ b/src/Protocol/Models/MarkedString.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// MarkedString can be used to render human readable text. It is either a markdown string diff --git a/src/Lsp/Models/MarkedStringContainer.cs b/src/Protocol/Models/MarkedStringContainer.cs similarity index 91% rename from src/Lsp/Models/MarkedStringContainer.cs rename to src/Protocol/Models/MarkedStringContainer.cs index 0e25e747d..2369b5d82 100644 --- a/src/Lsp/Models/MarkedStringContainer.cs +++ b/src/Protocol/Models/MarkedStringContainer.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using System.Linq; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(MarkedStringCollectionConverter))] public class MarkedStringContainer : ContainerBase diff --git a/src/Lsp/Models/MessageActionItem.cs b/src/Protocol/Models/MessageActionItem.cs similarity index 84% rename from src/Lsp/Models/MessageActionItem.cs rename to src/Protocol/Models/MessageActionItem.cs index a199217f4..fa0abf532 100644 --- a/src/Lsp/Models/MessageActionItem.cs +++ b/src/Protocol/Models/MessageActionItem.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class MessageActionItem diff --git a/src/Lsp/Models/MessageType.cs b/src/Protocol/Models/MessageType.cs similarity index 79% rename from src/Lsp/Models/MessageType.cs rename to src/Protocol/Models/MessageType.cs index b7547c02b..bdf33e802 100644 --- a/src/Lsp/Models/MessageType.cs +++ b/src/Protocol/Models/MessageType.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonConverter(typeof(NumberEnumConverter))] public enum MessageType diff --git a/src/Lsp/Models/ObjectContainer.cs b/src/Protocol/Models/ObjectContainer.cs similarity index 93% rename from src/Lsp/Models/ObjectContainer.cs rename to src/Protocol/Models/ObjectContainer.cs index 784e8712b..53e23b1e0 100644 --- a/src/Lsp/Models/ObjectContainer.cs +++ b/src/Protocol/Models/ObjectContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class ObjectContainer : ContainerBase { diff --git a/src/Lsp/Models/ParameterInformation.cs b/src/Protocol/Models/ParameterInformation.cs similarity index 92% rename from src/Lsp/Models/ParameterInformation.cs rename to src/Protocol/Models/ParameterInformation.cs index 7490760a6..dcc9b8a50 100644 --- a/src/Lsp/Models/ParameterInformation.cs +++ b/src/Protocol/Models/ParameterInformation.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Represents a parameter of a callable-signature. A parameter can diff --git a/src/Lsp/Models/Position.cs b/src/Protocol/Models/Position.cs similarity index 91% rename from src/Lsp/Models/Position.cs rename to src/Protocol/Models/Position.cs index 85cf867ae..1832a2b59 100644 --- a/src/Lsp/Models/Position.cs +++ b/src/Protocol/Models/Position.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class Position diff --git a/src/Lsp/Models/PublishDiagnosticsParams.cs b/src/Protocol/Models/PublishDiagnosticsParams.cs similarity index 89% rename from src/Lsp/Models/PublishDiagnosticsParams.cs rename to src/Protocol/Models/PublishDiagnosticsParams.cs index d4d3010fc..09a209189 100644 --- a/src/Lsp/Models/PublishDiagnosticsParams.cs +++ b/src/Protocol/Models/PublishDiagnosticsParams.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class PublishDiagnosticsParams diff --git a/src/Lsp/Models/Range.cs b/src/Protocol/Models/Range.cs similarity index 90% rename from src/Lsp/Models/Range.cs rename to src/Protocol/Models/Range.cs index cc8bf23b3..3e2d1c82f 100644 --- a/src/Lsp/Models/Range.cs +++ b/src/Protocol/Models/Range.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class Range diff --git a/src/Lsp/Models/ReferenceContext.cs b/src/Protocol/Models/ReferenceContext.cs similarity index 84% rename from src/Lsp/Models/ReferenceContext.cs rename to src/Protocol/Models/ReferenceContext.cs index 41f489bca..0870bdb6d 100644 --- a/src/Lsp/Models/ReferenceContext.cs +++ b/src/Protocol/Models/ReferenceContext.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ReferenceContext diff --git a/src/Lsp/Models/ReferenceParams.cs b/src/Protocol/Models/ReferenceParams.cs similarity index 80% rename from src/Lsp/Models/ReferenceParams.cs rename to src/Protocol/Models/ReferenceParams.cs index d08d312bc..77f8b26c8 100644 --- a/src/Lsp/Models/ReferenceParams.cs +++ b/src/Protocol/Models/ReferenceParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ReferenceParams : TextDocumentPositionParams diff --git a/src/Lsp/Models/Registration.cs b/src/Protocol/Models/Registration.cs similarity index 93% rename from src/Lsp/Models/Registration.cs rename to src/Protocol/Models/Registration.cs index 8f34a89a3..6fa2aa2b4 100644 --- a/src/Lsp/Models/Registration.cs +++ b/src/Protocol/Models/Registration.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// General paramters to to regsiter for a capability. diff --git a/src/Lsp/Models/RegistrationContainer.cs b/src/Protocol/Models/RegistrationContainer.cs similarity index 93% rename from src/Lsp/Models/RegistrationContainer.cs rename to src/Protocol/Models/RegistrationContainer.cs index ad587733e..7abd37cc0 100644 --- a/src/Lsp/Models/RegistrationContainer.cs +++ b/src/Protocol/Models/RegistrationContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class RegistrationContainer : Container { diff --git a/src/Lsp/Models/RegistrationParams.cs b/src/Protocol/Models/RegistrationParams.cs similarity index 80% rename from src/Lsp/Models/RegistrationParams.cs rename to src/Protocol/Models/RegistrationParams.cs index ea730bd67..fc075a296 100644 --- a/src/Lsp/Models/RegistrationParams.cs +++ b/src/Protocol/Models/RegistrationParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class RegistrationParams diff --git a/src/Lsp/Models/RenameParams.cs b/src/Protocol/Models/RenameParams.cs similarity index 92% rename from src/Lsp/Models/RenameParams.cs rename to src/Protocol/Models/RenameParams.cs index 7b9940dec..0e3163afa 100644 --- a/src/Lsp/Models/RenameParams.cs +++ b/src/Protocol/Models/RenameParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class RenameParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/ShowMessageParams.cs b/src/Protocol/Models/ShowMessageParams.cs similarity index 91% rename from src/Lsp/Models/ShowMessageParams.cs rename to src/Protocol/Models/ShowMessageParams.cs index 2f4bb99e6..ddd556ce8 100644 --- a/src/Lsp/Models/ShowMessageParams.cs +++ b/src/Protocol/Models/ShowMessageParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The show message notification is sent from a server to a client to ask the client to display a particular message in the user interface. diff --git a/src/Lsp/Models/ShowMessageRequestParams.cs b/src/Protocol/Models/ShowMessageRequestParams.cs similarity index 94% rename from src/Lsp/Models/ShowMessageRequestParams.cs rename to src/Protocol/Models/ShowMessageRequestParams.cs index 3247bd842..e4f3129cd 100644 --- a/src/Lsp/Models/ShowMessageRequestParams.cs +++ b/src/Protocol/Models/ShowMessageRequestParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client. diff --git a/src/Lsp/Models/SignatureHelp.cs b/src/Protocol/Models/SignatureHelp.cs similarity index 93% rename from src/Lsp/Models/SignatureHelp.cs rename to src/Protocol/Models/SignatureHelp.cs index 22b5ae5cd..8dae532cc 100644 --- a/src/Lsp/Models/SignatureHelp.cs +++ b/src/Protocol/Models/SignatureHelp.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Signature help represents the signature of something diff --git a/src/Lsp/Models/SignatureHelpRegistrationOptions.cs b/src/Protocol/Models/SignatureHelpRegistrationOptions.cs similarity index 82% rename from src/Lsp/Models/SignatureHelpRegistrationOptions.cs rename to src/Protocol/Models/SignatureHelpRegistrationOptions.cs index c2e05561d..097e367bc 100644 --- a/src/Lsp/Models/SignatureHelpRegistrationOptions.cs +++ b/src/Protocol/Models/SignatureHelpRegistrationOptions.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class SignatureHelpRegistrationOptions : TextDocumentRegistrationOptions, ISignatureHelpOptions { diff --git a/src/Lsp/Models/SignatureInformation.cs b/src/Protocol/Models/SignatureInformation.cs similarity index 94% rename from src/Lsp/Models/SignatureInformation.cs rename to src/Protocol/Models/SignatureInformation.cs index f064dd449..0ee315102 100644 --- a/src/Lsp/Models/SignatureInformation.cs +++ b/src/Protocol/Models/SignatureInformation.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Represents the signature of something callable. A signature diff --git a/src/Lsp/Models/SymbolInformation.cs b/src/Protocol/Models/SymbolInformation.cs similarity index 93% rename from src/Lsp/Models/SymbolInformation.cs rename to src/Protocol/Models/SymbolInformation.cs index f5a6f69e0..1fac7cc26 100644 --- a/src/Lsp/Models/SymbolInformation.cs +++ b/src/Protocol/Models/SymbolInformation.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Represents information about programming constructs like variables, classes, diff --git a/src/Lsp/Models/SymbolInformationContainer.cs b/src/Protocol/Models/SymbolInformationContainer.cs similarity index 94% rename from src/Lsp/Models/SymbolInformationContainer.cs rename to src/Protocol/Models/SymbolInformationContainer.cs index 63b0caca0..6f34e1b15 100644 --- a/src/Lsp/Models/SymbolInformationContainer.cs +++ b/src/Protocol/Models/SymbolInformationContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class SymbolInformationContainer : Container { diff --git a/src/Lsp/Models/SymbolKind.cs b/src/Protocol/Models/SymbolKind.cs similarity index 81% rename from src/Lsp/Models/SymbolKind.cs rename to src/Protocol/Models/SymbolKind.cs index 4af53aae8..e40edcbe8 100644 --- a/src/Lsp/Models/SymbolKind.cs +++ b/src/Protocol/Models/SymbolKind.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// A symbol kind. diff --git a/src/Lsp/Models/TextDocument.cs b/src/Protocol/Models/TextDocument.cs similarity index 67% rename from src/Lsp/Models/TextDocument.cs rename to src/Protocol/Models/TextDocument.cs index 6c0bd8996..aff4af7ca 100644 --- a/src/Lsp/Models/TextDocument.cs +++ b/src/Protocol/Models/TextDocument.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class TextDocument { diff --git a/src/Lsp/Models/TextDocumentChangeRegistrationOptions.cs b/src/Protocol/Models/TextDocumentChangeRegistrationOptions.cs similarity index 81% rename from src/Lsp/Models/TextDocumentChangeRegistrationOptions.cs rename to src/Protocol/Models/TextDocumentChangeRegistrationOptions.cs index ad58483c2..c3ee6984f 100644 --- a/src/Lsp/Models/TextDocumentChangeRegistrationOptions.cs +++ b/src/Protocol/Models/TextDocumentChangeRegistrationOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Descibe options to be used when registered for text document change events. diff --git a/src/Lsp/Models/TextDocumentContentChangeEvent.cs b/src/Protocol/Models/TextDocumentContentChangeEvent.cs similarity index 93% rename from src/Lsp/Models/TextDocumentContentChangeEvent.cs rename to src/Protocol/Models/TextDocumentContentChangeEvent.cs index 5b39105f2..9b62a7065 100644 --- a/src/Lsp/Models/TextDocumentContentChangeEvent.cs +++ b/src/Protocol/Models/TextDocumentContentChangeEvent.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// An event describing a change to a text document. If range and rangeLength are omitted diff --git a/src/Lsp/Models/TextDocumentEdit.cs b/src/Protocol/Models/TextDocumentEdit.cs similarity index 88% rename from src/Lsp/Models/TextDocumentEdit.cs rename to src/Protocol/Models/TextDocumentEdit.cs index 563c3a37d..8b029fe7f 100644 --- a/src/Lsp/Models/TextDocumentEdit.cs +++ b/src/Protocol/Models/TextDocumentEdit.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentEdit diff --git a/src/Lsp/Models/TextDocumentIdentifier.cs b/src/Protocol/Models/TextDocumentIdentifier.cs similarity index 88% rename from src/Lsp/Models/TextDocumentIdentifier.cs rename to src/Protocol/Models/TextDocumentIdentifier.cs index de29c2300..2e3e4ceea 100644 --- a/src/Lsp/Models/TextDocumentIdentifier.cs +++ b/src/Protocol/Models/TextDocumentIdentifier.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentIdentifier diff --git a/src/Lsp/Models/TextDocumentItem.cs b/src/Protocol/Models/TextDocumentItem.cs similarity index 91% rename from src/Lsp/Models/TextDocumentItem.cs rename to src/Protocol/Models/TextDocumentItem.cs index 9670af65f..f24f896df 100644 --- a/src/Lsp/Models/TextDocumentItem.cs +++ b/src/Protocol/Models/TextDocumentItem.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentItem : TextDocumentIdentifier diff --git a/src/Lsp/Models/TextDocumentPositionParams.cs b/src/Protocol/Models/TextDocumentPositionParams.cs similarity index 89% rename from src/Lsp/Models/TextDocumentPositionParams.cs rename to src/Protocol/Models/TextDocumentPositionParams.cs index f969dfb8d..5b2a5e40c 100644 --- a/src/Lsp/Models/TextDocumentPositionParams.cs +++ b/src/Protocol/Models/TextDocumentPositionParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentPositionParams : ITextDocumentIdentifierParams diff --git a/src/Lsp/Models/TextDocumentRegistrationOptions.cs b/src/Protocol/Models/TextDocumentRegistrationOptions.cs similarity index 89% rename from src/Lsp/Models/TextDocumentRegistrationOptions.cs rename to src/Protocol/Models/TextDocumentRegistrationOptions.cs index 697e1e030..4eee6d148 100644 --- a/src/Lsp/Models/TextDocumentRegistrationOptions.cs +++ b/src/Protocol/Models/TextDocumentRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentRegistrationOptions : ITextDocumentRegistrationOptions diff --git a/src/Lsp/Models/TextDocumentSaveReason.cs b/src/Protocol/Models/TextDocumentSaveReason.cs similarity index 83% rename from src/Lsp/Models/TextDocumentSaveReason.cs rename to src/Protocol/Models/TextDocumentSaveReason.cs index e702278d0..d98d771ca 100644 --- a/src/Lsp/Models/TextDocumentSaveReason.cs +++ b/src/Protocol/Models/TextDocumentSaveReason.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// Represents reasons why a text document is saved. diff --git a/src/Lsp/Models/TextDocumentSaveRegistrationOptions.cs b/src/Protocol/Models/TextDocumentSaveRegistrationOptions.cs similarity index 88% rename from src/Lsp/Models/TextDocumentSaveRegistrationOptions.cs rename to src/Protocol/Models/TextDocumentSaveRegistrationOptions.cs index 3f9210ac7..3ebe3f951 100644 --- a/src/Lsp/Models/TextDocumentSaveRegistrationOptions.cs +++ b/src/Protocol/Models/TextDocumentSaveRegistrationOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentSaveRegistrationOptions : TextDocumentRegistrationOptions diff --git a/src/Lsp/Models/TextEdit.cs b/src/Protocol/Models/TextEdit.cs similarity index 90% rename from src/Lsp/Models/TextEdit.cs rename to src/Protocol/Models/TextEdit.cs index 4a5d9e611..97a0258d1 100644 --- a/src/Lsp/Models/TextEdit.cs +++ b/src/Protocol/Models/TextEdit.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextEdit diff --git a/src/Lsp/Models/TextEditContainer.cs b/src/Protocol/Models/TextEditContainer.cs similarity index 93% rename from src/Lsp/Models/TextEditContainer.cs rename to src/Protocol/Models/TextEditContainer.cs index 3fc071c2a..692c98543 100644 --- a/src/Lsp/Models/TextEditContainer.cs +++ b/src/Protocol/Models/TextEditContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class TextEditContainer : Container { diff --git a/src/Lsp/Models/Unregistration.cs b/src/Protocol/Models/Unregistration.cs similarity index 93% rename from src/Lsp/Models/Unregistration.cs rename to src/Protocol/Models/Unregistration.cs index 6e1b99673..a49fa5217 100644 --- a/src/Lsp/Models/Unregistration.cs +++ b/src/Protocol/Models/Unregistration.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// General parameters to unregister a request or notification. diff --git a/src/Lsp/Models/UnregistrationContainer.cs b/src/Protocol/Models/UnregistrationContainer.cs similarity index 96% rename from src/Lsp/Models/UnregistrationContainer.cs rename to src/Protocol/Models/UnregistrationContainer.cs index a80b4e582..1c3b24f03 100644 --- a/src/Lsp/Models/UnregistrationContainer.cs +++ b/src/Protocol/Models/UnregistrationContainer.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { public class UnregistrationContainer : Container { diff --git a/src/Lsp/Models/UnregistrationParams.cs b/src/Protocol/Models/UnregistrationParams.cs similarity index 80% rename from src/Lsp/Models/UnregistrationParams.cs rename to src/Protocol/Models/UnregistrationParams.cs index 797fa256e..3cc16725b 100644 --- a/src/Lsp/Models/UnregistrationParams.cs +++ b/src/Protocol/Models/UnregistrationParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class UnregistrationParams diff --git a/src/Lsp/Models/VersionedTextDocumentIdentifier.cs b/src/Protocol/Models/VersionedTextDocumentIdentifier.cs similarity index 85% rename from src/Lsp/Models/VersionedTextDocumentIdentifier.cs rename to src/Protocol/Models/VersionedTextDocumentIdentifier.cs index a1cdb99c7..c46d499e7 100644 --- a/src/Lsp/Models/VersionedTextDocumentIdentifier.cs +++ b/src/Protocol/Models/VersionedTextDocumentIdentifier.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class VersionedTextDocumentIdentifier : TextDocumentIdentifier diff --git a/src/Lsp/Models/WillSaveTextDocumentParams.cs b/src/Protocol/Models/WillSaveTextDocumentParams.cs similarity index 90% rename from src/Lsp/Models/WillSaveTextDocumentParams.cs rename to src/Protocol/Models/WillSaveTextDocumentParams.cs index ab2cbd404..964afe0b0 100644 --- a/src/Lsp/Models/WillSaveTextDocumentParams.cs +++ b/src/Protocol/Models/WillSaveTextDocumentParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The parameters send in a will save text document notification. diff --git a/src/Lsp/Models/WorkspaceEdit.cs b/src/Protocol/Models/WorkspaceEdit.cs similarity index 94% rename from src/Lsp/Models/WorkspaceEdit.cs rename to src/Protocol/Models/WorkspaceEdit.cs index c73f090d8..01ae7afb3 100644 --- a/src/Lsp/Models/WorkspaceEdit.cs +++ b/src/Protocol/Models/WorkspaceEdit.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class WorkspaceEdit diff --git a/src/Lsp/Models/WorkspaceSymbolParams.cs b/src/Protocol/Models/WorkspaceSymbolParams.cs similarity index 86% rename from src/Lsp/Models/WorkspaceSymbolParams.cs rename to src/Protocol/Models/WorkspaceSymbolParams.cs index 35ac157f2..dd3d630eb 100644 --- a/src/Lsp/Models/WorkspaceSymbolParams.cs +++ b/src/Protocol/Models/WorkspaceSymbolParams.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Models +namespace OmniSharp.Extensions.LanguageServer.Protocol.Models { /// /// The parameters of a Workspace Symbol Request. diff --git a/src/Protocol/Properties/AssemblyInfo.cs b/src/Protocol/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..e8ee27e4f --- /dev/null +++ b/src/Protocol/Properties/AssemblyInfo.cs @@ -0,0 +1,4 @@ +using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("Lsp.Tests")] +[assembly: InternalsVisibleTo("OmniSharp.Extensions.LanguageServer")] +[assembly: InternalsVisibleTo("OmniSharp.Extensions.LanguageClient")] diff --git a/src/Lsp/Lsp.csproj b/src/Protocol/Protocol.csproj similarity index 73% rename from src/Lsp/Lsp.csproj rename to src/Protocol/Protocol.csproj index 74220d371..17ea9563b 100644 --- a/src/Lsp/Lsp.csproj +++ b/src/Protocol/Protocol.csproj @@ -2,8 +2,8 @@ net46;netstandard1.6 AnyCPU - OmniSharp.Extensions.LanguageServerProtocol - OmniSharp.Extensions.LanguageServer + OmniSharp.Extensions.LanguageProtocol + OmniSharp.Extensions.LanguageServer.Protocol latest @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/Lsp/Capabilities/Server/CodeLensOptions.cs b/src/Protocol/Server/Capabilities/CodeLensOptions.cs similarity index 83% rename from src/Lsp/Capabilities/Server/CodeLensOptions.cs rename to src/Protocol/Server/Capabilities/CodeLensOptions.cs index 35a61a922..67b51cbba 100644 --- a/src/Lsp/Capabilities/Server/CodeLensOptions.cs +++ b/src/Protocol/Server/Capabilities/CodeLensOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Code Lens options. diff --git a/src/Lsp/Capabilities/Server/CompletionOptions.cs b/src/Protocol/Server/Capabilities/CompletionOptions.cs similarity index 88% rename from src/Lsp/Capabilities/Server/CompletionOptions.cs rename to src/Protocol/Server/Capabilities/CompletionOptions.cs index 1763763d6..ab82df231 100644 --- a/src/Lsp/Capabilities/Server/CompletionOptions.cs +++ b/src/Protocol/Server/Capabilities/CompletionOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Completion options. diff --git a/src/Lsp/Capabilities/Server/DocumentLinkOptions.cs b/src/Protocol/Server/Capabilities/DocumentLinkOptions.cs similarity index 83% rename from src/Lsp/Capabilities/Server/DocumentLinkOptions.cs rename to src/Protocol/Server/Capabilities/DocumentLinkOptions.cs index 34218f784..27b6d5c6b 100644 --- a/src/Lsp/Capabilities/Server/DocumentLinkOptions.cs +++ b/src/Protocol/Server/Capabilities/DocumentLinkOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Document link options diff --git a/src/Lsp/Capabilities/Server/DocumentOnTypeFormattingOptions.cs b/src/Protocol/Server/Capabilities/DocumentOnTypeFormattingOptions.cs similarity index 88% rename from src/Lsp/Capabilities/Server/DocumentOnTypeFormattingOptions.cs rename to src/Protocol/Server/Capabilities/DocumentOnTypeFormattingOptions.cs index 0412da140..cff53f20a 100644 --- a/src/Lsp/Capabilities/Server/DocumentOnTypeFormattingOptions.cs +++ b/src/Protocol/Server/Capabilities/DocumentOnTypeFormattingOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Format document on type options diff --git a/src/Lsp/Capabilities/Server/ExecuteCommandOptions.cs b/src/Protocol/Server/Capabilities/ExecuteCommandOptions.cs similarity index 84% rename from src/Lsp/Capabilities/Server/ExecuteCommandOptions.cs rename to src/Protocol/Server/Capabilities/ExecuteCommandOptions.cs index 7616fad3b..f0bd3a1dc 100644 --- a/src/Lsp/Capabilities/Server/ExecuteCommandOptions.cs +++ b/src/Protocol/Server/Capabilities/ExecuteCommandOptions.cs @@ -2,9 +2,9 @@ using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Execute command options. diff --git a/src/Lsp/Capabilities/Server/SaveOptions.cs b/src/Protocol/Server/Capabilities/SaveOptions.cs similarity index 86% rename from src/Lsp/Capabilities/Server/SaveOptions.cs rename to src/Protocol/Server/Capabilities/SaveOptions.cs index e87c426eb..5e29aa2c3 100644 --- a/src/Lsp/Capabilities/Server/SaveOptions.cs +++ b/src/Protocol/Server/Capabilities/SaveOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Save options. diff --git a/src/Lsp/Capabilities/Server/ServerCapabilities.cs b/src/Protocol/Server/Capabilities/ServerCapabilities.cs similarity index 98% rename from src/Lsp/Capabilities/Server/ServerCapabilities.cs rename to src/Protocol/Server/Capabilities/ServerCapabilities.cs index e5cdda83d..ea0f47672 100644 --- a/src/Lsp/Capabilities/Server/ServerCapabilities.cs +++ b/src/Protocol/Server/Capabilities/ServerCapabilities.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class ServerCapabilities diff --git a/src/Lsp/Capabilities/Server/SignatureHelpOptions.cs b/src/Protocol/Server/Capabilities/SignatureHelpOptions.cs similarity index 84% rename from src/Lsp/Capabilities/Server/SignatureHelpOptions.cs rename to src/Protocol/Server/Capabilities/SignatureHelpOptions.cs index 5da2e79e5..970a2261d 100644 --- a/src/Lsp/Capabilities/Server/SignatureHelpOptions.cs +++ b/src/Protocol/Server/Capabilities/SignatureHelpOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Signature help options. diff --git a/src/Lsp/Capabilities/Server/SynchronizationOptions.cs b/src/Protocol/Server/Capabilities/SynchronizationOptions.cs similarity index 90% rename from src/Lsp/Capabilities/Server/SynchronizationOptions.cs rename to src/Protocol/Server/Capabilities/SynchronizationOptions.cs index 049c07cb8..92587c9a7 100644 --- a/src/Lsp/Capabilities/Server/SynchronizationOptions.cs +++ b/src/Protocol/Server/Capabilities/SynchronizationOptions.cs @@ -1,8 +1,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Signature help options. diff --git a/src/Lsp/Capabilities/Server/TextDocumentSync.cs b/src/Protocol/Server/Capabilities/TextDocumentSync.cs similarity index 87% rename from src/Lsp/Capabilities/Server/TextDocumentSync.cs rename to src/Protocol/Server/Capabilities/TextDocumentSync.cs index b5fc48093..a5dbfbc9f 100644 --- a/src/Lsp/Capabilities/Server/TextDocumentSync.cs +++ b/src/Protocol/Server/Capabilities/TextDocumentSync.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { [JsonConverter(typeof(TextDocumentSyncConverter))] public class TextDocumentSync diff --git a/src/Lsp/Capabilities/Server/TextDocumentSyncKind.cs b/src/Protocol/Server/Capabilities/TextDocumentSyncKind.cs similarity index 84% rename from src/Lsp/Capabilities/Server/TextDocumentSyncKind.cs rename to src/Protocol/Server/Capabilities/TextDocumentSyncKind.cs index 8e8e84067..69ffcc1d4 100644 --- a/src/Lsp/Capabilities/Server/TextDocumentSyncKind.cs +++ b/src/Protocol/Server/Capabilities/TextDocumentSyncKind.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Converters; +using OmniSharp.Extensions.LanguageServer.Protocol.Converters; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { /// /// Defines how the host (editor) should sync document changes to the language server. diff --git a/src/Lsp/Capabilities/Server/TextDocumentSyncOptions.cs b/src/Protocol/Server/Capabilities/TextDocumentSyncOptions.cs similarity index 94% rename from src/Lsp/Capabilities/Server/TextDocumentSyncOptions.cs rename to src/Protocol/Server/Capabilities/TextDocumentSyncOptions.cs index 95c56b89c..654cfb89d 100644 --- a/src/Lsp/Capabilities/Server/TextDocumentSyncOptions.cs +++ b/src/Protocol/Server/Capabilities/TextDocumentSyncOptions.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace OmniSharp.Extensions.LanguageServer.Capabilities.Server +namespace OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities { [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))] public class TextDocumentSyncOptions diff --git a/src/Lsp/Protocol/Window/LogMessageExtensions.cs b/src/Protocol/Window/LogMessageExtensions.cs similarity index 56% rename from src/Lsp/Protocol/Window/LogMessageExtensions.cs rename to src/Protocol/Window/LogMessageExtensions.cs index f9dd7b251..fe5f5f3d3 100644 --- a/src/Lsp/Protocol/Window/LogMessageExtensions.cs +++ b/src/Protocol/Window/LogMessageExtensions.cs @@ -1,38 +1,43 @@ -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { + public static partial class WindowNames + { + public const string LogMessage = "window/logMessage"; + } + public static class LogMessageExtensions { - public static void LogMessage(this ILanguageServer mediator, LogMessageParams @params) + public static void LogMessage(this IResponseRouter mediator, LogMessageParams @params) { - mediator.SendNotification("window/logMessage", @params); + mediator.SendNotification(WindowNames.LogMessage, @params); } - public static void Log(this ILanguageServer mediator, LogMessageParams @params) + public static void Log(this IResponseRouter mediator, LogMessageParams @params) { mediator.LogMessage(@params); } - public static void LogError(this ILanguageServer mediator, string message) + public static void LogError(this IResponseRouter mediator, string message) { mediator.LogMessage(new LogMessageParams() { Type = MessageType.Error, Message = message }); } - public static void Log(this ILanguageServer mediator, string message) + public static void Log(this IResponseRouter mediator, string message) { mediator.LogMessage(new LogMessageParams() { Type = MessageType.Log, Message = message }); } - public static void LogWarning(this ILanguageServer mediator, string message) + public static void LogWarning(this IResponseRouter mediator, string message) { mediator.LogMessage(new LogMessageParams() { Type = MessageType.Warning, Message = message }); } - public static void LogInfo(this ILanguageServer mediator, string message) + public static void LogInfo(this IResponseRouter mediator, string message) { mediator.LogMessage(new LogMessageParams() { Type = MessageType.Info, Message = message }); } diff --git a/src/Protocol/Window/SendTelemetryExtensions.cs b/src/Protocol/Window/SendTelemetryExtensions.cs new file mode 100644 index 000000000..b5086f7dd --- /dev/null +++ b/src/Protocol/Window/SendTelemetryExtensions.cs @@ -0,0 +1,20 @@ +using OmniSharp.Extensions.JsonRpc; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static WindowNames; + public static partial class WindowNames + { + public const string TelemetryEvent = "telemetry/event"; + } + + public static class SendTelemetryExtensions + { + public static void SendTelemetry(this IResponseRouter mediator, object @params) + { + mediator.SendNotification(TelemetryEvent, @params); + } + } +} diff --git a/src/Lsp/Protocol/Window/ShowMessageExtensions.cs b/src/Protocol/Window/ShowMessageExtensions.cs similarity index 56% rename from src/Lsp/Protocol/Window/ShowMessageExtensions.cs rename to src/Protocol/Window/ShowMessageExtensions.cs index 3c7329764..5353350e5 100644 --- a/src/Lsp/Protocol/Window/ShowMessageExtensions.cs +++ b/src/Protocol/Window/ShowMessageExtensions.cs @@ -1,38 +1,43 @@ -using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; // ReSharper disable CheckNamespace namespace OmniSharp.Extensions.LanguageServer.Protocol { + public static partial class WindowNames + { + public const string ShowMessage = "window/showMessage"; + } + public static class ShowMessageExtensions { - public static void ShowMessage(this ILanguageServer mediator, ShowMessageParams @params) + public static void ShowMessage(this IResponseRouter mediator, ShowMessageParams @params) { - mediator.SendNotification("window/showMessage", @params); + mediator.SendNotification(WindowNames.ShowMessage, @params); } - public static void Show(this ILanguageServer mediator, ShowMessageParams @params) + public static void Show(this IResponseRouter mediator, ShowMessageParams @params) { mediator.ShowMessage(@params); } - public static void ShowError(this ILanguageServer mediator, string message) + public static void ShowError(this IResponseRouter mediator, string message) { mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Error, Message = message }); } - public static void Show(this ILanguageServer mediator, string message) + public static void Show(this IResponseRouter mediator, string message) { mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Log, Message = message }); } - public static void ShowWarning(this ILanguageServer mediator, string message) + public static void ShowWarning(this IResponseRouter mediator, string message) { mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Warning, Message = message }); } - public static void ShowInfo(this ILanguageServer mediator, string message) + public static void ShowInfo(this IResponseRouter mediator, string message) { mediator.ShowMessage(new ShowMessageParams() { Type = MessageType.Info, Message = message }); } diff --git a/src/Protocol/Window/ShowMessageRequestExtensions.cs b/src/Protocol/Window/ShowMessageRequestExtensions.cs new file mode 100644 index 000000000..c8ab3d2d2 --- /dev/null +++ b/src/Protocol/Window/ShowMessageRequestExtensions.cs @@ -0,0 +1,31 @@ +using System.Threading.Tasks; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class WindowNames + { + public const string ShowMessageRequest = "window/showMessageRequest"; + } + + public static class ShowMessageRequestExtensions + { + public static Task ShowMessage(this IResponseRouter mediator, ShowMessageRequestParams @params) + { + return mediator.SendRequest(WindowNames.ShowMessageRequest, @params); + } + + public static Task Show(this IResponseRouter mediator, ShowMessageRequestParams @params) + { + return mediator.ShowMessage(@params); + } + + public static Task Request(this IResponseRouter mediator, ShowMessageRequestParams @params) + { + return mediator.ShowMessage(@params); + } + } +} diff --git a/src/Protocol/WindowNames.cs b/src/Protocol/WindowNames.cs new file mode 100644 index 000000000..8d125682f --- /dev/null +++ b/src/Protocol/WindowNames.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class WindowNames {} +} \ No newline at end of file diff --git a/src/Protocol/Workspace/ApplyEditExtensions.cs b/src/Protocol/Workspace/ApplyEditExtensions.cs new file mode 100644 index 000000000..e0e0049b0 --- /dev/null +++ b/src/Protocol/Workspace/ApplyEditExtensions.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class WorkspaceNames + { + public const string ApplyEdit = "workspace/applyEdit"; + } + + public static class ApplyEditExtensions + { + public static Task ApplyEdit(this IResponseRouter mediator, ApplyWorkspaceEditParams @params) + { + return mediator.SendRequest(WorkspaceNames.ApplyEdit, @params); + } + } +} diff --git a/src/Protocol/Workspace/IDidChangeConfigurationHandler.cs b/src/Protocol/Workspace/IDidChangeConfigurationHandler.cs new file mode 100644 index 000000000..56f6d4f8f --- /dev/null +++ b/src/Protocol/Workspace/IDidChangeConfigurationHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static WorkspaceNames; + public static partial class WorkspaceNames + { + public const string DidChangeConfiguration = "workspace/didChangeConfiguration"; + } + + [Serial, Method(DidChangeConfiguration)] + public interface IDidChangeConfigurationHandler : INotificationHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs b/src/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs new file mode 100644 index 000000000..93bd2a2da --- /dev/null +++ b/src/Protocol/Workspace/IDidChangeWatchedFilesHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static WorkspaceNames; + public static partial class WorkspaceNames + { + public const string DidChangeWatchedFiles = "workspace/didChangeWatchedFiles"; + } + + [Serial, Method(DidChangeWatchedFiles)] + public interface IDidChangeWatchedFilesHandler : INotificationHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Workspace/IExecuteCommandHandler.cs b/src/Protocol/Workspace/IExecuteCommandHandler.cs new file mode 100644 index 000000000..006565b40 --- /dev/null +++ b/src/Protocol/Workspace/IExecuteCommandHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static WorkspaceNames; + public static partial class WorkspaceNames + { + public const string ExecuteCommand = "workspace/executeCommand"; + } + + [Serial, Method(ExecuteCommand)] + public interface IExecuteCommandHandler : IRequestHandler, IRegistration, ICapability { } +} diff --git a/src/Protocol/Workspace/IWorkspaceSymbolsHandler.cs b/src/Protocol/Workspace/IWorkspaceSymbolsHandler.cs new file mode 100644 index 000000000..645b30bc5 --- /dev/null +++ b/src/Protocol/Workspace/IWorkspaceSymbolsHandler.cs @@ -0,0 +1,17 @@ +using OmniSharp.Extensions.JsonRpc; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +// ReSharper disable CheckNamespace + +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + using static WorkspaceNames; + public static partial class WorkspaceNames + { + public const string Symbol = "workspace/symbol"; + } + + [Parallel, Method(Symbol)] + public interface IWorkspaceSymbolsHandler : IRequestHandler, ICapability { } +} diff --git a/src/Protocol/WorkspaceNames.cs b/src/Protocol/WorkspaceNames.cs new file mode 100644 index 000000000..16cb5f5e0 --- /dev/null +++ b/src/Protocol/WorkspaceNames.cs @@ -0,0 +1,6 @@ +namespace OmniSharp.Extensions.LanguageServer.Protocol +{ + public static partial class WorkspaceNames + { + } +} \ No newline at end of file diff --git a/src/Lsp/Abstractions/IAwaitableTermination.cs b/src/Server/Abstractions/IAwaitableTermination.cs similarity index 62% rename from src/Lsp/Abstractions/IAwaitableTermination.cs rename to src/Server/Abstractions/IAwaitableTermination.cs index 9aea0bc23..72b9984db 100644 --- a/src/Lsp/Abstractions/IAwaitableTermination.cs +++ b/src/Server/Abstractions/IAwaitableTermination.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions { public interface IAwaitableTermination { diff --git a/src/Lsp/Abstractions/IHanderMatcherCollection.cs b/src/Server/Abstractions/IHanderMatcherCollection.cs similarity index 50% rename from src/Lsp/Abstractions/IHanderMatcherCollection.cs rename to src/Server/Abstractions/IHanderMatcherCollection.cs index ddcee3556..eba5d0ba8 100644 --- a/src/Lsp/Abstractions/IHanderMatcherCollection.cs +++ b/src/Server/Abstractions/IHanderMatcherCollection.cs @@ -1,12 +1,7 @@ using System; -using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions { public interface IHandlerMatcherCollection : IEnumerable { diff --git a/src/Lsp/Abstractions/IHandlerCollection.cs b/src/Server/Abstractions/IHandlerCollection.cs similarity index 84% rename from src/Lsp/Abstractions/IHandlerCollection.cs rename to src/Server/Abstractions/IHandlerCollection.cs index 78bc3cb28..a8f05a9f2 100644 --- a/src/Lsp/Abstractions/IHandlerCollection.cs +++ b/src/Server/Abstractions/IHandlerCollection.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions { public interface IHandlerCollection : IEnumerable { diff --git a/src/Lsp/Abstractions/IHandlerMatch.cs b/src/Server/Abstractions/IHandlerMatch.cs similarity index 82% rename from src/Lsp/Abstractions/IHandlerMatch.cs rename to src/Server/Abstractions/IHandlerMatch.cs index 39905729d..ac2907dc9 100644 --- a/src/Lsp/Abstractions/IHandlerMatch.cs +++ b/src/Server/Abstractions/IHandlerMatch.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using OmniSharp.Extensions.JsonRpc.Server; -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions { public interface IHandlerMatcher { diff --git a/src/Lsp/Abstractions/ILspHandlerDescriptor.cs b/src/Server/Abstractions/ILspHandlerDescriptor.cs similarity index 78% rename from src/Lsp/Abstractions/ILspHandlerDescriptor.cs rename to src/Server/Abstractions/ILspHandlerDescriptor.cs index 1cbc31f2f..6c3c375c0 100644 --- a/src/Lsp/Abstractions/ILspHandlerDescriptor.cs +++ b/src/Server/Abstractions/ILspHandlerDescriptor.cs @@ -1,8 +1,8 @@ using System; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Abstractions +namespace OmniSharp.Extensions.LanguageServer.Server.Abstractions { public interface ILspHandlerDescriptor : IHandlerDescriptor { diff --git a/src/Lsp/ClientCapabilityProvider.cs b/src/Server/ClientCapabilityProvider.cs similarity index 95% rename from src/Lsp/ClientCapabilityProvider.cs rename to src/Server/ClientCapabilityProvider.cs index c1fe61153..7e702b702 100644 --- a/src/Lsp/ClientCapabilityProvider.cs +++ b/src/Server/ClientCapabilityProvider.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Reflection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { internal class ClientCapabilityProvider { diff --git a/src/Lsp/CompositeDisposable.cs b/src/Server/CompositeDisposable.cs similarity index 94% rename from src/Lsp/CompositeDisposable.cs rename to src/Server/CompositeDisposable.cs index d9f2076ee..d9a428886 100644 --- a/src/Lsp/CompositeDisposable.cs +++ b/src/Server/CompositeDisposable.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class CompositeDisposable : IDisposable { diff --git a/src/Lsp/Disposable.cs b/src/Server/Disposable.cs similarity index 88% rename from src/Lsp/Disposable.cs rename to src/Server/Disposable.cs index 7abb77518..4f984a42d 100644 --- a/src/Lsp/Disposable.cs +++ b/src/Server/Disposable.cs @@ -1,6 +1,6 @@ using System; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class Disposable : IDisposable { diff --git a/src/Lsp/HandlerCollection.cs b/src/Server/HandlerCollection.cs similarity index 94% rename from src/Lsp/HandlerCollection.cs rename to src/Server/HandlerCollection.cs index c968a20fb..db8a5cebc 100644 --- a/src/Lsp/HandlerCollection.cs +++ b/src/Server/HandlerCollection.cs @@ -4,10 +4,11 @@ using System.Linq; using System.Reflection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class HandlerCollection : IHandlerCollection { diff --git a/src/Lsp/HandlerDescriptor.cs b/src/Server/HandlerDescriptor.cs similarity index 93% rename from src/Lsp/HandlerDescriptor.cs rename to src/Server/HandlerDescriptor.cs index 29f4f598a..c6d9043e2 100644 --- a/src/Lsp/HandlerDescriptor.cs +++ b/src/Server/HandlerDescriptor.cs @@ -2,11 +2,12 @@ using System.Collections.Generic; using System.Reflection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class HandlerDescriptor : ILspHandlerDescriptor, IDisposable, IEquatable { diff --git a/src/Lsp/HandlerMatcherCollection.cs b/src/Server/HandlerMatcherCollection.cs similarity index 79% rename from src/Lsp/HandlerMatcherCollection.cs rename to src/Server/HandlerMatcherCollection.cs index 7ba8931f7..b584478ac 100644 --- a/src/Lsp/HandlerMatcherCollection.cs +++ b/src/Server/HandlerMatcherCollection.cs @@ -1,12 +1,9 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { public class HandlerMatcherCollection : IHandlerMatcherCollection { diff --git a/src/Lsp/HandlerTypeHelpers.cs b/src/Server/HandlerTypeHelpers.cs similarity index 93% rename from src/Lsp/HandlerTypeHelpers.cs rename to src/Server/HandlerTypeHelpers.cs index 968a892a5..a499bb005 100644 --- a/src/Lsp/HandlerTypeHelpers.cs +++ b/src/Server/HandlerTypeHelpers.cs @@ -3,7 +3,7 @@ using System.Reflection; using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { public static class HandlerTypeHelpers { diff --git a/src/Lsp/Handlers/CancelRequestHandler.cs b/src/Server/Handlers/CancelRequestHandler.cs similarity index 81% rename from src/Lsp/Handlers/CancelRequestHandler.cs rename to src/Server/Handlers/CancelRequestHandler.cs index de4fed766..7953c11fb 100644 --- a/src/Lsp/Handlers/CancelRequestHandler.cs +++ b/src/Server/Handlers/CancelRequestHandler.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer.Handlers +namespace OmniSharp.Extensions.LanguageServer.Server.Handlers { public class CancelRequestHandler : ICancelRequestHandler { diff --git a/src/Server/Handlers/ExitEventHandler.cs b/src/Server/Handlers/ExitEventHandler.cs new file mode 100644 index 000000000..c4f3f44f5 --- /dev/null +++ b/src/Server/Handlers/ExitEventHandler.cs @@ -0,0 +1,4 @@ +namespace OmniSharp.Extensions.LanguageServer.Server.Handlers +{ + public delegate void ExitEventHandler(int exitCode); +} \ No newline at end of file diff --git a/src/Lsp/Handlers/ExitHandler.cs b/src/Server/Handlers/ExitHandler.cs similarity index 89% rename from src/Lsp/Handlers/ExitHandler.cs rename to src/Server/Handlers/ExitHandler.cs index f2f255c38..e5f66b8dc 100644 --- a/src/Lsp/Handlers/ExitHandler.cs +++ b/src/Server/Handlers/ExitHandler.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using OmniSharp.Extensions.LanguageServer.Protocol; -namespace OmniSharp.Extensions.LanguageServer.Handlers +namespace OmniSharp.Extensions.LanguageServer.Server.Handlers { public class ExitHandler : IExitHandler { diff --git a/src/Lsp/Handlers/ShutdownEventHandler.cs b/src/Server/Handlers/ShutdownEventHandler.cs similarity index 54% rename from src/Lsp/Handlers/ShutdownEventHandler.cs rename to src/Server/Handlers/ShutdownEventHandler.cs index bb9f2c511..8447da9a7 100644 --- a/src/Lsp/Handlers/ShutdownEventHandler.cs +++ b/src/Server/Handlers/ShutdownEventHandler.cs @@ -1,4 +1,4 @@ -namespace OmniSharp.Extensions.LanguageServer.Handlers +namespace OmniSharp.Extensions.LanguageServer.Server.Handlers { public delegate void ShutdownEventHandler(bool shutdownRequested); } diff --git a/src/Lsp/Handlers/ShutdownHandler.cs b/src/Server/Handlers/ShutdownHandler.cs similarity index 85% rename from src/Lsp/Handlers/ShutdownHandler.cs rename to src/Server/Handlers/ShutdownHandler.cs index 5ea242e2b..ce55712a8 100644 --- a/src/Lsp/Handlers/ShutdownHandler.cs +++ b/src/Server/Handlers/ShutdownHandler.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Handlers +namespace OmniSharp.Extensions.LanguageServer.Server.Handlers { public class ShutdownHandler : IShutdownHandler, IAwaitableTermination { diff --git a/src/Lsp/ILanguageServer.cs b/src/Server/ILanguageServer.cs similarity index 81% rename from src/Lsp/ILanguageServer.cs rename to src/Server/ILanguageServer.cs index f2662e818..e8f9188b6 100644 --- a/src/Lsp/ILanguageServer.cs +++ b/src/Server/ILanguageServer.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { public interface ILanguageServer : IResponseRouter { diff --git a/src/Lsp/ImmutableDisposable.cs b/src/Server/ImmutableDisposable.cs similarity index 91% rename from src/Lsp/ImmutableDisposable.cs rename to src/Server/ImmutableDisposable.cs index 781410f8f..04ac4fef3 100644 --- a/src/Lsp/ImmutableDisposable.cs +++ b/src/Server/ImmutableDisposable.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class ImmutableDisposable : IDisposable { diff --git a/src/Server/InitializeDelegate.cs b/src/Server/InitializeDelegate.cs new file mode 100644 index 000000000..0c69f26ca --- /dev/null +++ b/src/Server/InitializeDelegate.cs @@ -0,0 +1,7 @@ +using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; + +namespace OmniSharp.Extensions.LanguageServer.Server +{ + public delegate Task InitializeDelegate(InitializeParams request); +} \ No newline at end of file diff --git a/src/Lsp/LanguageServer.cs b/src/Server/LanguageServer.cs similarity index 96% rename from src/Lsp/LanguageServer.cs rename to src/Server/LanguageServer.cs index 1b226a7a9..8320ca44a 100644 --- a/src/Lsp/LanguageServer.cs +++ b/src/Server/LanguageServer.cs @@ -5,19 +5,18 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using OmniSharp.Extensions.LanguageServer.Protocol; +using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Handlers; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; -using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Matchers; - -namespace OmniSharp.Extensions.LanguageServer +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Handlers; +using OmniSharp.Extensions.LanguageServer.Server.Matchers; + +namespace OmniSharp.Extensions.LanguageServer.Server { public class LanguageServer : ILanguageServer, IInitializeHandler, IInitializedHandler, IDisposable, IAwaitableTermination { @@ -192,7 +191,7 @@ async Task IRequestHandler { serverCapabilities.TextDocumentSync = textSyncHandlers .Where(x => x.Options.Change != TextDocumentSyncKind.None) - .Min(z => z.Options.Change); + .Min(z => z.Options.Change); } else { diff --git a/src/Lsp/LanguageServerLogger.cs b/src/Server/LanguageServerLogger.cs similarity index 94% rename from src/Lsp/LanguageServerLogger.cs rename to src/Server/LanguageServerLogger.cs index e8add0ddc..7126d8292 100644 --- a/src/Lsp/LanguageServerLogger.cs +++ b/src/Server/LanguageServerLogger.cs @@ -1,9 +1,9 @@ using System; -using OmniSharp.Extensions.LanguageServer.Models; using Microsoft.Extensions.Logging; using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class LanguageServerLogger : ILogger { diff --git a/src/Server/LanguageServerLoggerProvider.cs b/src/Server/LanguageServerLoggerProvider.cs new file mode 100644 index 000000000..b3986b95b --- /dev/null +++ b/src/Server/LanguageServerLoggerProvider.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.Logging; + +namespace OmniSharp.Extensions.LanguageServer.Server +{ + class LanguageServerLoggerProvider : ILoggerProvider + { + private readonly LanguageServer _languageServer; + + public LanguageServerLoggerProvider(LanguageServer languageServer) + { + _languageServer = languageServer; + } + + public ILogger CreateLogger(string categoryName) + { + return new LanguageServerLogger(_languageServer); + } + + public void Dispose() + { + } + } +} diff --git a/src/Lsp/LspHelper.cs b/src/Server/LspHelper.cs similarity index 95% rename from src/Lsp/LspHelper.cs rename to src/Server/LspHelper.cs index 8ab6783b7..821a146bd 100644 --- a/src/Lsp/LspHelper.cs +++ b/src/Server/LspHelper.cs @@ -4,7 +4,7 @@ using System.Reflection; using OmniSharp.Extensions.JsonRpc; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { public static class LspHelper { diff --git a/src/Lsp/LspReciever.cs b/src/Server/LspReciever.cs similarity index 92% rename from src/Lsp/LspReciever.cs rename to src/Server/LspReciever.cs index 7eb065949..8af4cfa95 100644 --- a/src/Lsp/LspReciever.cs +++ b/src/Server/LspReciever.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using OmniSharp.Extensions.LanguageServer.Protocol; using Newtonsoft.Json.Linq; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server; -using OmniSharp.Extensions.LanguageServer.Messages; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { class LspReciever : Reciever { diff --git a/src/Lsp/LspRequestRouter.cs b/src/Server/LspRequestRouter.cs similarity index 95% rename from src/Lsp/LspRequestRouter.cs rename to src/Server/LspRequestRouter.cs index 3f7ba76e1..e7ee84e90 100644 --- a/src/Lsp/LspRequestRouter.cs +++ b/src/Server/LspRequestRouter.cs @@ -10,13 +10,10 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server; using OmniSharp.Extensions.JsonRpc.Server.Messages; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Messages; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { internal class LspRequestRouter : IRequestRouter { diff --git a/src/Lsp/Matchers/ExecuteCommandMatcher.cs b/src/Server/Matchers/ExecuteCommandMatcher.cs similarity index 89% rename from src/Lsp/Matchers/ExecuteCommandMatcher.cs rename to src/Server/Matchers/ExecuteCommandMatcher.cs index d696ae516..177116ba1 100644 --- a/src/Lsp/Matchers/ExecuteCommandMatcher.cs +++ b/src/Server/Matchers/ExecuteCommandMatcher.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Matchers +namespace OmniSharp.Extensions.LanguageServer.Server.Matchers { public class ExecuteCommandMatcher : IHandlerMatcher { diff --git a/src/Lsp/Matchers/TextDocumentMatcher.cs b/src/Server/Matchers/TextDocumentMatcher.cs similarity index 94% rename from src/Lsp/Matchers/TextDocumentMatcher.cs rename to src/Server/Matchers/TextDocumentMatcher.cs index 50f4cfc45..e8db388f7 100644 --- a/src/Lsp/Matchers/TextDocumentMatcher.cs +++ b/src/Server/Matchers/TextDocumentMatcher.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; -namespace OmniSharp.Extensions.LanguageServer.Matchers +namespace OmniSharp.Extensions.LanguageServer.Server.Matchers { public class TextDocumentMatcher : IHandlerMatcher { diff --git a/src/Lsp/Messages/RequestCancelled.cs b/src/Server/Messages/RequestCancelled.cs similarity index 80% rename from src/Lsp/Messages/RequestCancelled.cs rename to src/Server/Messages/RequestCancelled.cs index 0c8a6a0e6..de0de7856 100644 --- a/src/Lsp/Messages/RequestCancelled.cs +++ b/src/Server/Messages/RequestCancelled.cs @@ -1,7 +1,7 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer.Messages +namespace OmniSharp.Extensions.LanguageServer.Server.Messages { public class RequestCancelled : RpcError { diff --git a/src/Lsp/Messages/ServerErrorEnd.cs b/src/Server/Messages/ServerErrorEnd.cs similarity index 80% rename from src/Lsp/Messages/ServerErrorEnd.cs rename to src/Server/Messages/ServerErrorEnd.cs index be29483ff..ab282d197 100644 --- a/src/Lsp/Messages/ServerErrorEnd.cs +++ b/src/Server/Messages/ServerErrorEnd.cs @@ -1,7 +1,7 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer.Messages +namespace OmniSharp.Extensions.LanguageServer.Server.Messages { public class ServerErrorEnd : RpcError { diff --git a/src/Lsp/Messages/ServerErrorStart.cs b/src/Server/Messages/ServerErrorStart.cs similarity index 81% rename from src/Lsp/Messages/ServerErrorStart.cs rename to src/Server/Messages/ServerErrorStart.cs index 7c6759db9..3c5bbf264 100644 --- a/src/Lsp/Messages/ServerErrorStart.cs +++ b/src/Server/Messages/ServerErrorStart.cs @@ -1,7 +1,7 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer.Messages +namespace OmniSharp.Extensions.LanguageServer.Server.Messages { public class ServerErrorStart : RpcError { diff --git a/src/Lsp/Messages/ServerNotInitialized.cs b/src/Server/Messages/ServerNotInitialized.cs similarity index 81% rename from src/Lsp/Messages/ServerNotInitialized.cs rename to src/Server/Messages/ServerNotInitialized.cs index 68c961c61..2253044ec 100644 --- a/src/Lsp/Messages/ServerNotInitialized.cs +++ b/src/Server/Messages/ServerNotInitialized.cs @@ -1,7 +1,7 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer.Messages +namespace OmniSharp.Extensions.LanguageServer.Server.Messages { public class ServerNotInitialized : RpcError { diff --git a/src/Lsp/Messages/UnknownErrorCode.cs b/src/Server/Messages/UnknownErrorCode.cs similarity index 80% rename from src/Lsp/Messages/UnknownErrorCode.cs rename to src/Server/Messages/UnknownErrorCode.cs index 8dcd55d31..2cfc5c396 100644 --- a/src/Lsp/Messages/UnknownErrorCode.cs +++ b/src/Server/Messages/UnknownErrorCode.cs @@ -1,7 +1,7 @@ using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.JsonRpc.Server.Messages; -namespace OmniSharp.Extensions.LanguageServer.Messages +namespace OmniSharp.Extensions.LanguageServer.Server.Messages { public class UnknownErrorCode : RpcError { diff --git a/src/Lsp/Properties/AssemblyInfo.cs b/src/Server/Properties/AssemblyInfo.cs similarity index 51% rename from src/Lsp/Properties/AssemblyInfo.cs rename to src/Server/Properties/AssemblyInfo.cs index 7dd441670..8fd6c5f61 100644 --- a/src/Lsp/Properties/AssemblyInfo.cs +++ b/src/Server/Properties/AssemblyInfo.cs @@ -1,2 +1,2 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Lsp.Tests")] diff --git a/src/Lsp/RequestProcessIdentifier.cs b/src/Server/RequestProcessIdentifier.cs similarity index 90% rename from src/Lsp/RequestProcessIdentifier.cs rename to src/Server/RequestProcessIdentifier.cs index 835b2fa1d..5f1b3eb3c 100644 --- a/src/Lsp/RequestProcessIdentifier.cs +++ b/src/Server/RequestProcessIdentifier.cs @@ -3,10 +3,8 @@ using System.Linq; using System.Reflection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.JsonRpc.Server; -using OmniSharp.Extensions.LanguageServer.Abstractions; -namespace OmniSharp.Extensions.LanguageServer +namespace OmniSharp.Extensions.LanguageServer.Server { public class RequestProcessIdentifier : IRequestProcessIdentifier { diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj new file mode 100644 index 000000000..21bdf2254 --- /dev/null +++ b/src/Server/Server.csproj @@ -0,0 +1,15 @@ + + + net46;netstandard1.6 + AnyCPU + OmniSharp.Extensions.LanguageServer + OmniSharp.Extensions.LanguageServer.Server + latest + + + + + + + + diff --git a/test/Client.Tests/Client.Tests.csproj b/test/Client.Tests/Client.Tests.csproj index 5e9d24010..d983dc16e 100644 --- a/test/Client.Tests/Client.Tests.csproj +++ b/test/Client.Tests/Client.Tests.csproj @@ -31,7 +31,7 @@ - + diff --git a/test/Client.Tests/ClientTests.cs b/test/Client.Tests/ClientTests.cs index b963b748e..dbe56a788 100644 --- a/test/Client.Tests/ClientTests.cs +++ b/test/Client.Tests/ClientTests.cs @@ -1,9 +1,4 @@ using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -11,6 +6,13 @@ using Xunit.Abstractions; using System.Collections.Generic; using System; +using OmniSharp.Extensions.LanguageServer.Client; +using OmniSharp.Extensions.LanguageServer.Client.Dispatcher; +using OmniSharp.Extensions.LanguageServer.Client.Protocol; +using OmniSharp.Extensions.LanguageServer.Client.Utilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol; namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Tests { @@ -63,7 +65,7 @@ public async Task Hover_Success() const int column = 5; var expectedHoverContent = new MarkedStringContainer("123", "456", "789"); - ServerDispatcher.HandleRequest("textDocument/hover", (request, cancellationToken) => + ServerDispatcher.HandleRequest(DocumentNames.Hover, (request, cancellationToken) => { Assert.NotNull(request.TextDocument); @@ -85,7 +87,7 @@ public async Task Hover_Success() }); }); - Hover hover = await LanguageClient.TextDocument.Hover(AbsoluteDocumentPath, line, column); + var hover = await LanguageClient.TextDocument.Hover(AbsoluteDocumentPath, line, column); Assert.NotNull(hover.Range); Assert.NotNull(hover.Range.Start); @@ -115,8 +117,8 @@ public async Task Completions_Success() const int line = 5; const int column = 5; - string expectedDocumentPath = AbsoluteDocumentPath; - Uri expectedDocumentUri = DocumentUri.FromFileSystemPath(expectedDocumentPath); + var expectedDocumentPath = AbsoluteDocumentPath; + var expectedDocumentUri = DocumentUri.FromFileSystemPath(expectedDocumentPath); var expectedCompletionItems = new CompletionItem[] { @@ -144,7 +146,7 @@ public async Task Completions_Success() } }; - ServerDispatcher.HandleRequest("textDocument/completion", (request, cancellationToken) => + ServerDispatcher.HandleRequest(DocumentNames.Completion, (request, cancellationToken) => { Assert.NotNull(request.TextDocument); @@ -159,15 +161,15 @@ public async Task Completions_Success() )); }); - CompletionList actualCompletions = await LanguageClient.TextDocument.Completions(AbsoluteDocumentPath, line, column); + var actualCompletions = await LanguageClient.TextDocument.Completions(AbsoluteDocumentPath, line, column); Assert.True(actualCompletions.IsIncomplete, "completions.IsIncomplete"); Assert.NotNull(actualCompletions.Items); - CompletionItem[] actualCompletionItems = actualCompletions.Items.ToArray(); + var actualCompletionItems = actualCompletions.Items.ToArray(); Assert.Collection(actualCompletionItems, actualCompletionItem => { - CompletionItem expectedCompletionItem = expectedCompletionItems[0]; + var expectedCompletionItem = expectedCompletionItems[0]; Assert.Equal(expectedCompletionItem.Kind, actualCompletionItem.Kind); Assert.Equal(expectedCompletionItem.Label, actualCompletionItem.Label); @@ -193,9 +195,9 @@ public async Task Diagnostics_Success() { await Connect(); - string documentPath = AbsoluteDocumentPath; - Uri expectedDocumentUri = DocumentUri.FromFileSystemPath(documentPath); - List expectedDiagnostics = new List + var documentPath = AbsoluteDocumentPath; + var expectedDocumentUri = DocumentUri.FromFileSystemPath(documentPath); + var expectedDiagnostics = new List { new Diagnostic { @@ -219,7 +221,7 @@ public async Task Diagnostics_Success() } }; - TaskCompletionSource receivedDiagnosticsNotification = new TaskCompletionSource(); + var receivedDiagnosticsNotification = new TaskCompletionSource(); Uri actualDocumentUri = null; List actualDiagnostics = null; @@ -231,14 +233,14 @@ public async Task Diagnostics_Success() receivedDiagnosticsNotification.SetResult(null); }); - ServerConnection.SendNotification("textDocument/publishDiagnostics", new PublishDiagnosticsParams + ServerConnection.SendNotification(DocumentNames.PublishDiagnostics, new PublishDiagnosticsParams { Uri = DocumentUri.FromFileSystemPath(documentPath), Diagnostics = expectedDiagnostics }); // Timeout. - Task winner = await Task.WhenAny( + var winner = await Task.WhenAny( receivedDiagnosticsNotification.Task, Task.Delay( TimeSpan.FromSeconds(2) @@ -252,8 +254,8 @@ public async Task Diagnostics_Success() Assert.NotNull(actualDiagnostics); Assert.Equal(1, actualDiagnostics.Count); - Diagnostic expectedDiagnostic = expectedDiagnostics[0]; - Diagnostic actualDiagnostic = actualDiagnostics[0]; + var expectedDiagnostic = expectedDiagnostics[0]; + var actualDiagnostic = actualDiagnostics[0]; Assert.Equal(expectedDiagnostic.Code, actualDiagnostic.Code); Assert.Equal(expectedDiagnostic.Message, actualDiagnostic.Message); diff --git a/test/Client.Tests/ConnectionTests.cs b/test/Client.Tests/ConnectionTests.cs index 4e0db9d0a..1fdaf168a 100644 --- a/test/Client.Tests/ConnectionTests.cs +++ b/test/Client.Tests/ConnectionTests.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol; using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Client.Dispatcher; +using OmniSharp.Extensions.LanguageServer.Client.Protocol; using Xunit; using Xunit.Abstractions; diff --git a/test/Client.Tests/PipeServerTestBase.cs b/test/Client.Tests/PipeServerTestBase.cs index d0fa401e2..79c4e5698 100644 --- a/test/Client.Tests/PipeServerTestBase.cs +++ b/test/Client.Tests/PipeServerTestBase.cs @@ -1,9 +1,9 @@ -using OmniSharp.Extensions.LanguageServerProtocol.Client.Dispatcher; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Protocol; -using OmniSharp.Extensions.LanguageServerProtocol.Client.Processes; using System; using System.IO; using System.Threading.Tasks; +using OmniSharp.Extensions.LanguageServer.Client; +using OmniSharp.Extensions.LanguageServer.Client.Processes; +using OmniSharp.Extensions.LanguageServer.Client.Protocol; using Xunit.Abstractions; namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Tests @@ -75,7 +75,7 @@ protected async Task CreateClient(bool initialize = true) await _serverProcess.HasStarted; - LanguageClient client = new LanguageClient(LoggerFactory, _serverProcess); + var client = new LanguageClient(LoggerFactory, _serverProcess); Disposal.Add(client); if (initialize) @@ -97,7 +97,7 @@ protected async Task CreateClientConnection() await _serverProcess.HasStarted; - LspConnection connection = new LspConnection(LoggerFactory, input: ServerOutputStream, output: ServerInputStream); + var connection = new LspConnection(LoggerFactory, input: ServerOutputStream, output: ServerInputStream); Disposal.Add(connection); return connection; @@ -116,7 +116,7 @@ protected async Task CreateServerConnection() await _serverProcess.HasStarted; - LspConnection connection = new LspConnection(LoggerFactory, input: ClientOutputStream, output: ClientInputStream); + var connection = new LspConnection(LoggerFactory, input: ClientOutputStream, output: ClientInputStream); Disposal.Add(connection); return connection; diff --git a/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs b/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs index adb52c7c1..934fba7d9 100644 --- a/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests.cs @@ -3,7 +3,7 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests.cs b/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests.cs index b93c1015c..f47af94c6 100644 --- a/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests.cs b/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests.cs index 0e0df87ad..f31e58014 100644 --- a/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/DynamicCapabilityTests.cs b/test/Lsp.Tests/Capabilities/Client/DynamicCapabilityTests.cs index 27365caf6..e4e08ea29 100644 --- a/test/Lsp.Tests/Capabilities/Client/DynamicCapabilityTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/DynamicCapabilityTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/SynchronizationCapabilityTests.cs b/test/Lsp.Tests/Capabilities/Client/SynchronizationCapabilityTests.cs index b9b9c38dc..5f0de71c6 100644 --- a/test/Lsp.Tests/Capabilities/Client/SynchronizationCapabilityTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/SynchronizationCapabilityTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests.cs b/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests.cs index 5c329dbb7..bf852ba98 100644 --- a/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests.cs b/test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests.cs index 3a883fcb6..1599aea64 100644 --- a/test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests.cs +++ b/test/Lsp.Tests/Capabilities/Client/WorkspaceClientCapabilitesTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Client diff --git a/test/Lsp.Tests/Capabilities/Server/CodeLensOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/CodeLensOptionsTests.cs index d108ce667..8306fddbb 100644 --- a/test/Lsp.Tests/Capabilities/Server/CodeLensOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/CodeLensOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/CompletionOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/CompletionOptionsTests.cs index 97117c01a..a361630c2 100644 --- a/test/Lsp.Tests/Capabilities/Server/CompletionOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/CompletionOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/DocumentLinkOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/DocumentLinkOptionsTests.cs index 7189084ee..f26cf2e65 100644 --- a/test/Lsp.Tests/Capabilities/Server/DocumentLinkOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/DocumentLinkOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/DocumentOnTypeFormattingOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/DocumentOnTypeFormattingOptionsTests.cs index dfa456220..9b8372793 100644 --- a/test/Lsp.Tests/Capabilities/Server/DocumentOnTypeFormattingOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/DocumentOnTypeFormattingOptionsTests.cs @@ -2,7 +2,7 @@ using System.Linq; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/ExecuteCommandOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/ExecuteCommandOptionsTests.cs index 3f0468aa1..dd573a5f8 100644 --- a/test/Lsp.Tests/Capabilities/Server/ExecuteCommandOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/ExecuteCommandOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/SaveOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/SaveOptionsTests.cs index 1c5a3c0ce..3f059187f 100644 --- a/test/Lsp.Tests/Capabilities/Server/SaveOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/SaveOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests.cs b/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests.cs index 4619f0567..acf647426 100644 --- a/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests.cs @@ -3,7 +3,7 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/SignatureHelpOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/SignatureHelpOptionsTests.cs index cc13d7ed8..0eb5d5116 100644 --- a/test/Lsp.Tests/Capabilities/Server/SignatureHelpOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/SignatureHelpOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncKindTests.cs b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncKindTests.cs index 41acf6487..12d3ceb58 100644 --- a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncKindTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncKindTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncOptionsTests.cs b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncOptionsTests.cs index a12808d60..5714ff886 100644 --- a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncOptionsTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncTests.cs b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncTests.cs index 9dab65a20..3103340f8 100644 --- a/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncTests.cs +++ b/test/Lsp.Tests/Capabilities/Server/TextDocumentSyncTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Capabilities.Server diff --git a/test/Lsp.Tests/ClientCapabilityProviderTests.cs b/test/Lsp.Tests/ClientCapabilityProviderTests.cs index 9d0802fe2..d07fa23b2 100644 --- a/test/Lsp.Tests/ClientCapabilityProviderTests.cs +++ b/test/Lsp.Tests/ClientCapabilityProviderTests.cs @@ -6,13 +6,14 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; +using OmniSharp.Extensions.LanguageServer.Server; using Xunit; -using static OmniSharp.Extensions.LanguageServer.ClientCapabilityProvider; -using HandlerCollection = OmniSharp.Extensions.LanguageServer.HandlerCollection; +using static OmniSharp.Extensions.LanguageServer.Server.ClientCapabilityProvider; +using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; namespace Lsp.Tests { diff --git a/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs b/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs index 325060f82..42945db7f 100644 --- a/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs +++ b/test/Lsp.Tests/ExecuteCommandSyncHandlerExtensions.cs @@ -5,10 +5,8 @@ using System.Threading; using System.Threading.Tasks; using NSubstitute; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; namespace Lsp.Tests { diff --git a/test/Lsp.Tests/HandlerResolverTests.cs b/test/Lsp.Tests/HandlerResolverTests.cs index 7dcdad45b..f94f9909e 100644 --- a/test/Lsp.Tests/HandlerResolverTests.cs +++ b/test/Lsp.Tests/HandlerResolverTests.cs @@ -8,12 +8,9 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; -using HandlerCollection = OmniSharp.Extensions.LanguageServer.HandlerCollection; -using OmniSharp.Extensions.LanguageServer.Models; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Handlers; +using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; namespace Lsp.Tests { @@ -52,10 +49,10 @@ public void Should_Contain_AllConcreteDefinedMethods() } [Theory] - [InlineData("textDocument/didOpen", 4)] - [InlineData("textDocument/didChange", 4)] - [InlineData("textDocument/didClose", 4)] - [InlineData("textDocument/didSave", 4)] + [InlineData(DocumentNames.DidOpen, 4)] + [InlineData(DocumentNames.DidChange, 4)] + [InlineData(DocumentNames.DidClose, 4)] + [InlineData(DocumentNames.DidSave, 4)] public void Should_Contain_AllDefinedTextDocumentSyncMethods(string key, int count) { var handler = new HandlerCollection(); @@ -67,10 +64,10 @@ public void Should_Contain_AllDefinedTextDocumentSyncMethods(string key, int cou } [Theory] - [InlineData("exit", 4)] - [InlineData("shutdown", 4)] - [InlineData("initialized", 4)] - [InlineData("initialize", 4)] + [InlineData(GeneralNames.Exit, 4)] + [InlineData(GeneralNames.Shutdown, 4)] + [InlineData(GeneralNames.Initialized, 4)] + [InlineData(GeneralNames.Initialize, 4)] public void Should_Contain_AllDefinedLanguageServerMethods(string key, int count) { var handler = new HandlerCollection(); @@ -85,10 +82,10 @@ public void Should_Contain_AllDefinedLanguageServerMethods(string key, int count } [Theory] - [InlineData("exit", 4)] - [InlineData("shutdown", 4)] - [InlineData("initialized", 4)] - [InlineData("initialize", 4)] + [InlineData(GeneralNames.Exit, 4)] + [InlineData(GeneralNames.Shutdown, 4)] + [InlineData(GeneralNames.Initialized, 4)] + [InlineData(GeneralNames.Initialize, 4)] public void Should_Contain_AllDefinedLanguageServerMethods_GivenDuplicates(string key, int count) { var handler = new HandlerCollection(); @@ -111,10 +108,10 @@ public void Should_Contain_AllDefinedLanguageServerMethods_GivenDuplicates(strin } [Theory] - [InlineData("textDocument/didOpen", 8)] - [InlineData("textDocument/didChange", 8)] - [InlineData("textDocument/didClose", 8)] - [InlineData("textDocument/didSave", 8)] + [InlineData(DocumentNames.DidOpen, 8)] + [InlineData(DocumentNames.DidChange, 8)] + [InlineData(DocumentNames.DidClose, 8)] + [InlineData(DocumentNames.DidSave, 8)] public void Should_Contain_AllDefinedMethods_ForDifferentKeys(string key, int count) { var handler = new HandlerCollection(); diff --git a/test/Lsp.Tests/Lsp.Tests.csproj b/test/Lsp.Tests/Lsp.Tests.csproj index a5d1d4c19..506806725 100644 --- a/test/Lsp.Tests/Lsp.Tests.csproj +++ b/test/Lsp.Tests/Lsp.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Lsp.Tests/LspRequestRouterTests.cs b/test/Lsp.Tests/LspRequestRouterTests.cs index 4d8d5dc11..73850faee 100644 --- a/test/Lsp.Tests/LspRequestRouterTests.cs +++ b/test/Lsp.Tests/LspRequestRouterTests.cs @@ -10,16 +10,14 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc.Server; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Matchers; -using OmniSharp.Extensions.LanguageServer.Messages; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -using HandlerCollection = OmniSharp.Extensions.LanguageServer.HandlerCollection; +using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; namespace Lsp.Tests { @@ -52,7 +50,7 @@ public async Task ShouldRouteToCorrect_Notification() TextDocument = new TextDocumentIdentifier(new Uri("file:///c:/test/123.cs")) }; - var request = new Notification("textDocument/didSave", JObject.Parse(JsonConvert.SerializeObject(@params))); + var request = new Notification(DocumentNames.DidSave, JObject.Parse(JsonConvert.SerializeObject(@params))); await mediator.RouteNotification(mediator.GetDescriptor(request), request); @@ -74,7 +72,7 @@ public async Task ShouldRouteToCorrect_Notification_WithManyHandlers() TextDocument = new TextDocumentIdentifier(new Uri("file:///c:/test/123.cake")) }; - var request = new Notification("textDocument/didSave", JObject.Parse(JsonConvert.SerializeObject(@params))); + var request = new Notification(DocumentNames.DidSave, JObject.Parse(JsonConvert.SerializeObject(@params))); await mediator.RouteNotification(mediator.GetDescriptor(request), request); @@ -102,7 +100,7 @@ public async Task ShouldRouteToCorrect_Request() TextDocument = new TextDocumentIdentifier(new Uri("file:///c:/test/123.cs")) }; - var request = new Request(id, "textDocument/codeAction", JObject.Parse(JsonConvert.SerializeObject(@params))); + var request = new Request(id, DocumentNames.CodeAction, JObject.Parse(JsonConvert.SerializeObject(@params))); await mediator.RouteRequest(mediator.GetDescriptor(request), request); @@ -137,7 +135,7 @@ public async Task ShouldRouteToCorrect_Request_WithManyHandlers() TextDocument = new TextDocumentIdentifier(new Uri("file:///c:/test/123.cake")) }; - var request = new Request(id, "textDocument/codeAction", JObject.Parse(JsonConvert.SerializeObject(@params))); + var request = new Request(id, DocumentNames.CodeAction, JObject.Parse(JsonConvert.SerializeObject(@params))); await mediator.RouteRequest(mediator.GetDescriptor(request), request); diff --git a/test/Lsp.Tests/Matchers/ExecuteCommandHandlerMatcherTests.cs b/test/Lsp.Tests/Matchers/ExecuteCommandHandlerMatcherTests.cs index 7ef08f091..bbde3470b 100644 --- a/test/Lsp.Tests/Matchers/ExecuteCommandHandlerMatcherTests.cs +++ b/test/Lsp.Tests/Matchers/ExecuteCommandHandlerMatcherTests.cs @@ -4,11 +4,12 @@ using Microsoft.Extensions.Logging; using NSubstitute; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Matchers; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Matchers; using Xunit; namespace Lsp.Tests.Matchers diff --git a/test/Lsp.Tests/Matchers/TextDocumentMatcherTests.cs b/test/Lsp.Tests/Matchers/TextDocumentMatcherTests.cs index ad0a136be..93003c41b 100644 --- a/test/Lsp.Tests/Matchers/TextDocumentMatcherTests.cs +++ b/test/Lsp.Tests/Matchers/TextDocumentMatcherTests.cs @@ -5,10 +5,12 @@ using Microsoft.Extensions.Logging; using NSubstitute; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Matchers; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Matchers; using Xunit; namespace Lsp.Tests.Matchers @@ -66,7 +68,7 @@ public void Should_Return_Did_Open_Text_Document_Handler_Descriptor() } }, new List() { - new HandlerDescriptor("textDocument/didOpen", + new HandlerDescriptor(DocumentNames.DidOpen, "Key", textDocumentSyncHandler, textDocumentSyncHandler.GetType(), @@ -78,7 +80,7 @@ public void Should_Return_Did_Open_Text_Document_Handler_Descriptor() // Then result.Should().NotBeNullOrEmpty(); - result.Should().Contain(x => x.Method == "textDocument/didOpen"); + result.Should().Contain(x => x.Method == DocumentNames.DidOpen); } [Fact] @@ -94,7 +96,7 @@ public void Should_Return_Did_Change_Text_Document_Descriptor() TextDocument = new VersionedTextDocumentIdentifier { Uri = new Uri("file:///abc/123/d.cs"), Version = 1 } }, new List() { - new HandlerDescriptor("textDocument/didChange", + new HandlerDescriptor(DocumentNames.DidChange, "Key", textDocumentSyncHandler, textDocumentSyncHandler.GetType(), @@ -106,7 +108,7 @@ public void Should_Return_Did_Change_Text_Document_Descriptor() // Then result.Should().NotBeNullOrEmpty(); - result.Should().Contain(x => x.Method == "textDocument/didChange"); + result.Should().Contain(x => x.Method == DocumentNames.DidChange); } [Fact] @@ -122,7 +124,7 @@ public void Should_Return_Did_Save_Text_Document_Descriptor() TextDocument = new VersionedTextDocumentIdentifier { Uri = new Uri("file:///abc/123/d.cs"), Version = 1 } }, new List() { - new HandlerDescriptor("textDocument/didSave", + new HandlerDescriptor(DocumentNames.DidSave, "Key", textDocumentSyncHandler, textDocumentSyncHandler.GetType(), @@ -134,7 +136,7 @@ public void Should_Return_Did_Save_Text_Document_Descriptor() // Then result.Should().NotBeNullOrEmpty(); - result.Should().Contain(x => x.Method == "textDocument/didSave"); + result.Should().Contain(x => x.Method == DocumentNames.DidSave); } [Fact] @@ -150,7 +152,7 @@ public void Should_Return_Did_Close_Text_Document_Descriptor() TextDocument = new VersionedTextDocumentIdentifier { Uri = new Uri("file:///abc/123/d.cs"), Version = 1 } }, new List() { - new HandlerDescriptor("textDocument/didClose", + new HandlerDescriptor(DocumentNames.DidClose, "Key", textDocumentSyncHandler, textDocumentSyncHandler.GetType(), @@ -162,7 +164,7 @@ public void Should_Return_Did_Close_Text_Document_Descriptor() // Then result.Should().NotBeNullOrEmpty(); - result.Should().Contain(x => x.Method == "textDocument/didClose"); + result.Should().Contain(x => x.Method == DocumentNames.DidClose); } } } diff --git a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs index a5e9365d3..cf3bbe0ad 100644 --- a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs +++ b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequest.cs @@ -10,14 +10,15 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc.Server; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Messages; -using OmniSharp.Extensions.LanguageServer.Models; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -using HandlerCollection = OmniSharp.Extensions.LanguageServer.HandlerCollection; +using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Messages; namespace Lsp.Tests { diff --git a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs index 9a40d41cb..4589029d1 100644 --- a/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs +++ b/test/Lsp.Tests/MediatorTestsRequestHandlerOfTRequestTResponse.cs @@ -12,14 +12,15 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc.Server; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Messages; -using OmniSharp.Extensions.LanguageServer.Models; using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -using HandlerCollection = OmniSharp.Extensions.LanguageServer.HandlerCollection; +using HandlerCollection = OmniSharp.Extensions.LanguageServer.Server.HandlerCollection; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Abstractions; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Server; +using OmniSharp.Extensions.LanguageServer.Server.Abstractions; +using OmniSharp.Extensions.LanguageServer.Server.Messages; namespace Lsp.Tests { diff --git a/test/Lsp.Tests/Messages/ServerErrorEndTests.cs b/test/Lsp.Tests/Messages/ServerErrorEndTests.cs index 75faba8a2..a3f72a1f7 100644 --- a/test/Lsp.Tests/Messages/ServerErrorEndTests.cs +++ b/test/Lsp.Tests/Messages/ServerErrorEndTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Messages; +using OmniSharp.Extensions.LanguageServer.Server.Messages; using Xunit; namespace Lsp.Tests.Messages diff --git a/test/Lsp.Tests/Messages/ServerErrorStartTests.cs b/test/Lsp.Tests/Messages/ServerErrorStartTests.cs index dbd584437..5e5555432 100644 --- a/test/Lsp.Tests/Messages/ServerErrorStartTests.cs +++ b/test/Lsp.Tests/Messages/ServerErrorStartTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Messages; +using OmniSharp.Extensions.LanguageServer.Server.Messages; using Xunit; namespace Lsp.Tests.Messages diff --git a/test/Lsp.Tests/Messages/ServerNotInitializedTests.cs b/test/Lsp.Tests/Messages/ServerNotInitializedTests.cs index df8ad9559..55e7a56f4 100644 --- a/test/Lsp.Tests/Messages/ServerNotInitializedTests.cs +++ b/test/Lsp.Tests/Messages/ServerNotInitializedTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Messages; +using OmniSharp.Extensions.LanguageServer.Server.Messages; using Xunit; namespace Lsp.Tests.Messages diff --git a/test/Lsp.Tests/Messages/UnknownErrorCodeTests.cs b/test/Lsp.Tests/Messages/UnknownErrorCodeTests.cs index 8441cd53e..eb997f10c 100644 --- a/test/Lsp.Tests/Messages/UnknownErrorCodeTests.cs +++ b/test/Lsp.Tests/Messages/UnknownErrorCodeTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using OmniSharp.Extensions.JsonRpc; -using OmniSharp.Extensions.LanguageServer.Messages; +using OmniSharp.Extensions.LanguageServer.Server.Messages; using Xunit; namespace Lsp.Tests.Messages diff --git a/test/Lsp.Tests/Models/ApplyWorkspaceEditParamsTests.cs b/test/Lsp.Tests/Models/ApplyWorkspaceEditParamsTests.cs index ec705e069..a9bb9da68 100644 --- a/test/Lsp.Tests/Models/ApplyWorkspaceEditParamsTests.cs +++ b/test/Lsp.Tests/Models/ApplyWorkspaceEditParamsTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ApplyWorkspaceEditResponseTests.cs b/test/Lsp.Tests/Models/ApplyWorkspaceEditResponseTests.cs index 994792323..707f74d9d 100644 --- a/test/Lsp.Tests/Models/ApplyWorkspaceEditResponseTests.cs +++ b/test/Lsp.Tests/Models/ApplyWorkspaceEditResponseTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/BooleanNumberStringTests.cs b/test/Lsp.Tests/Models/BooleanNumberStringTests.cs index 1c8621eb4..7ad4d2035 100644 --- a/test/Lsp.Tests/Models/BooleanNumberStringTests.cs +++ b/test/Lsp.Tests/Models/BooleanNumberStringTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CancelParamsTests.cs b/test/Lsp.Tests/Models/CancelParamsTests.cs index 74a02fc09..48371ae6c 100644 --- a/test/Lsp.Tests/Models/CancelParamsTests.cs +++ b/test/Lsp.Tests/Models/CancelParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CodeActionContextTests.cs b/test/Lsp.Tests/Models/CodeActionContextTests.cs index 3662a25af..0d43cee76 100644 --- a/test/Lsp.Tests/Models/CodeActionContextTests.cs +++ b/test/Lsp.Tests/Models/CodeActionContextTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CodeActionParamsTests.cs b/test/Lsp.Tests/Models/CodeActionParamsTests.cs index 1f43e665a..cc4f8cbcb 100644 --- a/test/Lsp.Tests/Models/CodeActionParamsTests.cs +++ b/test/Lsp.Tests/Models/CodeActionParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CodeLensParamsTests.cs b/test/Lsp.Tests/Models/CodeLensParamsTests.cs index b0faf8cba..ece25e840 100644 --- a/test/Lsp.Tests/Models/CodeLensParamsTests.cs +++ b/test/Lsp.Tests/Models/CodeLensParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CodeLensRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/CodeLensRegistrationOptionsTests.cs index 07167d381..00efb0aa0 100644 --- a/test/Lsp.Tests/Models/CodeLensRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/CodeLensRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CodeLensTests.cs b/test/Lsp.Tests/Models/CodeLensTests.cs index 7d4178324..019ba6caa 100644 --- a/test/Lsp.Tests/Models/CodeLensTests.cs +++ b/test/Lsp.Tests/Models/CodeLensTests.cs @@ -3,7 +3,7 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CommandTests.cs b/test/Lsp.Tests/Models/CommandTests.cs index 3d2cb21a7..6ba4eb791 100644 --- a/test/Lsp.Tests/Models/CommandTests.cs +++ b/test/Lsp.Tests/Models/CommandTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CompletionItemKindTests.cs b/test/Lsp.Tests/Models/CompletionItemKindTests.cs index a7cf23e69..a1ce39785 100644 --- a/test/Lsp.Tests/Models/CompletionItemKindTests.cs +++ b/test/Lsp.Tests/Models/CompletionItemKindTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CompletionItemTests.cs b/test/Lsp.Tests/Models/CompletionItemTests.cs index 1ed97defe..41bc201d8 100644 --- a/test/Lsp.Tests/Models/CompletionItemTests.cs +++ b/test/Lsp.Tests/Models/CompletionItemTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CompletionListTests.cs b/test/Lsp.Tests/Models/CompletionListTests.cs index 10f0c1f41..0b1fbc2ca 100644 --- a/test/Lsp.Tests/Models/CompletionListTests.cs +++ b/test/Lsp.Tests/Models/CompletionListTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/CompletionRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/CompletionRegistrationOptionsTests.cs index 1df232ad5..1a1175c74 100644 --- a/test/Lsp.Tests/Models/CompletionRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/CompletionRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DiagnosticCodeTests.cs b/test/Lsp.Tests/Models/DiagnosticCodeTests.cs index b04ae17cd..6c7e03462 100644 --- a/test/Lsp.Tests/Models/DiagnosticCodeTests.cs +++ b/test/Lsp.Tests/Models/DiagnosticCodeTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DiagnosticSeverityTests.cs b/test/Lsp.Tests/Models/DiagnosticSeverityTests.cs index 86b9b999d..479bf5a85 100644 --- a/test/Lsp.Tests/Models/DiagnosticSeverityTests.cs +++ b/test/Lsp.Tests/Models/DiagnosticSeverityTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DiagnosticTests.cs b/test/Lsp.Tests/Models/DiagnosticTests.cs index ff4966ae0..c767efebf 100644 --- a/test/Lsp.Tests/Models/DiagnosticTests.cs +++ b/test/Lsp.Tests/Models/DiagnosticTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidChangeConfigurationParamsTests.cs b/test/Lsp.Tests/Models/DidChangeConfigurationParamsTests.cs index 5203ea2e7..99a0cc053 100644 --- a/test/Lsp.Tests/Models/DidChangeConfigurationParamsTests.cs +++ b/test/Lsp.Tests/Models/DidChangeConfigurationParamsTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests.cs b/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests.cs index f9bb28795..354144229 100644 --- a/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests.cs +++ b/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidChangeWatchedFilesParamsTests.cs b/test/Lsp.Tests/Models/DidChangeWatchedFilesParamsTests.cs index 098661a86..fd68ebfda 100644 --- a/test/Lsp.Tests/Models/DidChangeWatchedFilesParamsTests.cs +++ b/test/Lsp.Tests/Models/DidChangeWatchedFilesParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidCloseTextDocumentParamsTests.cs b/test/Lsp.Tests/Models/DidCloseTextDocumentParamsTests.cs index cceafbc05..0210d9d21 100644 --- a/test/Lsp.Tests/Models/DidCloseTextDocumentParamsTests.cs +++ b/test/Lsp.Tests/Models/DidCloseTextDocumentParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidOpenTextDocumentParamsTests.cs b/test/Lsp.Tests/Models/DidOpenTextDocumentParamsTests.cs index b2850db69..ab30e519e 100644 --- a/test/Lsp.Tests/Models/DidOpenTextDocumentParamsTests.cs +++ b/test/Lsp.Tests/Models/DidOpenTextDocumentParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DidSaveTextDocumentParamsTests.cs b/test/Lsp.Tests/Models/DidSaveTextDocumentParamsTests.cs index 9eae10626..3302d4ab9 100644 --- a/test/Lsp.Tests/Models/DidSaveTextDocumentParamsTests.cs +++ b/test/Lsp.Tests/Models/DidSaveTextDocumentParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentFilterTests.cs b/test/Lsp.Tests/Models/DocumentFilterTests.cs index 9b4ddd83a..9bce3ff63 100644 --- a/test/Lsp.Tests/Models/DocumentFilterTests.cs +++ b/test/Lsp.Tests/Models/DocumentFilterTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentFormattingParamsTests.cs b/test/Lsp.Tests/Models/DocumentFormattingParamsTests.cs index 7f4e574ae..6cbc1d747 100644 --- a/test/Lsp.Tests/Models/DocumentFormattingParamsTests.cs +++ b/test/Lsp.Tests/Models/DocumentFormattingParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentHighlightKindTests.cs b/test/Lsp.Tests/Models/DocumentHighlightKindTests.cs index 933ebe4b6..20292a854 100644 --- a/test/Lsp.Tests/Models/DocumentHighlightKindTests.cs +++ b/test/Lsp.Tests/Models/DocumentHighlightKindTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentHighlightTests.cs b/test/Lsp.Tests/Models/DocumentHighlightTests.cs index 52c5ff4c4..3b8ad8bee 100644 --- a/test/Lsp.Tests/Models/DocumentHighlightTests.cs +++ b/test/Lsp.Tests/Models/DocumentHighlightTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentLinkParamsTests.cs b/test/Lsp.Tests/Models/DocumentLinkParamsTests.cs index e2f8dddee..f1302d6d9 100644 --- a/test/Lsp.Tests/Models/DocumentLinkParamsTests.cs +++ b/test/Lsp.Tests/Models/DocumentLinkParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentLinkRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/DocumentLinkRegistrationOptionsTests.cs index 2c5d64edb..c14224eae 100644 --- a/test/Lsp.Tests/Models/DocumentLinkRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/DocumentLinkRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentLinkTests.cs b/test/Lsp.Tests/Models/DocumentLinkTests.cs index 18adfd5cf..9890d6996 100644 --- a/test/Lsp.Tests/Models/DocumentLinkTests.cs +++ b/test/Lsp.Tests/Models/DocumentLinkTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentOnTypeFormattingParamsTests.cs b/test/Lsp.Tests/Models/DocumentOnTypeFormattingParamsTests.cs index d0efeeed4..fcb11841e 100644 --- a/test/Lsp.Tests/Models/DocumentOnTypeFormattingParamsTests.cs +++ b/test/Lsp.Tests/Models/DocumentOnTypeFormattingParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentOnTypeFormattingRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/DocumentOnTypeFormattingRegistrationOptionsTests.cs index 3072cc9f9..2d6138fbe 100644 --- a/test/Lsp.Tests/Models/DocumentOnTypeFormattingRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/DocumentOnTypeFormattingRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentSelectorTests.cs b/test/Lsp.Tests/Models/DocumentSelectorTests.cs index 0a5d4729a..817fd211d 100644 --- a/test/Lsp.Tests/Models/DocumentSelectorTests.cs +++ b/test/Lsp.Tests/Models/DocumentSelectorTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/DocumentSymbolParamsTests.cs b/test/Lsp.Tests/Models/DocumentSymbolParamsTests.cs index 36b363660..de10eb72f 100644 --- a/test/Lsp.Tests/Models/DocumentSymbolParamsTests.cs +++ b/test/Lsp.Tests/Models/DocumentSymbolParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ExecuteCommandParamsTests.cs b/test/Lsp.Tests/Models/ExecuteCommandParamsTests.cs index 93be4826c..cf8182b2f 100644 --- a/test/Lsp.Tests/Models/ExecuteCommandParamsTests.cs +++ b/test/Lsp.Tests/Models/ExecuteCommandParamsTests.cs @@ -2,7 +2,7 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ExecuteCommandRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/ExecuteCommandRegistrationOptionsTests.cs index 94c36eb44..78f144bad 100644 --- a/test/Lsp.Tests/Models/ExecuteCommandRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/ExecuteCommandRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/FileChangeTypeTests.cs b/test/Lsp.Tests/Models/FileChangeTypeTests.cs index 675a2256b..655e8c055 100644 --- a/test/Lsp.Tests/Models/FileChangeTypeTests.cs +++ b/test/Lsp.Tests/Models/FileChangeTypeTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/FileEventTests.cs b/test/Lsp.Tests/Models/FileEventTests.cs index 0e9e6e924..186cce68b 100644 --- a/test/Lsp.Tests/Models/FileEventTests.cs +++ b/test/Lsp.Tests/Models/FileEventTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/FormattingOptionsTests.cs b/test/Lsp.Tests/Models/FormattingOptionsTests.cs index 834a971a5..15e734e31 100644 --- a/test/Lsp.Tests/Models/FormattingOptionsTests.cs +++ b/test/Lsp.Tests/Models/FormattingOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/HoverTests.cs b/test/Lsp.Tests/Models/HoverTests.cs index c9fa895a7..ba9c93184 100644 --- a/test/Lsp.Tests/Models/HoverTests.cs +++ b/test/Lsp.Tests/Models/HoverTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/InitializeErrorTests.cs b/test/Lsp.Tests/Models/InitializeErrorTests.cs index 9bbd25fa6..b8d62e05e 100644 --- a/test/Lsp.Tests/Models/InitializeErrorTests.cs +++ b/test/Lsp.Tests/Models/InitializeErrorTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/InitializeParamsTests.cs b/test/Lsp.Tests/Models/InitializeParamsTests.cs index 4f973c37c..bcc50813b 100644 --- a/test/Lsp.Tests/Models/InitializeParamsTests.cs +++ b/test/Lsp.Tests/Models/InitializeParamsTests.cs @@ -3,8 +3,8 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Capabilities.Client; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/InitializeResultTests.cs b/test/Lsp.Tests/Models/InitializeResultTests.cs index 4ea83edb5..5f1c56c42 100644 --- a/test/Lsp.Tests/Models/InitializeResultTests.cs +++ b/test/Lsp.Tests/Models/InitializeResultTests.cs @@ -3,8 +3,8 @@ using FluentAssertions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/InsertTextFormatTests.cs b/test/Lsp.Tests/Models/InsertTextFormatTests.cs index 27d325dea..7365c992b 100644 --- a/test/Lsp.Tests/Models/InsertTextFormatTests.cs +++ b/test/Lsp.Tests/Models/InsertTextFormatTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/LocationOrLocationsTests.cs b/test/Lsp.Tests/Models/LocationOrLocationsTests.cs index 3897cb48f..5fed84379 100644 --- a/test/Lsp.Tests/Models/LocationOrLocationsTests.cs +++ b/test/Lsp.Tests/Models/LocationOrLocationsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/LocationTests.cs b/test/Lsp.Tests/Models/LocationTests.cs index 925629f37..c2ae986a4 100644 --- a/test/Lsp.Tests/Models/LocationTests.cs +++ b/test/Lsp.Tests/Models/LocationTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/LogMessageParamsTests.cs b/test/Lsp.Tests/Models/LogMessageParamsTests.cs index 6caaf7108..6044ce8b9 100644 --- a/test/Lsp.Tests/Models/LogMessageParamsTests.cs +++ b/test/Lsp.Tests/Models/LogMessageParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/MarkedStringTests.cs b/test/Lsp.Tests/Models/MarkedStringTests.cs index 8af65c68b..27f8fedf7 100644 --- a/test/Lsp.Tests/Models/MarkedStringTests.cs +++ b/test/Lsp.Tests/Models/MarkedStringTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/MessageActionItemTests.cs b/test/Lsp.Tests/Models/MessageActionItemTests.cs index 5947a8709..36f34b129 100644 --- a/test/Lsp.Tests/Models/MessageActionItemTests.cs +++ b/test/Lsp.Tests/Models/MessageActionItemTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/MessageTypeTests.cs b/test/Lsp.Tests/Models/MessageTypeTests.cs index c5290a2cd..900964433 100644 --- a/test/Lsp.Tests/Models/MessageTypeTests.cs +++ b/test/Lsp.Tests/Models/MessageTypeTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ParameterInformationTests.cs b/test/Lsp.Tests/Models/ParameterInformationTests.cs index 75f8be39b..7fb856cdd 100644 --- a/test/Lsp.Tests/Models/ParameterInformationTests.cs +++ b/test/Lsp.Tests/Models/ParameterInformationTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/PositionTests.cs b/test/Lsp.Tests/Models/PositionTests.cs index 4e1f0f1d2..1ac771350 100644 --- a/test/Lsp.Tests/Models/PositionTests.cs +++ b/test/Lsp.Tests/Models/PositionTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests.cs b/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests.cs index 0193dde2e..e86c9e38d 100644 --- a/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests.cs +++ b/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/RangeTests.cs b/test/Lsp.Tests/Models/RangeTests.cs index 7f53e5070..d94dab7cc 100644 --- a/test/Lsp.Tests/Models/RangeTests.cs +++ b/test/Lsp.Tests/Models/RangeTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ReferenceContextTests.cs b/test/Lsp.Tests/Models/ReferenceContextTests.cs index 182306bcc..9a287c608 100644 --- a/test/Lsp.Tests/Models/ReferenceContextTests.cs +++ b/test/Lsp.Tests/Models/ReferenceContextTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ReferenceParamsTests.cs b/test/Lsp.Tests/Models/ReferenceParamsTests.cs index 445283364..6562da966 100644 --- a/test/Lsp.Tests/Models/ReferenceParamsTests.cs +++ b/test/Lsp.Tests/Models/ReferenceParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/RegistrationParamsTests.cs b/test/Lsp.Tests/Models/RegistrationParamsTests.cs index 215e4ff1e..86c1df282 100644 --- a/test/Lsp.Tests/Models/RegistrationParamsTests.cs +++ b/test/Lsp.Tests/Models/RegistrationParamsTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/RegistrationTests.cs b/test/Lsp.Tests/Models/RegistrationTests.cs index cd65ca5a8..39aa128b2 100644 --- a/test/Lsp.Tests/Models/RegistrationTests.cs +++ b/test/Lsp.Tests/Models/RegistrationTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/RenameParamsTests.cs b/test/Lsp.Tests/Models/RenameParamsTests.cs index 6446b9264..6a00a4168 100644 --- a/test/Lsp.Tests/Models/RenameParamsTests.cs +++ b/test/Lsp.Tests/Models/RenameParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ShowMessageParamsTests.cs b/test/Lsp.Tests/Models/ShowMessageParamsTests.cs index c94658b45..3fd53809f 100644 --- a/test/Lsp.Tests/Models/ShowMessageParamsTests.cs +++ b/test/Lsp.Tests/Models/ShowMessageParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/ShowMessageRequestParamsTests.cs b/test/Lsp.Tests/Models/ShowMessageRequestParamsTests.cs index d9eca64c1..01c868e2c 100644 --- a/test/Lsp.Tests/Models/ShowMessageRequestParamsTests.cs +++ b/test/Lsp.Tests/Models/ShowMessageRequestParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/SignatureHelpRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/SignatureHelpRegistrationOptionsTests.cs index ce147eb9e..9cef48763 100644 --- a/test/Lsp.Tests/Models/SignatureHelpRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/SignatureHelpRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/SignatureHelpTests.cs b/test/Lsp.Tests/Models/SignatureHelpTests.cs index 5b98b8bd5..ce47d2c37 100644 --- a/test/Lsp.Tests/Models/SignatureHelpTests.cs +++ b/test/Lsp.Tests/Models/SignatureHelpTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/SignatureInformationTests.cs b/test/Lsp.Tests/Models/SignatureInformationTests.cs index 0346d35e4..924c1cbd9 100644 --- a/test/Lsp.Tests/Models/SignatureInformationTests.cs +++ b/test/Lsp.Tests/Models/SignatureInformationTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/SymbolInformationTests.cs b/test/Lsp.Tests/Models/SymbolInformationTests.cs index 4be8976c0..49a27967c 100644 --- a/test/Lsp.Tests/Models/SymbolInformationTests.cs +++ b/test/Lsp.Tests/Models/SymbolInformationTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/SymbolKindTests.cs b/test/Lsp.Tests/Models/SymbolKindTests.cs index 993ecc0ed..ddc58a2a6 100644 --- a/test/Lsp.Tests/Models/SymbolKindTests.cs +++ b/test/Lsp.Tests/Models/SymbolKindTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentChangeRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/TextDocumentChangeRegistrationOptionsTests.cs index bdd13eb53..dc08ffdb5 100644 --- a/test/Lsp.Tests/Models/TextDocumentChangeRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentChangeRegistrationOptionsTests.cs @@ -1,8 +1,8 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Capabilities.Server; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentContentChangeEventTests.cs b/test/Lsp.Tests/Models/TextDocumentContentChangeEventTests.cs index 1ffdf4ae3..a44f20ab5 100644 --- a/test/Lsp.Tests/Models/TextDocumentContentChangeEventTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentContentChangeEventTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentEditTests.cs b/test/Lsp.Tests/Models/TextDocumentEditTests.cs index d2929a42e..99a16b82c 100644 --- a/test/Lsp.Tests/Models/TextDocumentEditTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentEditTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentIdentifierTests.cs b/test/Lsp.Tests/Models/TextDocumentIdentifierTests.cs index 0c2ccb7d8..8c8502747 100644 --- a/test/Lsp.Tests/Models/TextDocumentIdentifierTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentIdentifierTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentItemTests.cs b/test/Lsp.Tests/Models/TextDocumentItemTests.cs index 3016044ec..b3cd18ece 100644 --- a/test/Lsp.Tests/Models/TextDocumentItemTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentItemTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentPositionParamsTests.cs b/test/Lsp.Tests/Models/TextDocumentPositionParamsTests.cs index c86db8462..302b16282 100644 --- a/test/Lsp.Tests/Models/TextDocumentPositionParamsTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentPositionParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/TextDocumentRegistrationOptionsTests.cs index b396edb5c..2183eaa1d 100644 --- a/test/Lsp.Tests/Models/TextDocumentRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentSaveReasonTests.cs b/test/Lsp.Tests/Models/TextDocumentSaveReasonTests.cs index 04676d461..d9759d676 100644 --- a/test/Lsp.Tests/Models/TextDocumentSaveReasonTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentSaveReasonTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextDocumentSaveRegistrationOptionsTests.cs b/test/Lsp.Tests/Models/TextDocumentSaveRegistrationOptionsTests.cs index cb9d76a23..5eaa96f15 100644 --- a/test/Lsp.Tests/Models/TextDocumentSaveRegistrationOptionsTests.cs +++ b/test/Lsp.Tests/Models/TextDocumentSaveRegistrationOptionsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/TextEditTests.cs b/test/Lsp.Tests/Models/TextEditTests.cs index 2abf85125..b7e9dbc0a 100644 --- a/test/Lsp.Tests/Models/TextEditTests.cs +++ b/test/Lsp.Tests/Models/TextEditTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/UnregistrationParamsTests.cs b/test/Lsp.Tests/Models/UnregistrationParamsTests.cs index a40938af9..0462a798f 100644 --- a/test/Lsp.Tests/Models/UnregistrationParamsTests.cs +++ b/test/Lsp.Tests/Models/UnregistrationParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/UnregistrationTests.cs b/test/Lsp.Tests/Models/UnregistrationTests.cs index 60dfab184..4896b25aa 100644 --- a/test/Lsp.Tests/Models/UnregistrationTests.cs +++ b/test/Lsp.Tests/Models/UnregistrationTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/VersionedTextDocumentIdentifierTests.cs b/test/Lsp.Tests/Models/VersionedTextDocumentIdentifierTests.cs index 8754d2007..b2406ae37 100644 --- a/test/Lsp.Tests/Models/VersionedTextDocumentIdentifierTests.cs +++ b/test/Lsp.Tests/Models/VersionedTextDocumentIdentifierTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/WillSaveTextDocumentParamsTests.cs b/test/Lsp.Tests/Models/WillSaveTextDocumentParamsTests.cs index 432f69935..ae203f2bd 100644 --- a/test/Lsp.Tests/Models/WillSaveTextDocumentParamsTests.cs +++ b/test/Lsp.Tests/Models/WillSaveTextDocumentParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/WorkspaceEditTests.cs b/test/Lsp.Tests/Models/WorkspaceEditTests.cs index 5183e7dc5..4874b3d20 100644 --- a/test/Lsp.Tests/Models/WorkspaceEditTests.cs +++ b/test/Lsp.Tests/Models/WorkspaceEditTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/Models/WorkspaceSymbolParamsTests.cs b/test/Lsp.Tests/Models/WorkspaceSymbolParamsTests.cs index 6073a162a..d2b1a7a47 100644 --- a/test/Lsp.Tests/Models/WorkspaceSymbolParamsTests.cs +++ b/test/Lsp.Tests/Models/WorkspaceSymbolParamsTests.cs @@ -1,7 +1,7 @@ using System; using FluentAssertions; using Newtonsoft.Json; -using OmniSharp.Extensions.LanguageServer.Models; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; using Xunit; namespace Lsp.Tests.Models diff --git a/test/Lsp.Tests/RequestProcessIdentifierTests.cs b/test/Lsp.Tests/RequestProcessIdentifierTests.cs index 25135fb2c..3de6e10c9 100644 --- a/test/Lsp.Tests/RequestProcessIdentifierTests.cs +++ b/test/Lsp.Tests/RequestProcessIdentifierTests.cs @@ -3,9 +3,8 @@ using NSubstitute; using OmniSharp.Extensions.JsonRpc; using OmniSharp.Extensions.LanguageServer; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Server; using Xunit; using Xunit.Abstractions; diff --git a/test/Lsp.Tests/TestLoggerFactory.cs b/test/Lsp.Tests/TestLoggerFactory.cs index 5aefbfb57..120032567 100644 --- a/test/Lsp.Tests/TestLoggerFactory.cs +++ b/test/Lsp.Tests/TestLoggerFactory.cs @@ -1,6 +1,5 @@ using System; using Microsoft.Extensions.Logging; -using OmniSharp.Extensions.LanguageServer.Abstractions; using Serilog; using Serilog.Extensions.Logging; using Xunit.Abstractions; diff --git a/test/Lsp.Tests/TextDocumentSyncHandlerExtensions.cs b/test/Lsp.Tests/TextDocumentSyncHandlerExtensions.cs index a8cf698f6..eb91d79a1 100644 --- a/test/Lsp.Tests/TextDocumentSyncHandlerExtensions.cs +++ b/test/Lsp.Tests/TextDocumentSyncHandlerExtensions.cs @@ -1,9 +1,7 @@ using System; using NSubstitute; -using OmniSharp.Extensions.LanguageServer.Abstractions; -using OmniSharp.Extensions.LanguageServer.Models; using OmniSharp.Extensions.LanguageServer.Protocol; -using OmniSharp.Extensions.LanguageServer.Protocol.Document; +using OmniSharp.Extensions.LanguageServer.Protocol.Models; namespace Lsp.Tests { @@ -41,4 +39,4 @@ private static TextDocumentRegistrationOptions GetOptions(IRegistration ha return new R { DocumentSelector = documentSelector }; } } -} \ No newline at end of file +}