Skip to content

Commit 89ff3c9

Browse files
david-driscolldavid-driscoll
committed
fixed failing generation tests, broken by formatting differences
1 parent 747d540 commit 89ff3c9

8 files changed

+114
-240
lines changed

‎test/Generation.Tests/AutoImplementParamsGeneratorTests.cs

+2-10
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,10 @@ namespace Test
3939
public partial class DeclarationParams
4040
{
4141
[Optional]
42-
public ProgressToken? WorkDoneToken
43-
{
44-
get;
45-
init;
46-
}
42+
public ProgressToken? WorkDoneToken { get; init; }
4743
4844
[Optional]
49-
public ProgressToken? PartialResultToken
50-
{
51-
get;
52-
init;
53-
}
45+
public ProgressToken? PartialResultToken { get; init; }
5446
}
5547
}
5648
#nullable restore";

‎test/Generation.Tests/GeneratedRegistrationOptionsTests.cs

+14-74
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ namespace Test
3535
public partial class WorkspaceSymbolRegistrationOptions : OmniSharp.Extensions.LanguageServer.Protocol.IRegistrationOptions, OmniSharp.Extensions.LanguageServer.Protocol.Models.IWorkDoneProgressOptions
3636
{
3737
[Optional]
38-
public bool WorkDoneProgress
39-
{
40-
get;
41-
set;
42-
}
38+
public bool WorkDoneProgress { get; set; }
4339
4440
class WorkspaceSymbolRegistrationOptionsConverter : RegistrationOptionsConverterBase<WorkspaceSymbolRegistrationOptions, StaticOptions>
4541
{
@@ -57,11 +53,7 @@ public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)
5753
public partial class StaticOptions : OmniSharp.Extensions.LanguageServer.Protocol.Models.IWorkDoneProgressOptions
5854
{
5955
[Optional]
60-
public bool WorkDoneProgress
61-
{
62-
get;
63-
set;
64-
}
56+
public bool WorkDoneProgress { get; set; }
6557
}
6658
}
6759
}
@@ -99,11 +91,7 @@ namespace Test
9991
public partial class WorkspaceSymbolRegistrationOptions : OmniSharp.Extensions.LanguageServer.Protocol.IRegistrationOptions
10092
{
10193
[Optional]
102-
public bool WorkDoneProgress
103-
{
104-
get;
105-
set;
106-
}
94+
public bool WorkDoneProgress { get; set; }
10795
10896
class WorkspaceSymbolRegistrationOptionsConverter : RegistrationOptionsConverterBase<WorkspaceSymbolRegistrationOptions, StaticOptions>
10997
{
@@ -121,11 +109,7 @@ public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)
121109
public partial class StaticOptions : IWorkDoneProgressOptions
122110
{
123111
[Optional]
124-
public bool WorkDoneProgress
125-
{
126-
get;
127-
set;
128-
}
112+
public bool WorkDoneProgress { get; set; }
129113
}
130114
}
131115
}
@@ -208,18 +192,10 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Test
208192
[RegistrationOptionsConverterAttribute(typeof(CodeActionRegistrationOptionsConverter))]
209193
public partial class CodeActionRegistrationOptions : OmniSharp.Extensions.LanguageServer.Protocol.IRegistrationOptions, OmniSharp.Extensions.LanguageServer.Protocol.Models.ITextDocumentRegistrationOptions, OmniSharp.Extensions.LanguageServer.Protocol.Models.IWorkDoneProgressOptions
210194
{
211-
public DocumentSelector? DocumentSelector
212-
{
213-
get;
214-
set;
215-
}
195+
public DocumentSelector? DocumentSelector { get; set; }
216196
217197
[Optional]
218-
public bool WorkDoneProgress
219-
{
220-
get;
221-
set;
222-
}
198+
public bool WorkDoneProgress { get; set; }
223199
224200
class CodeActionRegistrationOptionsConverter : RegistrationOptionsConverterBase<CodeActionRegistrationOptions, StaticOptions>
225201
{
@@ -243,32 +219,18 @@ public partial class StaticOptions : OmniSharp.Extensions.LanguageServer.Protoco
243219
/// may list out every specific kind they provide.
244220
/// </summary>
245221
[Optional]
246-
public Container<CodeActionKind>? CodeActionKinds
247-
{
248-
get;
249-
set;
250-
}
251-
252-
= new Container<CodeActionKind>();
222+
public Container<CodeActionKind>? CodeActionKinds { get; set; } = new Container<CodeActionKind>();
253223
/// <summary>
254224
/// The server provides support to resolve additional
255225
/// information for a code action.
256226
///
257227
/// @since 3.16.0
258228
/// </summary>
259229
[Optional]
260-
public bool ResolveProvider
261-
{
262-
get;
263-
set;
264-
}
230+
public bool ResolveProvider { get; set; }
265231
266232
[Optional]
267-
public bool WorkDoneProgress
268-
{
269-
get;
270-
set;
271-
}
233+
public bool WorkDoneProgress { get; set; }
272234
}
273235
}
274236
}
@@ -369,18 +331,10 @@ namespace OmniSharp.Extensions.LanguageServer.Protocol.Test
369331
[RegistrationOptionsKey(nameof(ServerCapabilities.CodeActionProvider))]
370332
public partial class CodeActionRegistrationOptions : OmniSharp.Extensions.LanguageServer.Protocol.IRegistrationOptions
371333
{
372-
public DocumentSelector? DocumentSelector
373-
{
374-
get;
375-
set;
376-
}
334+
public DocumentSelector? DocumentSelector { get; set; }
377335
378336
[Optional]
379-
public bool WorkDoneProgress
380-
{
381-
get;
382-
set;
383-
}
337+
public bool WorkDoneProgress { get; set; }
384338
385339
[RegistrationOptionsKey(nameof(ServerCapabilities.CodeActionProvider))]
386340
public partial class StaticOptions : IWorkDoneProgressOptions
@@ -392,32 +346,18 @@ public partial class StaticOptions : IWorkDoneProgressOptions
392346
/// may list out every specific kind they provide.
393347
/// </summary>
394348
[Optional]
395-
public Container<CodeActionKind>? CodeActionKinds
396-
{
397-
get;
398-
set;
399-
}
400-
401-
= new Container<CodeActionKind>();
349+
public Container<CodeActionKind>? CodeActionKinds { get; set; } = new Container<CodeActionKind>();
402350
/// <summary>
403351
/// The server provides support to resolve additional
404352
/// information for a code action.
405353
///
406354
/// @since 3.16.0
407355
/// </summary>
408356
[Optional]
409-
public bool ResolveProvider
410-
{
411-
get;
412-
set;
413-
}
357+
public bool ResolveProvider { get; set; }
414358
415359
[Optional]
416-
public bool WorkDoneProgress
417-
{
418-
get;
419-
set;
420-
}
360+
public bool WorkDoneProgress { get; set; }
421361
}
422362
}
423363
}

‎test/Generation.Tests/Generation.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1;net5.0;netcoreapp2.1</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1;net6.0;netcoreapp2.1</TargetFrameworks>
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
</PropertyGroup>

‎test/Generation.Tests/LspFeatureTests.cs

+5-17
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ abstract public partial class WorkspaceSymbolsHandlerBase : AbstractHandlers.Req
5454
[System.Runtime.CompilerServices.CompilerGeneratedAttribute, System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
5555
abstract public partial class WorkspaceSymbolsPartialHandlerBase : AbstractHandlers.PartialResults<WorkspaceSymbolParams, Container<SymbolInformation>?, SymbolInformation, WorkspaceSymbolRegistrationOptions, WorkspaceSymbolCapability>, IWorkspaceSymbolsHandler
5656
{
57-
protected WorkspaceSymbolsPartialHandlerBase(System.Guid id, IProgressManager progressManager): base(progressManager, Container<SymbolInformation>.From)
57+
protected WorkspaceSymbolsPartialHandlerBase(System.Guid id, IProgressManager progressManager) : base(progressManager, Container<SymbolInformation>.From)
5858
{
5959
}
6060
}
@@ -189,11 +189,7 @@ namespace Lsp.Tests.Integration.Fixtures
189189
public partial class UnitTestRegistrationOptions : OmniSharp.Extensions.LanguageServer.Protocol.IRegistrationOptions
190190
{
191191
[Optional]
192-
public bool WorkDoneProgress
193-
{
194-
get;
195-
set;
196-
}
192+
public bool WorkDoneProgress { get; set; }
197193
198194
class UnitTestRegistrationOptionsConverter : RegistrationOptionsConverterBase<UnitTestRegistrationOptions, StaticOptions>
199195
{
@@ -211,18 +207,10 @@ public override StaticOptions Convert(UnitTestRegistrationOptions source)
211207
public partial class StaticOptions : IWorkDoneProgressOptions
212208
{
213209
[Optional]
214-
public bool SupportsDebugging
215-
{
216-
get;
217-
set;
218-
}
210+
public bool SupportsDebugging { get; set; }
219211
220212
[Optional]
221-
public bool WorkDoneProgress
222-
{
223-
get;
224-
set;
225-
}
213+
public bool WorkDoneProgress { get; set; }
226214
}
227215
}
228216
}
@@ -321,7 +309,7 @@ abstract public partial class DiscoverUnitTestsHandlerBase : AbstractHandlers.Re
321309
[System.Runtime.CompilerServices.CompilerGeneratedAttribute, System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
322310
abstract public partial class DiscoverUnitTestsPartialHandlerBase : AbstractHandlers.PartialResults<DiscoverUnitTestsParams, Container<UnitTest>, UnitTest, UnitTestRegistrationOptions, UnitTestCapability>, IDiscoverUnitTestsHandler
323311
{
324-
protected DiscoverUnitTestsPartialHandlerBase(System.Guid id, IProgressManager progressManager): base(progressManager, Container<UnitTest>.From)
312+
protected DiscoverUnitTestsPartialHandlerBase(System.Guid id, IProgressManager progressManager) : base(progressManager, Container<UnitTest>.From)
325313
{
326314
}
327315
}

0 commit comments

Comments
 (0)