Skip to content

Commit fee7927

Browse files
manandremanandre
committed
Fix plural form for all FileOperations
1 parent eb06422 commit fee7927

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

‎src/Protocol/Features/FileOperationsFeature.cs‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Models
2020
///
2121
/// @since 3.16.0
2222
/// </summary>
23-
public abstract record FileOperationParams<T>
23+
public abstract record FileOperationsParams<T>
2424
where T : FileOperationItem
2525
{
2626
/// <summary>
@@ -40,33 +40,33 @@ public abstract record FileOperationItem
4040
public Uri Uri { get; init; } = null!;
4141
}
4242

43-
/// <inheritdoc cref="FileOperationParams{T}" />
43+
/// <inheritdoc cref="FileOperationsParams{T}" />
4444
[Parallel]
4545
[Method(WorkspaceNames.DidCreateFiles, Direction.ClientToServer)]
4646
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
4747
[GenerateHandlerMethods]
4848
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
49-
[RegistrationOptions(typeof(DidCreateFileRegistrationOptions))]
49+
[RegistrationOptions(typeof(DidCreateFilesRegistrationOptions))]
5050
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
51-
public partial record DidCreateFileParams : FileOperationParams<FileCreate>, IRequest
51+
public partial record DidCreateFilesParams : FileOperationsParams<FileCreate>, IRequest
5252
{
53-
public static implicit operator WillCreateFileParams(DidCreateFileParams @params)
53+
public static implicit operator WillCreateFilesParams(DidCreateFilesParams @params)
5454
{
5555
return new() { Files = @params.Files };
5656
}
5757
}
5858

59-
/// <inheritdoc cref="FileOperationParams{T}" />
59+
/// <inheritdoc cref="FileOperationsParams{T}" />
6060
[Parallel]
6161
[Method(WorkspaceNames.WillCreateFiles, Direction.ClientToServer)]
6262
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
6363
[GenerateHandlerMethods]
6464
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
65-
[RegistrationOptions(typeof(WillCreateFileRegistrationOptions))]
65+
[RegistrationOptions(typeof(WillCreateFilesRegistrationOptions))]
6666
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
67-
public partial record WillCreateFileParams : FileOperationParams<FileCreate>, IRequest<WorkspaceEdit?>
67+
public partial record WillCreateFilesParams : FileOperationsParams<FileCreate>, IRequest<WorkspaceEdit?>
6868
{
69-
public static implicit operator DidCreateFileParams(WillCreateFileParams @params)
69+
public static implicit operator DidCreateFilesParams(WillCreateFilesParams @params)
7070
{
7171
return new() { Files = @params.Files };
7272
}
@@ -75,33 +75,33 @@ public static implicit operator DidCreateFileParams(WillCreateFileParams @params
7575
/// <inheritdoc cref="FileOperationItem" />
7676
public partial record FileCreate : FileOperationItem;
7777

78-
/// <inheritdoc cref="FileOperationParams{T}" />
78+
/// <inheritdoc cref="FileOperationsParams{T}" />
7979
[Parallel]
8080
[Method(WorkspaceNames.DidRenameFiles, Direction.ClientToServer)]
8181
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
8282
[GenerateHandlerMethods]
8383
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
84-
[RegistrationOptions(typeof(DidRenameFileRegistrationOptions))]
84+
[RegistrationOptions(typeof(DidRenameFilesRegistrationOptions))]
8585
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
86-
public partial record DidRenameFileParams : RenameFileOperationParams, IRequest
86+
public partial record DidRenameFilesParams : RenameFilesOperationParams, IRequest
8787
{
88-
public static implicit operator WillRenameFileParams(DidRenameFileParams @params)
88+
public static implicit operator WillRenameFilesParams(DidRenameFilesParams @params)
8989
{
9090
return new() { Files = @params.Files };
9191
}
9292
}
9393

94-
/// <inheritdoc cref="FileOperationParams{T}" />
94+
/// <inheritdoc cref="FileOperationsParams{T}" />
9595
[Parallel]
9696
[Method(WorkspaceNames.WillRenameFiles, Direction.ClientToServer)]
9797
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
9898
[GenerateHandlerMethods]
9999
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
100-
[RegistrationOptions(typeof(WillRenameFileRegistrationOptions))]
100+
[RegistrationOptions(typeof(WillRenameFilesRegistrationOptions))]
101101
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
102-
public partial record WillRenameFileParams : RenameFileOperationParams, IRequest<WorkspaceEdit?>
102+
public partial record WillRenameFilesParams : RenameFilesOperationParams, IRequest<WorkspaceEdit?>
103103
{
104-
public static implicit operator DidRenameFileParams(WillRenameFileParams @params)
104+
public static implicit operator DidRenameFilesParams(WillRenameFilesParams @params)
105105
{
106106
return new() { Files = @params.Files };
107107
}
@@ -113,7 +113,7 @@ public static implicit operator DidRenameFileParams(WillRenameFileParams @params
113113
///
114114
/// @since 3.16.0
115115
/// </summary>
116-
public abstract record RenameFileOperationParams
116+
public abstract record RenameFilesOperationParams
117117
{
118118
/// <summary>
119119
/// An array of all files/folders renamed in this operation.
@@ -138,33 +138,33 @@ public partial record FileRename
138138
public Uri NewUri { get; init; } = null!;
139139
}
140140

141-
/// <inheritdoc cref="FileOperationParams{T}" />
141+
/// <inheritdoc cref="FileOperationsParams{T}" />
142142
[Parallel]
143143
[Method(WorkspaceNames.DidDeleteFiles, Direction.ClientToServer)]
144144
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
145145
[GenerateHandlerMethods]
146146
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
147-
[RegistrationOptions(typeof(DidDeleteFileRegistrationOptions))]
147+
[RegistrationOptions(typeof(DidDeleteFilesRegistrationOptions))]
148148
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
149-
public partial record DidDeleteFileParams : FileOperationParams<FileDelete>, IRequest
149+
public partial record DidDeleteFilesParams : FileOperationsParams<FileDelete>, IRequest
150150
{
151-
public static implicit operator WillDeleteFileParams(DidDeleteFileParams @params)
151+
public static implicit operator WillDeleteFilesParams(DidDeleteFilesParams @params)
152152
{
153153
return new() { Files = @params.Files };
154154
}
155155
}
156156

157-
/// <inheritdoc cref="FileOperationParams{T}" />
157+
/// <inheritdoc cref="FileOperationsParams{T}" />
158158
[Parallel]
159159
[Method(WorkspaceNames.WillDeleteFiles, Direction.ClientToServer)]
160160
[GenerateHandler("OmniSharp.Extensions.LanguageServer.Protocol.Workspace")]
161161
[GenerateHandlerMethods]
162162
[GenerateRequestMethods(typeof(IWorkspaceLanguageClient), typeof(ILanguageClient))]
163-
[RegistrationOptions(typeof(WillDeleteFileRegistrationOptions))]
163+
[RegistrationOptions(typeof(WillDeleteFilesRegistrationOptions))]
164164
[Capability(typeof(FileOperationsWorkspaceClientCapabilities))]
165-
public partial record WillDeleteFileParams : FileOperationParams<FileDelete>, IRequest<WorkspaceEdit?>
165+
public partial record WillDeleteFilesParams : FileOperationsParams<FileDelete>, IRequest<WorkspaceEdit?>
166166
{
167-
public static implicit operator DidDeleteFileParams(WillDeleteFileParams @params)
167+
public static implicit operator DidDeleteFilesParams(WillDeleteFilesParams @params)
168168
{
169169
return new() { Files = @params.Files };
170170
}
@@ -179,7 +179,7 @@ public partial record FileDelete : FileOperationItem;
179179
nameof(FileOperationsWorkspaceServerCapabilities.WillCreate)
180180
)]
181181
[RegistrationName(WorkspaceNames.WillCreateFiles)]
182-
public partial class WillCreateFileRegistrationOptions : IFileOperationRegistrationOptions
182+
public partial class WillCreateFilesRegistrationOptions : IFileOperationRegistrationOptions
183183
{
184184
/// <summary>
185185
/// The actual filters.
@@ -193,7 +193,7 @@ public partial class WillCreateFileRegistrationOptions : IFileOperationRegistrat
193193
nameof(FileOperationsWorkspaceServerCapabilities.DidCreate)
194194
)]
195195
[RegistrationName(WorkspaceNames.DidCreateFiles)]
196-
public partial class DidCreateFileRegistrationOptions : IFileOperationRegistrationOptions
196+
public partial class DidCreateFilesRegistrationOptions : IFileOperationRegistrationOptions
197197
{
198198
/// <summary>
199199
/// The actual filters.
@@ -207,7 +207,7 @@ public partial class DidCreateFileRegistrationOptions : IFileOperationRegistrati
207207
nameof(FileOperationsWorkspaceServerCapabilities.WillRename)
208208
)]
209209
[RegistrationName(WorkspaceNames.WillRenameFiles)]
210-
public partial class WillRenameFileRegistrationOptions : IFileOperationRegistrationOptions
210+
public partial class WillRenameFilesRegistrationOptions : IFileOperationRegistrationOptions
211211
{
212212
/// <summary>
213213
/// The actual filters.
@@ -221,7 +221,7 @@ public partial class WillRenameFileRegistrationOptions : IFileOperationRegistrat
221221
nameof(FileOperationsWorkspaceServerCapabilities.DidRename)
222222
)]
223223
[RegistrationName(WorkspaceNames.DidRenameFiles)]
224-
public partial class DidRenameFileRegistrationOptions : IFileOperationRegistrationOptions
224+
public partial class DidRenameFilesRegistrationOptions : IFileOperationRegistrationOptions
225225
{
226226
/// <summary>
227227
/// The actual filters.
@@ -235,7 +235,7 @@ public partial class DidRenameFileRegistrationOptions : IFileOperationRegistrati
235235
nameof(FileOperationsWorkspaceServerCapabilities.WillDelete)
236236
)]
237237
[RegistrationName(WorkspaceNames.WillDeleteFiles)]
238-
public partial class WillDeleteFileRegistrationOptions : IFileOperationRegistrationOptions
238+
public partial class WillDeleteFilesRegistrationOptions : IFileOperationRegistrationOptions
239239
{
240240
/// <summary>
241241
/// The actual filters.
@@ -249,7 +249,7 @@ public partial class WillDeleteFileRegistrationOptions : IFileOperationRegistrat
249249
nameof(FileOperationsWorkspaceServerCapabilities.DidDelete)
250250
)]
251251
[RegistrationName(WorkspaceNames.DidDeleteFiles)]
252-
public partial class DidDeleteFileRegistrationOptions : IFileOperationRegistrationOptions
252+
public partial class DidDeleteFilesRegistrationOptions : IFileOperationRegistrationOptions
253253
{
254254
/// <summary>
255255
/// The actual filters.
@@ -363,37 +363,37 @@ public class FileOperationsWorkspaceServerCapabilities
363363
/// The client has support for sending didCreateFiles notifications.
364364
/// </summary>
365365
[Optional]
366-
public DidCreateFileRegistrationOptions.StaticOptions? DidCreate { get; set; }
366+
public DidCreateFilesRegistrationOptions.StaticOptions? DidCreate { get; set; }
367367

368368
/// <summary>
369369
/// The client has support for sending willCreateFiles requests.
370370
/// </summary>
371371
[Optional]
372-
public WillCreateFileRegistrationOptions.StaticOptions? WillCreate { get; set; }
372+
public WillCreateFilesRegistrationOptions.StaticOptions? WillCreate { get; set; }
373373

374374
/// <summary>
375375
/// The client has support for sending didRenameFiles notifications.
376376
/// </summary>
377377
[Optional]
378-
public DidRenameFileRegistrationOptions.StaticOptions? DidRename { get; set; }
378+
public DidRenameFilesRegistrationOptions.StaticOptions? DidRename { get; set; }
379379

380380
/// <summary>
381381
/// The client has support for sending willRenameFiles requests.
382382
/// </summary>
383383
[Optional]
384-
public WillRenameFileRegistrationOptions.StaticOptions? WillRename { get; set; }
384+
public WillRenameFilesRegistrationOptions.StaticOptions? WillRename { get; set; }
385385

386386
/// <summary>
387387
/// The client has support for sending didDeleteFiles notifications.
388388
/// </summary>
389389
[Optional]
390-
public DidDeleteFileRegistrationOptions.StaticOptions? DidDelete { get; set; }
390+
public DidDeleteFilesRegistrationOptions.StaticOptions? DidDelete { get; set; }
391391

392392
/// <summary>
393393
/// The client has support for sending willDeleteFiles requests.
394394
/// </summary>
395395
[Optional]
396-
public WillDeleteFileRegistrationOptions.StaticOptions? WillDelete { get; set; }
396+
public WillDeleteFilesRegistrationOptions.StaticOptions? WillDelete { get; set; }
397397
}
398398
}
399399

test/Lsp.Integration.Tests/FileOperationTests.cs renamed to test/Lsp.Integration.Tests/FileOperationsTests.cs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717

1818
namespace Lsp.Integration.Tests
1919
{
20-
public class FileOperationTests : LanguageProtocolTestBase
20+
public class FileOperationsTests : LanguageProtocolTestBase
2121
{
22-
private readonly Action<DidCreateFileParams> _didCreateFileHandler = Substitute.For<Action<DidCreateFileParams>>();
22+
private readonly Action<DidCreateFilesParams> _didCreateFileHandler = Substitute.For<Action<DidCreateFilesParams>>();
2323

24-
private readonly Func<WillCreateFileParams, Task<WorkspaceEdit?>> _willCreateFileHandler =
25-
Substitute.For<Func<WillCreateFileParams, Task<WorkspaceEdit?>>>();
24+
private readonly Func<WillCreateFilesParams, Task<WorkspaceEdit?>> _willCreateFileHandler =
25+
Substitute.For<Func<WillCreateFilesParams, Task<WorkspaceEdit?>>>();
2626

27-
private readonly Action<DidRenameFileParams> _didRenameFileHandler = Substitute.For<Action<DidRenameFileParams>>();
27+
private readonly Action<DidRenameFilesParams> _didRenameFileHandler = Substitute.For<Action<DidRenameFilesParams>>();
2828

29-
private readonly Func<WillRenameFileParams, Task<WorkspaceEdit?>> _willRenameFileHandler =
30-
Substitute.For<Func<WillRenameFileParams, Task<WorkspaceEdit?>>>();
29+
private readonly Func<WillRenameFilesParams, Task<WorkspaceEdit?>> _willRenameFileHandler =
30+
Substitute.For<Func<WillRenameFilesParams, Task<WorkspaceEdit?>>>();
3131

32-
private readonly Action<DidDeleteFileParams> _didDeleteFileHandler = Substitute.For<Action<DidDeleteFileParams>>();
32+
private readonly Action<DidDeleteFilesParams> _didDeleteFileHandler = Substitute.For<Action<DidDeleteFilesParams>>();
3333

34-
private readonly Func<WillDeleteFileParams, Task<WorkspaceEdit?>> _willDeleteFileHandler =
35-
Substitute.For<Func<WillDeleteFileParams, Task<WorkspaceEdit?>>>();
34+
private readonly Func<WillDeleteFilesParams, Task<WorkspaceEdit?>> _willDeleteFileHandler =
35+
Substitute.For<Func<WillDeleteFilesParams, Task<WorkspaceEdit?>>>();
3636

37-
public FileOperationTests(ITestOutputHelper outputHelper) : base(new JsonRpcTestOptions().ConfigureForXUnit(outputHelper, LogEventLevel.Verbose))
37+
public FileOperationsTests(ITestOutputHelper outputHelper) : base(new JsonRpcTestOptions().ConfigureForXUnit(outputHelper, LogEventLevel.Verbose))
3838
{
3939
}
4040

@@ -43,14 +43,14 @@ public async Task Should_Handle_FileCreate()
4343
{
4444
var (client, server) = await Initialize(Configure, Configure);
4545

46-
await client.RequestWillCreateFile(
47-
new WillCreateFileParams
46+
await client.RequestWillCreateFiles(
47+
new WillCreateFilesParams
4848
{
4949
Files = Container<FileCreate>.From(new FileCreate { Uri = new Uri("file://asdf") })
5050
}
5151
);
52-
client.DidCreateFile(
53-
new DidCreateFileParams
52+
client.DidCreateFiles(
53+
new DidCreateFilesParams
5454
{
5555
Files = Container<FileCreate>.From(new FileCreate { Uri = new Uri("file://asdf") })
5656
}
@@ -91,17 +91,17 @@ public async Task Should_Handle_FileRename()
9191
{
9292
var (client, server) = await Initialize(Configure, Configure);
9393

94-
await client.RequestWillRenameFile(
95-
new WillRenameFileParams
94+
await client.RequestWillRenameFiles(
95+
new WillRenameFilesParams
9696
{
9797
Files = Container<FileRename>.From(new FileRename {
9898
OldUri = new Uri("file://asdf"),
9999
NewUri = new Uri("file://zxcv"),
100100
})
101101
}
102102
);
103-
client.DidRenameFile(
104-
new DidRenameFileParams
103+
client.DidRenameFiles(
104+
new DidRenameFilesParams
105105
{
106106
Files = Container<FileRename>.From(new FileRename {
107107
OldUri = new Uri("file://asdf"),
@@ -145,14 +145,14 @@ public async Task Should_Handle_FileDelete()
145145
{
146146
var (client, server) = await Initialize(Configure, Configure);
147147

148-
await client.RequestWillDeleteFile(
149-
new WillDeleteFileParams
148+
await client.RequestWillDeleteFiles(
149+
new WillDeleteFilesParams
150150
{
151151
Files = Container<FileDelete>.From(new FileDelete { Uri = new Uri("file://asdf") })
152152
}
153153
);
154-
client.DidDeleteFile(
155-
new DidDeleteFileParams
154+
client.DidDeleteFiles(
155+
new DidDeleteFilesParams
156156
{
157157
Files = Container<FileDelete>.From(new FileDelete { Uri = new Uri("file://asdf") })
158158
}
@@ -219,12 +219,12 @@ private void Configure(LanguageServerOptions options)
219219
}
220220
}
221221
);
222-
options.OnDidCreateFile(_didCreateFileHandler, (capability, capabilities) => new() { Filters = filters });
223-
options.OnWillCreateFile(_willCreateFileHandler, (capability, capabilities) => new() { Filters = filters });
224-
options.OnDidRenameFile(_didRenameFileHandler, (capability, capabilities) => new() { Filters = filters });
225-
options.OnWillRenameFile(_willRenameFileHandler, (capability, capabilities) => new() { Filters = filters });
226-
options.OnDidDeleteFile(_didDeleteFileHandler, (capability, capabilities) => new() { Filters = filters });
227-
options.OnWillDeleteFile(_willDeleteFileHandler, (capability, capabilities) => new() { Filters = filters });
222+
options.OnDidCreateFiles(_didCreateFileHandler, (capability, capabilities) => new() { Filters = filters });
223+
options.OnWillCreateFiles(_willCreateFileHandler, (capability, capabilities) => new() { Filters = filters });
224+
options.OnDidRenameFiles(_didRenameFileHandler, (capability, capabilities) => new() { Filters = filters });
225+
options.OnWillRenameFiles(_willRenameFileHandler, (capability, capabilities) => new() { Filters = filters });
226+
options.OnDidDeleteFiles(_didDeleteFileHandler, (capability, capabilities) => new() { Filters = filters });
227+
options.OnWillDeleteFiles(_willDeleteFileHandler, (capability, capabilities) => new() { Filters = filters });
228228
}
229229
}
230230
}

0 commit comments

Comments
 (0)