Enable CA1822 in Visual Studio layer

.editorconfig

@@ -301,6 +301,5 @@ dotnet_diagnostic.IDE2004.severity = warning
 
 [src/{VisualStudio}/**/*.{cs,vb}]
 # CA1822: Make member static
-# Not enforced as a build 'warning' for 'VisualStudio' layer due to large number of false positives from https://github.com/dotnet/roslyn-analyzers/issues/3857 and https://github.com/dotnet/roslyn-analyzers/issues/3858
-# Additionally, there is a risk of accidentally breaking an internal API that partners rely on though IVT.
-dotnet_diagnostic.CA1822.severity = suggestion
+# There is a risk of accidentally breaking an internal API that partners rely on though IVT.
+dotnet_code_quality.CA1822.api_surface = private

src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.CodeModelEventCollector.cs

@@ -30,7 +30,7 @@ public CodeModelEventCollector(AbstractCodeModelService codeModelService)
             {
             }
 
-            private IReadOnlyList<MemberDeclarationSyntax> GetValidMembers(SyntaxNode node)
+            private static IReadOnlyList<MemberDeclarationSyntax> GetValidMembers(SyntaxNode node)
             {
                 return CSharpCodeModelService
                     .GetChildMemberNodes(node)
@@ -708,10 +708,10 @@ private bool CompareBaseLists(BaseTypeDeclarationSyntax oldType, BaseTypeDeclara
                 return false;
             }
 
-            private bool CompareModifiers(MemberDeclarationSyntax oldMember, MemberDeclarationSyntax newMember)
+            private static bool CompareModifiers(MemberDeclarationSyntax oldMember, MemberDeclarationSyntax newMember)
                 => oldMember.GetModifierFlags() == newMember.GetModifierFlags();
 
-            private bool CompareModifiers(ParameterSyntax oldParameter, ParameterSyntax newParameter)
+            private static bool CompareModifiers(ParameterSyntax oldParameter, ParameterSyntax newParameter)
                 => oldParameter.GetParameterFlags() == newParameter.GetParameterFlags();
 
             private bool CompareNames(NameSyntax oldName, NameSyntax newName)
@@ -826,7 +826,7 @@ private bool CompareTypes(TypeSyntax oldType, TypeSyntax newType)
                 return false;
             }
 
-            private TypeSyntax GetReturnType(BaseMethodDeclarationSyntax method)
+            private static TypeSyntax GetReturnType(BaseMethodDeclarationSyntax method)
             {
                 if (method is MethodDeclarationSyntax methodDecl)
                 {
@@ -968,7 +968,7 @@ protected override void EnqueueRemoveEvent(SyntaxNode node, SyntaxNode parent, C
                 }
             }
 
-            private void AddEventToEventQueueForAttributes(AttributeSyntax attribute, SyntaxNode parent, Action<SyntaxNode, SyntaxNode> enqueueAddOrRemoveEvent)
+            private static void AddEventToEventQueueForAttributes(AttributeSyntax attribute, SyntaxNode parent, Action<SyntaxNode, SyntaxNode> enqueueAddOrRemoveEvent)
             {
                 if (parent is BaseFieldDeclarationSyntax baseField)
                 {

src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.NodeLocator.cs

@@ -132,7 +132,7 @@ private class NodeLocator : AbstractNodeLocator
                 }
             }
 
-            private VirtualTreePoint GetBodyStartPoint(SourceText text, SyntaxToken openBrace)
+            private static VirtualTreePoint GetBodyStartPoint(SourceText text, SyntaxToken openBrace)
             {
                 Debug.Assert(!openBrace.IsMissing);
 
@@ -208,7 +208,7 @@ private VirtualTreePoint GetBodyStartPoint(SourceText text, OptionSet options, S
                 }
             }
 
-            private VirtualTreePoint GetBodyEndPoint(SourceText text, SyntaxToken closeBrace)
+            private static VirtualTreePoint GetBodyEndPoint(SourceText text, SyntaxToken closeBrace)
             {
                 var closeBraceLine = text.Lines.GetLineFromPosition(closeBrace.SpanStart);
                 var textBeforeBrace = text.ToString(TextSpan.FromBounds(closeBraceLine.Start, closeBrace.SpanStart));
@@ -218,7 +218,7 @@ private VirtualTreePoint GetBodyEndPoint(SourceText text, SyntaxToken closeBrace
                     : new VirtualTreePoint(closeBrace.SyntaxTree, text, closeBrace.SpanStart);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, ArrowExpressionClauseSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, ArrowExpressionClauseSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -239,7 +239,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, ArrowExpressionClauseSyn
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, AttributeSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, AttributeSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -272,7 +272,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, AttributeSyntax node, En
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, AttributeArgumentSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, AttributeArgumentSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -302,7 +302,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, AttributeArgumentSyntax
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, BaseTypeDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, BaseTypeDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -429,7 +429,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, OptionSet options, BaseM
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private AccessorDeclarationSyntax FindFirstAccessorNode(BasePropertyDeclarationSyntax node)
+            private static AccessorDeclarationSyntax FindFirstAccessorNode(BasePropertyDeclarationSyntax node)
             {
                 if (node.AccessorList == null)
                 {
@@ -553,7 +553,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, OptionSet options, Acces
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, BaseNamespaceDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, BaseNamespaceDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -602,7 +602,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, BaseNamespaceDeclaration
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, DelegateDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, DelegateDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -642,7 +642,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, DelegateDeclarationSynta
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, UsingDirectiveSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, UsingDirectiveSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -675,7 +675,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, UsingDirectiveSyntax nod
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, VariableDeclaratorSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, VariableDeclaratorSyntax node, EnvDTE.vsCMPart part)
             {
                 var field = node.FirstAncestorOrSelf<BaseFieldDeclarationSyntax>();
                 int startPosition;
@@ -716,7 +716,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, VariableDeclaratorSyntax
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, EnumMemberDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, EnumMemberDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -756,7 +756,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, EnumMemberDeclarationSyn
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetStartPoint(SourceText text, ParameterSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetStartPoint(SourceText text, ParameterSyntax node, EnvDTE.vsCMPart part)
             {
                 int startPosition;
 
@@ -796,7 +796,7 @@ private VirtualTreePoint GetStartPoint(SourceText text, ParameterSyntax node, En
                 return new VirtualTreePoint(node.SyntaxTree, text, startPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, ArrowExpressionClauseSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, ArrowExpressionClauseSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -814,7 +814,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, ArrowExpressionClauseSynta
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, AttributeSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, AttributeSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -847,7 +847,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, AttributeSyntax node, EnvD
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, AttributeArgumentSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, AttributeArgumentSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -877,7 +877,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, AttributeArgumentSyntax no
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, BaseTypeDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, BaseTypeDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -918,7 +918,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, BaseTypeDeclarationSyntax
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, BaseMethodDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, BaseMethodDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -992,7 +992,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, BaseMethodDeclarationSynta
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, BasePropertyDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, BasePropertyDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1052,7 +1052,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, BasePropertyDeclarationSyn
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, AccessorDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, AccessorDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1091,7 +1091,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, AccessorDeclarationSyntax
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, DelegateDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, DelegateDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1132,7 +1132,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, DelegateDeclarationSyntax
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, BaseNamespaceDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, BaseNamespaceDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1181,7 +1181,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, BaseNamespaceDeclarationSy
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, UsingDirectiveSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, UsingDirectiveSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1214,7 +1214,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, UsingDirectiveSyntax node,
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, EnumMemberDeclarationSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, EnumMemberDeclarationSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 
@@ -1255,7 +1255,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, EnumMemberDeclarationSynta
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, VariableDeclaratorSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, VariableDeclaratorSyntax node, EnvDTE.vsCMPart part)
             {
                 var field = node.FirstAncestorOrSelf<BaseFieldDeclarationSyntax>();
                 int endPosition;
@@ -1297,7 +1297,7 @@ private VirtualTreePoint GetEndPoint(SourceText text, VariableDeclaratorSyntax n
                 return new VirtualTreePoint(node.SyntaxTree, text, endPosition);
             }
 
-            private VirtualTreePoint GetEndPoint(SourceText text, ParameterSyntax node, EnvDTE.vsCMPart part)
+            private static VirtualTreePoint GetEndPoint(SourceText text, ParameterSyntax node, EnvDTE.vsCMPart part)
             {
                 int endPosition;
 

src/VisualStudio/CSharp/Impl/CodeModel/CSharpCodeModelService.cs

@@ -1221,7 +1221,7 @@ public override SyntaxNode SetAccess(SyntaxNode node, EnvDTE.vsCMAccess newAcces
             return member.UpdateModifiers(modifierFlags);
         }
 
-        private IList<SyntaxTrivia> CollectComments(IList<SyntaxTrivia> triviaList)
+        private static IList<SyntaxTrivia> CollectComments(IList<SyntaxTrivia> triviaList)
         {
             var commentList = new List<SyntaxTrivia>();
 
@@ -2766,7 +2766,7 @@ private Document Delete(Document document, VariableDeclaratorSyntax node)
             }
         }
 
-        private Document Delete(Document document, EnumMemberDeclarationSyntax node)
+        private static Document Delete(Document document, EnumMemberDeclarationSyntax node)
         {
             var enumDeclaration = (EnumDeclarationSyntax)node.Parent!;
             var members = enumDeclaration.Members;
@@ -2786,7 +2786,7 @@ private Document Delete(Document document, EnumMemberDeclarationSyntax node)
             return document.ReplaceNodeSynchronously(enumDeclaration, newEnumDeclaration, CancellationToken.None);
         }
 
-        private Document Delete(Document document, AttributeSyntax node)
+        private static Document Delete(Document document, AttributeSyntax node)
         {
             var attributeList = node.FirstAncestorOrSelf<AttributeListSyntax>();
             Contract.ThrowIfNull(attributeList);
@@ -2813,7 +2813,7 @@ private Document Delete(Document document, AttributeSyntax node)
             }
         }
 
-        private Document Delete(Document document, AttributeArgumentSyntax node)
+        private static Document Delete(Document document, AttributeArgumentSyntax node)
         {
             var argumentList = node.FirstAncestorOrSelf<AttributeArgumentListSyntax>();
             Contract.ThrowIfNull(argumentList);
@@ -2823,7 +2823,7 @@ private Document Delete(Document document, AttributeArgumentSyntax node)
             return document.ReplaceNodeSynchronously(argumentList, newArgumentList, CancellationToken.None);
         }
 
-        private Document Delete(Document document, ParameterSyntax node)
+        private static Document Delete(Document document, ParameterSyntax node)
         {
             var parameterList = node.FirstAncestorOrSelf<ParameterListSyntax>();
             Contract.ThrowIfNull(parameterList);
@@ -2833,7 +2833,7 @@ private Document Delete(Document document, ParameterSyntax node)
             return document.ReplaceNodeSynchronously(parameterList, newParameterList, CancellationToken.None);
         }
 
-        private Document DeleteMember(Document document, SyntaxNode node)
+        private static Document DeleteMember(Document document, SyntaxNode node)
         {
             var text = document.GetTextSynchronously(CancellationToken.None);
 
@@ -3279,7 +3279,7 @@ private static MemberDeclarationSyntax GetMember(SyntaxNode container, int index
             throw Exceptions.ThrowEFail();
         }
 
-        private SyntaxNode EnsureAfterEndRegion(int index, SyntaxNode container)
+        private static SyntaxNode EnsureAfterEndRegion(int index, SyntaxNode container)
         {
             // If the next token after our member has only whitespace and #endregion as leading
             // trivia, we'll move that to be leading trivia of our member.

src/VisualStudio/CSharp/Impl/CodeModel/EndRegionFormattingRule.cs

@@ -18,7 +18,7 @@ private EndRegionFormattingRule()
         {
         }
 
-        private bool IsAfterEndRegionBeforeMethodDeclaration(SyntaxToken previousToken)
+        private static bool IsAfterEndRegionBeforeMethodDeclaration(SyntaxToken previousToken)
         {
             if (previousToken.Kind() == SyntaxKind.EndOfDirectiveToken)
             {

src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs

@@ -131,7 +131,7 @@ private string TryGetText(SyntaxToken token, SemanticModel semanticModel, Docume
             return string.Empty;
         }
 
-        private bool TryGetTextForSpecialCharacters(SyntaxToken token, out string text)
+        private static bool TryGetTextForSpecialCharacters(SyntaxToken token, out string text)
         {
             if (token.IsKind(SyntaxKind.InterpolatedStringStartToken) ||
                 token.IsKind(SyntaxKind.InterpolatedStringEndToken) ||