Skip to content

Commit 7995302

Browse files
david-driscolldavid-driscoll
committed
big namespace rename 1/x
1 parent 6c5c64d commit 7995302

File tree

404 files changed

+705
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+705
-791
lines changed

‎LSP.sln

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26730.16
3+
VisualStudioVersion = 15.0.27004.2009
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D764E024-3D3F-4112-B932-2DB722A1BACC}"
66
EndProject
@@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{AE4D
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonRpc", "src\JsonRpc\JsonRpc.csproj", "{9AF43FA2-EF35-435E-B59E-724877E44DDA}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lsp", "src\Lsp\Lsp.csproj", "{50EA648A-67D3-4127-9517-EC7C1426E2E7}"
25-
EndProject
2624
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonRpc.Tests", "test\JsonRpc.Tests\JsonRpc.Tests.csproj", "{35F9B883-36D0-4F3B-A191-9BBD05B798A7}"
2725
EndProject
2826
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
3533
EndProject
3634
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client.Tests", "test\Client.Tests\Client.Tests.csproj", "{97437BE1-2EC3-4F6B-AC75-C3E099040A07}"
3735
EndProject
36+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Protocol", "src\Protocol\Protocol.csproj", "{92B331E9-5225-428D-AE82-37F5F46156A3}"
37+
EndProject
38+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "src\Server\Server.csproj", "{E540868F-438E-4F7F-BBB7-010D6CB18A57}"
39+
EndProject
3840
Global
3941
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4042
Debug|Any CPU = Debug|Any CPU
@@ -57,18 +59,6 @@ Global
5759
{9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x64.Build.0 = Release|Any CPU
5860
{9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x86.ActiveCfg = Release|Any CPU
5961
{9AF43FA2-EF35-435E-B59E-724877E44DDA}.Release|x86.Build.0 = Release|Any CPU
60-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
62-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x64.ActiveCfg = Debug|Any CPU
63-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x64.Build.0 = Debug|Any CPU
64-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x86.ActiveCfg = Debug|Any CPU
65-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Debug|x86.Build.0 = Debug|Any CPU
66-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
67-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|Any CPU.Build.0 = Release|Any CPU
68-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x64.ActiveCfg = Release|Any CPU
69-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x64.Build.0 = Release|Any CPU
70-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x86.ActiveCfg = Release|Any CPU
71-
{50EA648A-67D3-4127-9517-EC7C1426E2E7}.Release|x86.Build.0 = Release|Any CPU
7262
{35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7363
{35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
7464
{35F9B883-36D0-4F3B-A191-9BBD05B798A7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -129,18 +119,43 @@ Global
129119
{97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x64.Build.0 = Release|Any CPU
130120
{97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x86.ActiveCfg = Release|Any CPU
131121
{97437BE1-2EC3-4F6B-AC75-C3E099040A07}.Release|x86.Build.0 = Release|Any CPU
122+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
124+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x64.ActiveCfg = Debug|Any CPU
125+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x64.Build.0 = Debug|Any CPU
126+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x86.ActiveCfg = Debug|Any CPU
127+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Debug|x86.Build.0 = Debug|Any CPU
128+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|Any CPU.Build.0 = Release|Any CPU
130+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x64.ActiveCfg = Release|Any CPU
131+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x64.Build.0 = Release|Any CPU
132+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x86.ActiveCfg = Release|Any CPU
133+
{92B331E9-5225-428D-AE82-37F5F46156A3}.Release|x86.Build.0 = Release|Any CPU
134+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
136+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x64.ActiveCfg = Debug|Any CPU
137+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x64.Build.0 = Debug|Any CPU
138+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x86.ActiveCfg = Debug|Any CPU
139+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Debug|x86.Build.0 = Debug|Any CPU
140+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
141+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|Any CPU.Build.0 = Release|Any CPU
142+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x64.ActiveCfg = Release|Any CPU
143+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x64.Build.0 = Release|Any CPU
144+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x86.ActiveCfg = Release|Any CPU
145+
{E540868F-438E-4F7F-BBB7-010D6CB18A57}.Release|x86.Build.0 = Release|Any CPU
132146
EndGlobalSection
133147
GlobalSection(SolutionProperties) = preSolution
134148
HideSolutionNode = FALSE
135149
EndGlobalSection
136150
GlobalSection(NestedProjects) = preSolution
137151
{9AF43FA2-EF35-435E-B59E-724877E44DDA} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
138-
{50EA648A-67D3-4127-9517-EC7C1426E2E7} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
139152
{35F9B883-36D0-4F3B-A191-9BBD05B798A7} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
140153
{482B180B-FD5C-4705-BBE1-094C905F1E1F} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
141154
{F2067F5F-FA4E-4990-B301-E7898FC4C45F} = {A316FCEC-81AD-45FB-93EE-C62CA09300DC}
142155
{417E95B2-5AB9-49D5-B7CD-12255472E2E7} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
143156
{97437BE1-2EC3-4F6B-AC75-C3E099040A07} = {2F323ED5-EBF8-45E1-B9D3-C014561B3DDA}
157+
{92B331E9-5225-428D-AE82-37F5F46156A3} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
158+
{E540868F-438E-4F7F-BBB7-010D6CB18A57} = {D764E024-3D3F-4112-B932-2DB722A1BACC}
144159
EndGlobalSection
145160
GlobalSection(ExtensibilityGlobals) = postSolution
146161
SolutionGuid = {D38DD0EC-D095-4BCD-B8AF-2D788AF3B9AE}

‎sample/SampleServer/SampleServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="../../src/Lsp/Lsp.csproj" />
10+
<ProjectReference Include="../../src/Server/Server.csproj" />
1111
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
1212
</ItemGroup>
1313

‎sample/SampleServer/TextDocumentHandler.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Threading.Tasks;
33
using OmniSharp.Extensions.LanguageServer;
4-
using OmniSharp.Extensions.LanguageServer.Abstractions;
5-
using OmniSharp.Extensions.LanguageServer.Capabilities.Client;
6-
using OmniSharp.Extensions.LanguageServer.Capabilities.Server;
7-
using OmniSharp.Extensions.LanguageServer.Models;
84
using OmniSharp.Extensions.LanguageServer.Protocol;
5+
using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
96
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
7+
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
8+
using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
9+
using OmniSharp.Extensions.LanguageServer.Server;
1010

1111
namespace SampleServer
1212
{
@@ -105,4 +105,4 @@ public TextDocumentAttributes GetTextDocumentAttributes(Uri uri)
105105
return new TextDocumentAttributes(uri, "csharp");
106106
}
107107
}
108-
}
108+
}

‎src/Client/Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<PlatformTarget>AnyCPU</PlatformTarget>
6-
<AssemblyName>OmniSharp.Extensions.Lsp.Client</AssemblyName>
7-
<RootNamespace>OmniSharp.Extensions.Lsp.Client</RootNamespace>
6+
<AssemblyName>OmniSharp.Extensions.LanguageClient</AssemblyName>
7+
<RootNamespace>OmniSharp.Extensions.LanguageServer.Client</RootNamespace>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎src/Client/Clients/TextDocumentClient.Completions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
2-
using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
31
using System;
42
using System.Threading;
53
using System.Threading.Tasks;
4+
using OmniSharp.Extensions.LanguageServer.Client.Utilities;
5+
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
66

7-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
7+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
88
{
99
/// <summary>
1010
/// Client for the LSP Text Document API.
@@ -31,7 +31,7 @@ public partial class TextDocumentClient
3131
/// </returns>
3232
public Task<CompletionList> Completions(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken))
3333
{
34-
if (String.IsNullOrWhiteSpace(filePath))
34+
if (string.IsNullOrWhiteSpace(filePath))
3535
throw new ArgumentException($"Argument cannot be null, empty, or entirely composed of whitespace: {nameof(filePath)}.", nameof(filePath));
3636

3737
Uri documentUri = DocumentUri.FromFileSystemPath(filePath);

‎src/Client/Clients/TextDocumentClient.Diagnostics.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
4-
using System.IO;
5-
using System.Threading;
6-
using System.Threading.Tasks;
73

8-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
4+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
95
{
106
/// <summary>
117
/// Client for the LSP Text Document API.

‎src/Client/Clients/TextDocumentClient.Hover.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
21
using System;
3-
using System.IO;
42
using System.Threading;
53
using System.Threading.Tasks;
6-
using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
4+
using OmniSharp.Extensions.LanguageServer.Client.Utilities;
5+
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
76

8-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
7+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
98
{
109
/// <summary>
1110
/// Client for the LSP Text Document API.
@@ -32,7 +31,7 @@ public partial class TextDocumentClient
3231
/// </returns>
3332
public Task<Hover> Hover(string filePath, int line, int column, CancellationToken cancellationToken = default(CancellationToken))
3433
{
35-
if (String.IsNullOrWhiteSpace(filePath))
34+
if (string.IsNullOrWhiteSpace(filePath))
3635
throw new ArgumentException("Argument cannot be null, empty, or entirely composed of whitespace: 'filePath'.", nameof(filePath));
3736

3837
Uri documentUri = DocumentUri.FromFileSystemPath(filePath);

‎src/Client/Clients/TextDocumentClient.Sync.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
2-
using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
3-
using System;
1+
using System;
42
using System.IO;
5-
using System.Threading;
6-
using System.Threading.Tasks;
3+
using OmniSharp.Extensions.LanguageServer.Client.Utilities;
74

8-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
5+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
96
{
107
/// <summary>
118
/// Client for the LSP Text Document API.

‎src/Client/Clients/TextDocumentClient.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
2-
using OmniSharp.Extensions.LanguageServerProtocol.Client.Utilities;
3-
using System;
4-
using System.IO;
1+
using System;
52
using System.Threading;
63
using System.Threading.Tasks;
74

8-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
5+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
96
{
107
/// <summary>
118
/// Client for the LSP Text Document API.

‎src/Client/Clients/WindowClient.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using OmniSharp.Extensions.LanguageServer.Models;
2-
using System;
1+
using System;
32

4-
namespace OmniSharp.Extensions.LanguageServerProtocol.Client.Clients
3+
namespace OmniSharp.Extensions.LanguageServer.Client.Clients
54
{
65
/// <summary>
76
/// Client for the LSP Window API.

0 commit comments

Comments
 (0)