Merge pull request #1038 from manandre/codeanalyzer

JoeRobich · web-flow · commit 5663cb7ce121 · 2023-09-27T11:03:35.000-07:00
Update dependency Microsoft.CodeAnalysis.CSharp.Workspaces to v4.7.0
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -58,7 +58,7 @@
     <PackageVersion Include="Snapper" Version="2.4.0" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="DryIoc.Internal" Version="5.0.1" />
   </ItemGroup>
diff --git a/test/Generation.Tests/snapshots/EnumLikeStringGeneratorTests.Auto_Magically_Implements_IEnumLikeString#Test0_ThreadEventReason.verified.cs b/test/Generation.Tests/snapshots/EnumLikeStringGeneratorTests.Auto_Magically_Implements_IEnumLikeString#Test0_ThreadEventReason.verified.cs
@@ -17,9 +17,14 @@ namespace Test
     {
         private static readonly Lazy<IReadOnlyList<ThreadEventReason>> _defaults = new Lazy<IReadOnlyList<ThreadEventReason>>(() =>
         {
-            return new ThreadEventReason[]{Started, Exited};
+            return new ThreadEventReason[]
+            {
+                Started,
+                Exited
+            };
         });
         public static IEnumerable<ThreadEventReason> Defaults => _defaults.Value;
+
         private readonly string _value;
         public ThreadEventReason(string type) => _value = type;
         public static implicit operator ThreadEventReason(string kind) => new ThreadEventReason(kind);
diff --git a/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_Registration_Options#CodeActionRegistrationOptions.verified.cs b/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_Registration_Options#CodeActionRegistrationOptions.verified.cs
@@ -36,7 +36,12 @@ public CodeActionRegistrationOptionsConverter()
 
             public override StaticOptions Convert(CodeActionRegistrationOptions source)
             {
-                return new StaticOptions{CodeActionKinds = source.CodeActionKinds, ResolveProvider = source.ResolveProvider, WorkDoneProgress = source.WorkDoneProgress};
+                return new StaticOptions
+                {
+                    CodeActionKinds = source.CodeActionKinds,
+                    ResolveProvider = source.ResolveProvider,
+                    WorkDoneProgress = source.WorkDoneProgress
+                };
             }
         }
 
@@ -51,6 +56,7 @@ public partial class StaticOptions : OmniSharp.Extensions.LanguageServer.Protoco
             /// </summary>
             [Optional]
             public Container<CodeActionKind>? CodeActionKinds { get; set; } = new Container<CodeActionKind>();
+
             /// <summary>
             /// The server provides support to resolve additional
             /// information for a code action.
diff --git a/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_Registration_Options_With_Converters#CodeActionRegistrationOptions.verified.cs b/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_Registration_Options_With_Converters#CodeActionRegistrationOptions.verified.cs
@@ -38,6 +38,7 @@ public partial class StaticOptions : IWorkDoneProgressOptions
             /// </summary>
             [Optional]
             public Container<CodeActionKind>? CodeActionKinds { get; set; } = new Container<CodeActionKind>();
+
             /// <summary>
             /// The server provides support to resolve additional
             /// information for a code action.
diff --git a/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_WorkDone_Registration_Options#WorkspaceSymbolRegistrationOptions.verified.cs b/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_WorkDone_Registration_Options#WorkspaceSymbolRegistrationOptions.verified.cs
@@ -22,7 +22,10 @@ public WorkspaceSymbolRegistrationOptionsConverter()
 
             public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)
             {
-                return new StaticOptions{WorkDoneProgress = source.WorkDoneProgress};
+                return new StaticOptions
+                {
+                    WorkDoneProgress = source.WorkDoneProgress
+                };
             }
         }
 
diff --git a/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_WorkDone_Registration_Options_Interface#WorkspaceSymbolRegistrationOptions.verified.cs b/test/Generation.Tests/snapshots/GeneratedRegistrationOptionsTests.Supports_Generating_Strongly_Typed_WorkDone_Registration_Options_Interface#WorkspaceSymbolRegistrationOptions.verified.cs
@@ -23,7 +23,10 @@ public WorkspaceSymbolRegistrationOptionsConverter()
 
             public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)
             {
-                return new StaticOptions{WorkDoneProgress = source.WorkDoneProgress};
+                return new StaticOptions
+                {
+                    WorkDoneProgress = source.WorkDoneProgress
+                };
             }
         }
 
diff --git a/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Generating_Custom_Language_Extensions#UnitTestRegistrationOptions.verified.cs b/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Generating_Custom_Language_Extensions#UnitTestRegistrationOptions.verified.cs
@@ -29,7 +29,11 @@ public UnitTestRegistrationOptionsConverter()
 
             public override StaticOptions Convert(UnitTestRegistrationOptions source)
             {
-                return new StaticOptions{SupportsDebugging = source.SupportsDebugging, WorkDoneProgress = source.WorkDoneProgress};
+                return new StaticOptions
+                {
+                    SupportsDebugging = source.SupportsDebugging,
+                    WorkDoneProgress = source.WorkDoneProgress
+                };
             }
         }
 
diff --git a/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Inlay_Hint#OutlayHintParams.verified.cs b/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Inlay_Hint#OutlayHintParams.verified.cs
@@ -50,6 +50,7 @@ protected OutlayHintsHandlerBase() : this(Guid.NewGuid())
 
         private readonly Guid _id;
         Guid ICanBeIdentifiedHandler.Id => _id;
+
         public abstract Task<OutlayHint> Handle(OutlayHint request, CancellationToken cancellationToken);
     }
 
diff --git a/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Inlay_Hint#Test0_OutlayHintTyped.verified.cs b/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Inlay_Hint#Test0_OutlayHintTyped.verified.cs
@@ -28,7 +28,17 @@ public partial record OutlayHint
         public OutlayHint<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new OutlayHint<TData>{Position = Position, Label = Label, Kind = Kind, TextEdits = TextEdits, Tooltip = Tooltip, PaddingLeft = PaddingLeft, PaddingRight = PaddingRight, Data = data};
+            return new OutlayHint<TData>
+            {
+                Position = Position,
+                Label = Label,
+                Kind = Kind,
+                TextEdits = TextEdits,
+                Tooltip = Tooltip,
+                PaddingLeft = PaddingLeft,
+                PaddingRight = PaddingRight,
+                Data = data
+            };
         }
 
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]
@@ -59,15 +69,13 @@ public partial record OutlayHint<T> : ICanBeResolved where T : class?, IHandlerI
         /// The position of this hint.
         /// </summary>
         public Position Position { get; init; }
-
         /// <summary>
         /// The label of this hint. A human readable string or an array of
         /// OutlayHintLabelPart label parts.
         ///
         /// *Note* that neither the string nor the label part can be empty.
         /// </summary>
         public StringOrOutlayHintLabelParts Label { get; init; }
-
         /// <summary>
         /// The kind of this hint. Can be omitted in which case the client
         /// should fall back to a reasonable default.
@@ -122,23 +130,52 @@ public partial record OutlayHint<T> : ICanBeResolved where T : class?, IHandlerI
         /// </summary>
         [Optional]
         public T Data { get => this.GetRawData<T>()!; init => this.SetRawData<T>(value); }
-
         private string DebuggerDisplay => ToString();
+
         public OutlayHint<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new OutlayHint<TData>{Position = Position, Label = Label, Kind = Kind, TextEdits = TextEdits, Tooltip = Tooltip, PaddingLeft = PaddingLeft, PaddingRight = PaddingRight, Data = data};
+            return new OutlayHint<TData>
+            {
+                Position = Position,
+                Label = Label,
+                Kind = Kind,
+                TextEdits = TextEdits,
+                Tooltip = Tooltip,
+                PaddingLeft = PaddingLeft,
+                PaddingRight = PaddingRight,
+                Data = data
+            };
         }
 
         JToken? ICanBeResolved.Data { get; init; }
-
         private JToken? JData { get => this.GetRawData(); init => this.SetRawData(value); }
 
-        public static implicit operator OutlayHint<T>(OutlayHint value) => new OutlayHint<T>{Position = value.Position, Label = value.Label, Kind = value.Kind, TextEdits = value.TextEdits, Tooltip = value.Tooltip, PaddingLeft = value.PaddingLeft, PaddingRight = value.PaddingRight, JData = value.Data};
+        public static implicit operator OutlayHint<T>(OutlayHint value) => new OutlayHint<T>
+        {
+            Position = value.Position,
+            Label = value.Label,
+            Kind = value.Kind,
+            TextEdits = value.TextEdits,
+            Tooltip = value.Tooltip,
+            PaddingLeft = value.PaddingLeft,
+            PaddingRight = value.PaddingRight,
+            JData = value.Data
+        };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("value")]
         public static implicit operator OutlayHint? (OutlayHint<T>? value) => value switch
         {
-            not null => new OutlayHint{Position = value.Position, Label = value.Label, Kind = value.Kind, TextEdits = value.TextEdits, Tooltip = value.Tooltip, PaddingLeft = value.PaddingLeft, PaddingRight = value.PaddingRight, Data = value.JData},
+            not null => new OutlayHint
+            {
+                Position = value.Position,
+                Label = value.Label,
+                Kind = value.Kind,
+                TextEdits = value.TextEdits,
+                Tooltip = value.Tooltip,
+                PaddingLeft = value.PaddingLeft,
+                PaddingRight = value.PaddingRight,
+                Data = value.JData
+            },
             _ => null
         };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]
diff --git a/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Nullable_Params_With_Typed_Data#SubLensParams.verified.cs b/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Nullable_Params_With_Typed_Data#SubLensParams.verified.cs
@@ -50,6 +50,7 @@ protected SubLensHandlerBase() : this(Guid.NewGuid())
 
         private readonly Guid _id;
         Guid ICanBeIdentifiedHandler.Id => _id;
+
         public abstract Task<SubLens> Handle(SubLens request, CancellationToken cancellationToken);
     }
 
@@ -84,6 +85,7 @@ protected SubLensPartialHandlerBase(IProgressManager progressManager) : this(Gui
 
         private readonly Guid _id;
         Guid ICanBeIdentifiedHandler.Id => _id;
+
         public abstract Task<SubLens> Handle(SubLens request, CancellationToken cancellationToken);
     }
 
diff --git a/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Nullable_Params_With_Typed_Data#Test0_SubLensTyped.verified.cs b/test/Generation.Tests/snapshots/LspFeatureTests.Supports_Nullable_Params_With_Typed_Data#Test0_SubLensTyped.verified.cs
@@ -26,7 +26,12 @@ public partial record SubLens
         public SubLens<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new SubLens<TData>{Range = Range, Command = Command, Data = data};
+            return new SubLens<TData>
+            {
+                Range = Range,
+                Command = Command,
+                Data = data
+            };
         }
 
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]
@@ -59,6 +64,7 @@ public partial record SubLens<T> : ICanBeResolved where T : class?, IHandlerIden
         /// The range in which this code lens is valid. Should only span a single line.
         /// </summary>
         public Range Range { get; init; } = null !;
+
         /// <summary>
         /// The command this code lens represents.
         /// </summary>
@@ -71,8 +77,8 @@ public partial record SubLens<T> : ICanBeResolved where T : class?, IHandlerIden
         /// </summary>
         [Optional]
         public T Data { get => this.GetRawData<T>()!; init => this.SetRawData<T>(value); }
-
         private string DebuggerDisplay => $"{Range}{(Command != null ? $" {Command}" : "")}";
+
         /// <inheritdoc/>
         public override string ToString()
         {
@@ -82,18 +88,32 @@ public override string ToString()
         public SubLens<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new SubLens<TData>{Range = Range, Command = Command, Data = data};
+            return new SubLens<TData>
+            {
+                Range = Range,
+                Command = Command,
+                Data = data
+            };
         }
 
         JToken? ICanBeResolved.Data { get; init; }
-
         private JToken? JData { get => this.GetRawData(); init => this.SetRawData(value); }
 
-        public static implicit operator SubLens<T>(SubLens value) => new SubLens<T>{Range = value.Range, Command = value.Command, JData = value.Data};
+        public static implicit operator SubLens<T>(SubLens value) => new SubLens<T>
+        {
+            Range = value.Range,
+            Command = value.Command,
+            JData = value.Data
+        };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("value")]
         public static implicit operator SubLens? (SubLens<T>? value) => value switch
         {
-            not null => new SubLens{Range = value.Range, Command = value.Command, Data = value.JData},
+            not null => new SubLens
+            {
+                Range = value.Range,
+                Command = value.Command,
+                Data = value.JData
+            },
             _ => null
         };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]
diff --git a/test/Generation.Tests/snapshots/TypedCanBeResolvedTests.Supports_Generating_Strongly_Typed_ICanBeResolved_Data#Test0_CodeLensTyped.verified.cs b/test/Generation.Tests/snapshots/TypedCanBeResolvedTests.Supports_Generating_Strongly_Typed_ICanBeResolved_Data#Test0_CodeLensTyped.verified.cs
@@ -27,7 +27,12 @@ public partial record CodeLens
         public CodeLens<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new CodeLens<TData>{Range = Range, Command = Command, Data = data};
+            return new CodeLens<TData>
+            {
+                Range = Range,
+                Command = Command,
+                Data = data
+            };
         }
 
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]
@@ -64,24 +69,38 @@ public partial record CodeLens<T> : ICanBeResolved where T : class?, IHandlerIde
         /// </summary>
         [Optional]
         public T Data { get => this.GetRawData<T>()!; init => this.SetRawData<T>(value); }
-
         private string DebuggerDisplay => $"{Range}{(Command != null ? $" {Command}" : "")}";
+
         public override string ToString() => DebuggerDisplay;
         public CodeLens<TData> WithData<TData>(TData data)
             where TData : class?, IHandlerIdentity?
         {
-            return new CodeLens<TData>{Range = Range, Command = Command, Data = data};
+            return new CodeLens<TData>
+            {
+                Range = Range,
+                Command = Command,
+                Data = data
+            };
         }
 
         JToken? ICanBeResolved.Data { get; init; }
-
         private JToken? JData { get => this.GetRawData(); init => this.SetRawData(value); }
 
-        public static implicit operator CodeLens<T>(CodeLens value) => new CodeLens<T>{Range = value.Range, Command = value.Command, JData = value.Data};
+        public static implicit operator CodeLens<T>(CodeLens value) => new CodeLens<T>
+        {
+            Range = value.Range,
+            Command = value.Command,
+            JData = value.Data
+        };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("value")]
         public static implicit operator CodeLens? (CodeLens<T>? value) => value switch
         {
-            not null => new CodeLens{Range = value.Range, Command = value.Command, Data = value.JData},
+            not null => new CodeLens
+            {
+                Range = value.Range,
+                Command = value.Command,
+                Data = value.JData
+            },
             _ => null
         };
         [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("item")]

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,12 @@ public CodeActionRegistrationOptionsConverter()`
`36`	`36`
`37`	`37`	`public override StaticOptions Convert(CodeActionRegistrationOptions source)`
`38`	`38`	`{`
`39`		`- return new StaticOptions{CodeActionKinds = source.CodeActionKinds, ResolveProvider = source.ResolveProvider, WorkDoneProgress = source.WorkDoneProgress};`
	`39`	`+ return new StaticOptions`
	`40`	`+ {`
	`41`	`+ CodeActionKinds = source.CodeActionKinds,`
	`42`	`+ ResolveProvider = source.ResolveProvider,`
	`43`	`+ WorkDoneProgress = source.WorkDoneProgress`
	`44`	`+ };`
`40`	`45`	`}`
`41`	`46`	`}`
`42`	`47`
`@@ -51,6 +56,7 @@ public partial class StaticOptions : OmniSharp.Extensions.LanguageServer.Protoco`
`51`	`56`	`/// </summary>`
`52`	`57`	`[Optional]`
`53`	`58`	`public Container<CodeActionKind>? CodeActionKinds { get; set; } = new Container<CodeActionKind>();`
	`59`	`+`
`54`	`60`	`/// <summary>`
`55`	`61`	`/// The server provides support to resolve additional`
`56`	`62`	`/// information for a code action.`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ public WorkspaceSymbolRegistrationOptionsConverter()`
`22`	`22`
`23`	`23`	`public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)`
`24`	`24`	`{`
`25`		`- return new StaticOptions{WorkDoneProgress = source.WorkDoneProgress};`
	`25`	`+ return new StaticOptions`
	`26`	`+ {`
	`27`	`+ WorkDoneProgress = source.WorkDoneProgress`
	`28`	`+ };`
`26`	`29`	`}`
`27`	`30`	`}`
`28`	`31`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ public WorkspaceSymbolRegistrationOptionsConverter()`
`23`	`23`
`24`	`24`	`public override StaticOptions Convert(WorkspaceSymbolRegistrationOptions source)`
`25`	`25`	`{`
`26`		`- return new StaticOptions{WorkDoneProgress = source.WorkDoneProgress};`
	`26`	`+ return new StaticOptions`
	`27`	`+ {`
	`28`	`+ WorkDoneProgress = source.WorkDoneProgress`
	`29`	`+ };`
`27`	`30`	`}`
`28`	`31`	`}`
`29`	`32`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ public UnitTestRegistrationOptionsConverter()`
`29`	`29`
`30`	`30`	`public override StaticOptions Convert(UnitTestRegistrationOptions source)`
`31`	`31`	`{`
`32`		`- return new StaticOptions{SupportsDebugging = source.SupportsDebugging, WorkDoneProgress = source.WorkDoneProgress};`
	`32`	`+ return new StaticOptions`
	`33`	`+ {`
	`34`	`+ SupportsDebugging = source.SupportsDebugging,`
	`35`	`+ WorkDoneProgress = source.WorkDoneProgress`
	`36`	`+ };`
`33`	`37`	`}`
`34`	`38`	`}`
`35`	`39`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected OutlayHintsHandlerBase() : this(Guid.NewGuid())`
`50`	`50`
`51`	`51`	`private readonly Guid _id;`
`52`	`52`	`Guid ICanBeIdentifiedHandler.Id => _id;`
	`53`	`+`
`53`	`54`	`public abstract Task<OutlayHint> Handle(OutlayHint request, CancellationToken cancellationToken);`
`54`	`55`	`}`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected SubLensHandlerBase() : this(Guid.NewGuid())`
`50`	`50`
`51`	`51`	`private readonly Guid _id;`
`52`	`52`	`Guid ICanBeIdentifiedHandler.Id => _id;`
	`53`	`+`
`53`	`54`	`public abstract Task<SubLens> Handle(SubLens request, CancellationToken cancellationToken);`
`54`	`55`	`}`
`55`	`56`
`@@ -84,6 +85,7 @@ protected SubLensPartialHandlerBase(IProgressManager progressManager) : this(Gui`
`84`	`85`
`85`	`86`	`private readonly Guid _id;`
`86`	`87`	`Guid ICanBeIdentifiedHandler.Id => _id;`
	`88`	`+`
`87`	`89`	`public abstract Task<SubLens> Handle(SubLens request, CancellationToken cancellationToken);`
`88`	`90`	`}`
`89`	`91`