Run code cleanup

BenjaminMichaelis · BenjaminMichaelis · commit ceccdc849607 · 2023-01-04T21:39:49.000-08:00
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/AnalyzerTests.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/AnalyzerTests.cs
@@ -23,7 +23,7 @@ static AnalyzerTests()
         [TestMethod]
         public async Task RunOnSelf()
         {
-            await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer","IntelliTect.Analyzer.csproj")))
+            await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer", "IntelliTect.Analyzer.csproj")))
                 .ConfigureAwait(false);
         }
 
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/CodeFixVerifier.Helper.cs
@@ -1,11 +1,11 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.Formatting;
-using Microsoft.CodeAnalysis.Simplification;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace TestHelper
 {
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/DiagnosticResult.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/DiagnosticResult.cs
@@ -1,5 +1,5 @@
-using Microsoft.CodeAnalysis;
 using System;
+using Microsoft.CodeAnalysis;
 
 namespace TestHelper
 {
@@ -36,9 +36,9 @@ public DiagnosticResultLocation(string path, int line, int column)
     public struct DiagnosticResult
     {
         private DiagnosticResultLocation[] _Locations;
-        
+
 #pragma warning disable CA1819 // Properties should not return arrays
-        
+
         public DiagnosticResultLocation[] Locations
         {
             get
@@ -52,7 +52,7 @@ public DiagnosticResultLocation[] Locations
                 _Locations = value;
             }
         }
-        
+
 #pragma warning restore CA1819 // Properties should not return arrays
 
         public DiagnosticSeverity Severity { get; set; }
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/DiagnosticVerifier.Helper.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Helpers/DiagnosticVerifier.Helper.cs
@@ -1,11 +1,11 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Text;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Text;
 
 namespace TestHelper
 {
@@ -52,7 +52,7 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(DiagnosticAnalyz
             {
                 throw new ArgumentNullException(nameof(documents));
             }
-            
+
             var projects = new HashSet<Project>();
             foreach (Document document in documents)
             {
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/NamingFieldPascalUnderscoreTests.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/NamingFieldPascalUnderscoreTests.cs
@@ -118,7 +118,7 @@ class TypeName
 
             VerifyCSharpDiagnostic(test, expected);
         }
-        
+
         [TestMethod]
         public void FieldWithNamingViolation_FieldTwoLeadingUnderScores_Warning()
         {
@@ -224,7 +224,7 @@ class TypeName
     }";
             await VerifyCSharpFix(test, fixTest);
         }
-        
+
         [TestMethod]
         public async Task FieldTwoLeadingUnderScores_CodeFix_FixNamingViolation_FieldIsNamedCorrectly()
         {
@@ -368,7 +368,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
 
             VerifyCSharpDiagnostic(test);
         }
-        
+
         [TestMethod]
         [Description("Issue 14")]
         public void FieldWithNamingViolation_ClassHasGeneratedCodeAttribute_Ignored()
@@ -392,7 +392,7 @@ class TypeName
 
             VerifyCSharpDiagnostic(test);
         }
-        
+
         [TestMethod]
         [Description("Issue 14")]
         public void FieldWithNamingViolation_FieldHasGeneratedCodeAttribute_Ignored()
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/UnusedLocalVariableTests.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/UnusedLocalVariableTests.cs
@@ -117,7 +117,7 @@ public void Foo()
             var expected = new DiagnosticResult
             {
                 Id = Analyzers.UnusedLocalVariable.DiagnosticId,
-                Message = "Local variable 'foo' should be used", 
+                Message = "Local variable 'foo' should be used",
                 Severity = DiagnosticSeverity.Info,
                 Locations = new[]
                 {
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Verifiers/CodeFixVerifier.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Verifiers/CodeFixVerifier.cs
@@ -1,14 +1,14 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace TestHelper
 {
@@ -109,7 +109,7 @@ private static async Task VerifyFix(string language, DiagnosticAnalyzer analyzer
                     document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace));
                     newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document));
 
-                    Assert.Fail($"Fix introduced new compiler diagnostics:{string.Join(Environment.NewLine, newCompilerDiagnostics.Select(d => d.ToString()))}" + 
+                    Assert.Fail($"Fix introduced new compiler diagnostics:{string.Join(Environment.NewLine, newCompilerDiagnostics.Select(d => d.ToString()))}" +
                         $"{Environment.NewLine}{Environment.NewLine}New document:{Environment.NewLine}{document.GetSyntaxRootAsync().Result.ToFullString()}{Environment.NewLine}");
                 }
 
@@ -123,7 +123,7 @@ private static async Task VerifyFix(string language, DiagnosticAnalyzer analyzer
             //after applying all of the code fixes, compare the resulting string to the inputted one
             string actual = GetStringFromDocument(document);
             Assert.AreEqual<string>(
-                newSource?.Replace("\r","",StringComparison.InvariantCulture), 
+                newSource?.Replace("\r", "", StringComparison.InvariantCulture),
                 actual?.Replace("\r", "", StringComparison.InvariantCulture));
         }
     }
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Verifiers/DiagnosticVerifier.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/Verifiers/DiagnosticVerifier.cs
@@ -1,11 +1,22 @@
 using System;
-using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+
+/* Unmerged change from project 'IntelliTect.Analyzer.Tests (net6.0)'
+Before:
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
+After:
+using Microsoft.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+*/
 using System.Linq;
 using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace TestHelper
 {
@@ -176,8 +187,8 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             FileLinePositionSpan actualSpan = actual.GetLineSpan();
 
-            Assert.IsTrue(actualSpan.Path == expected.Path || (actualSpan.Path != null 
-                                                               && actualSpan.Path.Contains("Test0.", StringComparison.Ordinal) 
+            Assert.IsTrue(actualSpan.Path == expected.Path || (actualSpan.Path != null
+                                                               && actualSpan.Path.Contains("Test0.", StringComparison.Ordinal)
                                                                && expected.Path.Contains("Test.", StringComparison.Ordinal)),
                 string.Format("Expected diagnostic to be in file \"{0}\" was actually in file \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
                     expected.Path, actualSpan.Path, FormatDiagnostics(analyzer, diagnostic)));
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/AnalyzerBlockMixins.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/AnalyzerBlockMixins.cs
@@ -10,7 +10,7 @@ private static string GetEnumAttributeValue<TAttribute>(Enum value, Func<TAttrib
         {
             FieldInfo fi = value.GetType().GetRuntimeField(value.ToString());
 
-            var attributes = (TAttribute[]) fi?.GetCustomAttributes(typeof(TAttribute), false);
+            var attributes = (TAttribute[])fi?.GetCustomAttributes(typeof(TAttribute), false);
 
             return attributes?.Length > 0 ? valueAccessor(attributes[0]) : null;
         }
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/AsyncVoid.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/AsyncVoid.cs
@@ -16,7 +16,7 @@ public class AsyncVoid : DiagnosticAnalyzer
         private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title,
             DiagnosticId);
 
-        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat, 
+        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat,
             Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description, _HelpLinkUri);
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(_Rule);
@@ -27,7 +27,7 @@ public override void Initialize(AnalysisContext context)
             {
                 throw new ArgumentNullException(nameof(context));
             }
-            
+
             context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics);
             context.EnableConcurrentExecution();
             context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/AttributesOnSeparateLines.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/AttributesOnSeparateLines.cs
@@ -14,7 +14,7 @@ public class AttributesOnSeparateLines : DiagnosticAnalyzer
         private const string MessageFormat = "Attributes should be on separate lines";
         private const string Description = "All attributes should be on separate lines and be wrapped in their own braces.";
         private const string Category = "Formatting";
-        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title, 
+        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title,
             DiagnosticId);
 
         private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat,
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/NamingFieldPascalUnderscore.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/NamingFieldPascalUnderscore.cs
@@ -15,10 +15,10 @@ public class NamingFieldPascalUnderscore : DiagnosticAnalyzer
         private const string MessageFormat = "Field '{0}' should be named _PascalCase";
         private const string Description = "All fields should be in the format _PascalCase.";
         private const string Category = "Naming";
-        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title, 
+        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title,
             DiagnosticId);
 
-        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat, 
+        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat,
             Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description, _HelpLinkUri);
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(_Rule);
@@ -29,7 +29,7 @@ public override void Initialize(AnalysisContext context)
             {
                 throw new ArgumentNullException(nameof(context));
             }
-            
+
             context.EnableConcurrentExecution();
             context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
             context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Field);
@@ -45,7 +45,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context)
             {
                 return;
             }
-            
+
             //Enum members should not be flagged
             if (namedTypeSymbol.ContainingType.EnumUnderlyingType is not null)
             {
@@ -57,7 +57,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context)
                 return;
             }
 
-            if (namedTypeSymbol.Name.StartsWith("_", StringComparison.Ordinal) && namedTypeSymbol.Name.Length > 1 
+            if (namedTypeSymbol.Name.StartsWith("_", StringComparison.Ordinal) && namedTypeSymbol.Name.Length > 1
                                                      && Casing.IsPascalCase(namedTypeSymbol.Name.Skip(1)))
             {
                 return;
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/NamingPropertyPascal.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/NamingPropertyPascal.cs
@@ -15,11 +15,11 @@ public class NamingPropertyPascal : DiagnosticAnalyzer
         private const string MessageFormat = "Property '{0}' should be PascalCase";
         private const string Description = "All properties should be in the format PascalCase.";
         private const string Category = "Naming";
-        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title, 
+        private static readonly string _HelpLinkUri = DiagnosticUrlBuilder.GetUrl(Title,
             DiagnosticId);
 
-        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat, 
-            Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description,_HelpLinkUri);
+        private static readonly DiagnosticDescriptor _Rule = new(DiagnosticId, Title, MessageFormat,
+            Category, DiagnosticSeverity.Warning, isEnabledByDefault: true, description: Description, _HelpLinkUri);
 
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(_Rule);
 
@@ -29,7 +29,7 @@ public override void Initialize(AnalysisContext context)
             {
                 throw new ArgumentNullException(nameof(context));
             }
-            
+
             context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
             context.EnableConcurrentExecution();
             context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Property);
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/CodeFixes/AttributesOnSeparateLines.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/CodeFixes/AttributesOnSeparateLines.cs
@@ -6,8 +6,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/DescriptionAttribute.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/DescriptionAttribute.cs
@@ -6,7 +6,7 @@ namespace IntelliTect.Analyzer
     internal class DescriptionAttribute : Attribute
     {
         public static DescriptionAttribute Default { get; } = new DescriptionAttribute();
-        
+
         public string Description { get; }
 
         public DescriptionAttribute() : this(string.Empty)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ static AnalyzerTests()`
`23`	`23`	`[TestMethod]`
`24`	`24`	`public async Task RunOnSelf()`
`25`	`25`	`{`
`26`		`- await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer","IntelliTect.Analyzer.csproj")))`
	`26`	`+ await ProcessProject(new FileInfo(Path.Combine("..", "..", "..", "..", "IntelliTect.Analyzer", "IntelliTect.Analyzer.csproj")))`
`27`	`27`	`.ConfigureAwait(false);`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Microsoft.CodeAnalysis;`
`2`	`1`	`using System;`
	`2`	`+using Microsoft.CodeAnalysis;`
`3`	`3`
`4`	`4`	`namespace TestHelper`
`5`	`5`	`{`
`@@ -36,9 +36,9 @@ public DiagnosticResultLocation(string path, int line, int column)`
`36`	`36`	`public struct DiagnosticResult`
`37`	`37`	`{`
`38`	`38`	`private DiagnosticResultLocation[] _Locations;`
`39`		`-`
	`39`	`+`
`40`	`40`	`#pragma warning disable CA1819 // Properties should not return arrays`
`41`		`-`
	`41`	`+`
`42`	`42`	`public DiagnosticResultLocation[] Locations`
`43`	`43`	`{`
`44`	`44`	`get`
`@@ -52,7 +52,7 @@ public DiagnosticResultLocation[] Locations`
`52`	`52`	`_Locations = value;`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`-`
	`55`	`+`
`56`	`56`	`#pragma warning restore CA1819 // Properties should not return arrays`
`57`	`57`
`58`	`58`	`public DiagnosticSeverity Severity { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`		`-using Microsoft.CodeAnalysis;`
`2`		`-using Microsoft.CodeAnalysis.CSharp;`
`3`		`-using Microsoft.CodeAnalysis.Diagnostics;`
`4`		`-using Microsoft.CodeAnalysis.Text;`
`5`	`1`	`using System;`
`6`	`2`	`using System.Collections.Generic;`
`7`	`3`	`using System.Collections.Immutable;`
`8`	`4`	`using System.Linq;`
	`5`	`+using Microsoft.CodeAnalysis;`
	`6`	`+using Microsoft.CodeAnalysis.CSharp;`
	`7`	`+using Microsoft.CodeAnalysis.Diagnostics;`
	`8`	`+using Microsoft.CodeAnalysis.Text;`
`9`	`9`
`10`	`10`	`namespace TestHelper`
`11`	`11`	`{`
`@@ -52,7 +52,7 @@ protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(DiagnosticAnalyz`
`52`	`52`	`{`
`53`	`53`	`throw new ArgumentNullException(nameof(documents));`
`54`	`54`	`}`
`55`		`-`
	`55`	`+`
`56`	`56`	`var projects = new HashSet<Project>();`
`57`	`57`	`foreach (Document document in documents)`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ class TypeName`
`118`	`118`
`119`	`119`	`VerifyCSharpDiagnostic(test, expected);`
`120`	`120`	`}`
`121`		`-`
	`121`	`+`
`122`	`122`	`[TestMethod]`
`123`	`123`	`public void FieldWithNamingViolation_FieldTwoLeadingUnderScores_Warning()`
`124`	`124`	`{`
`@@ -224,7 +224,7 @@ class TypeName`
`224`	`224`	`}";`
`225`	`225`	`await VerifyCSharpFix(test, fixTest);`
`226`	`226`	`}`
`227`		`-`
	`227`	`+`
`228`	`228`	`[TestMethod]`
`229`	`229`	`public async Task FieldTwoLeadingUnderScores_CodeFix_FixNamingViolation_FieldIsNamedCorrectly()`
`230`	`230`	`{`
`@@ -368,7 +368,7 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object`
`368`	`368`
`369`	`369`	`VerifyCSharpDiagnostic(test);`
`370`	`370`	`}`
`371`		`-`
	`371`	`+`
`372`	`372`	`[TestMethod]`
`373`	`373`	`[Description("Issue 14")]`
`374`	`374`	`public void FieldWithNamingViolation_ClassHasGeneratedCodeAttribute_Ignored()`
`@@ -392,7 +392,7 @@ class TypeName`
`392`	`392`
`393`	`393`	`VerifyCSharpDiagnostic(test);`
`394`	`394`	`}`
`395`		`-`
	`395`	`+`
`396`	`396`	`[TestMethod]`
`397`	`397`	`[Description("Issue 14")]`
`398`	`398`	`public void FieldWithNamingViolation_FieldHasGeneratedCodeAttribute_Ignored()`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public void Foo()`
`117`	`117`	`var expected = new DiagnosticResult`
`118`	`118`	`{`
`119`	`119`	`Id = Analyzers.UnusedLocalVariable.DiagnosticId,`
`120`		`- Message = "Local variable 'foo' should be used",`
	`120`	`+ Message = "Local variable 'foo' should be used",`
`121`	`121`	`Severity = DiagnosticSeverity.Info,`
`122`	`122`	`Locations = new[]`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ private static string GetEnumAttributeValue<TAttribute>(Enum value, Func<TAttrib`
`10`	`10`	`{`
`11`	`11`	`FieldInfo fi = value.GetType().GetRuntimeField(value.ToString());`
`12`	`12`
`13`		`- var attributes = (TAttribute[]) fi?.GetCustomAttributes(typeof(TAttribute), false);`
	`13`	`+ var attributes = (TAttribute[])fi?.GetCustomAttributes(typeof(TAttribute), false);`
`14`	`14`
`15`	`15`	`return attributes?.Length > 0 ? valueAccessor(attributes[0]) : null;`
`16`	`16`	`}`