Enable CA1822: Mark private members as static (PowerShell#13897)

xtqqczze · web-flow · commit aecada3e67a8 · 2020-12-09T11:04:23.000-08:00
diff --git a/.globalconfig b/.globalconfig
@@ -280,7 +280,8 @@ dotnet_diagnostic.CA1820.severity = none
 dotnet_diagnostic.CA1821.severity = warning
 
 # CA1822: Mark members as static
-dotnet_diagnostic.CA1822.severity = suggestion
+dotnet_diagnostic.CA1822.severity = warning
+dotnet_code_quality.ca1822.api_surface = private
 
 # CA1823: Avoid unused private fields
 dotnet_diagnostic.CA1823.severity = none
diff --git a/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs
@@ -33,7 +33,7 @@ protected override void Write(VT100Renderer renderer, ListBlock obj)
             renderer.WriteLine();
         }
 
-        private void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index)
+        private static void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index)
         {
             // For a numbered list, we need to make sure the index is incremented.
             foreach (var line in block)
diff --git a/src/TypeCatalogGen/TypeCatalogGen.cs b/src/TypeCatalogGen/TypeCatalogGen.cs
@@ -431,7 +431,7 @@ namespace System.Management.Automation
 {{
     internal partial class PowerShellAssemblyLoadContext
     {{
-        private Dictionary<string, string> InitializeTypeCatalog()
+        private static Dictionary<string, string> InitializeTypeCatalog()
         {{
             return new Dictionary<string, string>({0}, StringComparer.OrdinalIgnoreCase) {{";
             const string SourceEnd = @"
diff --git a/test/tools/WebListener/Controllers/LinkController.cs b/test/tools/WebListener/Controllers/LinkController.cs
@@ -109,7 +109,7 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
-        private string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel)
+        private static string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel)
         {
             return string.Format(Constants.LinkUriTemplate, baseUri, maxLinks, linkNumber, type, whitespace, rel);
         }
diff --git a/test/tools/WebListener/Controllers/ResponseController.cs b/test/tools/WebListener/Controllers/ResponseController.cs
@@ -99,7 +99,7 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
-        private List<T> GetSingleOrArray<T>(JToken token)
+        private static List<T> GetSingleOrArray<T>(JToken token)
         {
             if (token.HasValues)
             {
diff --git a/test/tools/WebListener/Controllers/ResumeController.cs b/test/tools/WebListener/Controllers/ResumeController.cs
@@ -91,7 +91,7 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
-        private RangeItemHeaderValue GetRange(string rangeHeader)
+        private static RangeItemHeaderValue GetRange(string rangeHeader)
         {
             return RangeHeaderValue.Parse(rangeHeader).Ranges.FirstOrDefault();
         }
diff --git a/test/xUnit/csharp/test_FileSystemProvider.cs b/test/xUnit/csharp/test_FileSystemProvider.cs
@@ -53,7 +53,7 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
-        private ExecutionContext GetExecutionContext()
+        private static ExecutionContext GetExecutionContext()
         {
             CultureInfo currentCulture = CultureInfo.CurrentCulture;
             PSHost hostInterface = new DefaultHost(currentCulture, currentCulture);
@@ -63,7 +63,7 @@ private ExecutionContext GetExecutionContext()
             return executionContext;
         }
 
-        private ProviderInfo GetProvider()
+        private static ProviderInfo GetProvider()
         {
             ExecutionContext executionContext = GetExecutionContext();
             SessionStateInternal sessionState = new SessionStateInternal(executionContext);
diff --git a/test/xUnit/csharp/test_PSConfiguration.cs b/test/xUnit/csharp/test_PSConfiguration.cs
@@ -366,7 +366,7 @@ public void SetupConfigFile4()
             CreateEmptyFile(currentUserConfigFile);
         }
 
-        private void CreateEmptyFile(string fileName)
+        private static void CreateEmptyFile(string fileName)
         {
             File.Create(fileName).Dispose();
         }
@@ -382,7 +382,7 @@ public void SetupConfigFile5()
             CreateBrokenConfigFile(currentUserConfigFile);
         }
 
-        private void CreateBrokenConfigFile(string fileName)
+        private static void CreateBrokenConfigFile(string fileName)
         {
             File.WriteAllText(fileName, "[abbra");
         }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected override void Write(VT100Renderer renderer, ListBlock obj)`
`33`	`33`	`renderer.WriteLine();`
`34`	`34`	`}`
`35`	`35`
`36`		`- private void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index)`
	`36`	`+ private static void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index)`
`37`	`37`	`{`
`38`	`38`	`// For a numbered list, we need to make sure the index is incremented.`
`39`	`39`	`foreach (var line in block)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public IActionResult Error()`
`109`	`109`	`return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });`
`110`	`110`	`}`
`111`	`111`
`112`		`- private string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel)`
	`112`	`+ private static string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel)`
`113`	`113`	`{`
`114`	`114`	`return string.Format(Constants.LinkUriTemplate, baseUri, maxLinks, linkNumber, type, whitespace, rel);`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public IActionResult Error()`
`99`	`99`	`return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });`
`100`	`100`	`}`
`101`	`101`
`102`		`- private List<T> GetSingleOrArray<T>(JToken token)`
	`102`	`+ private static List<T> GetSingleOrArray<T>(JToken token)`
`103`	`103`	`{`
`104`	`104`	`if (token.HasValues)`
`105`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public IActionResult Error()`
`91`	`91`	`return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });`
`92`	`92`	`}`
`93`	`93`
`94`		`- private RangeItemHeaderValue GetRange(string rangeHeader)`
	`94`	`+ private static RangeItemHeaderValue GetRange(string rangeHeader)`
`95`	`95`	`{`
`96`	`96`	`return RangeHeaderValue.Parse(rangeHeader).Ranges.FirstOrDefault();`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected virtual void Dispose(bool disposing)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- private ExecutionContext GetExecutionContext()`
	`56`	`+ private static ExecutionContext GetExecutionContext()`
`57`	`57`	`{`
`58`	`58`	`CultureInfo currentCulture = CultureInfo.CurrentCulture;`
`59`	`59`	`PSHost hostInterface = new DefaultHost(currentCulture, currentCulture);`
`@@ -63,7 +63,7 @@ private ExecutionContext GetExecutionContext()`
`63`	`63`	`return executionContext;`
`64`	`64`	`}`
`65`	`65`
`66`		`- private ProviderInfo GetProvider()`
	`66`	`+ private static ProviderInfo GetProvider()`
`67`	`67`	`{`
`68`	`68`	`ExecutionContext executionContext = GetExecutionContext();`
`69`	`69`	`SessionStateInternal sessionState = new SessionStateInternal(executionContext);`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public void SetupConfigFile4()`
`366`	`366`	`CreateEmptyFile(currentUserConfigFile);`
`367`	`367`	`}`
`368`	`368`
`369`		`- private void CreateEmptyFile(string fileName)`
	`369`	`+ private static void CreateEmptyFile(string fileName)`
`370`	`370`	`{`
`371`	`371`	`File.Create(fileName).Dispose();`
`372`	`372`	`}`
`@@ -382,7 +382,7 @@ public void SetupConfigFile5()`
`382`	`382`	`CreateBrokenConfigFile(currentUserConfigFile);`
`383`	`383`	`}`
`384`	`384`
`385`		`- private void CreateBrokenConfigFile(string fileName)`
	`385`	`+ private static void CreateBrokenConfigFile(string fileName)`
`386`	`386`	`{`
`387`	`387`	`File.WriteAllText(fileName, "[abbra");`
`388`	`388`	`}`