Enable CA1822 in Visual Studio layer

src/VisualStudio/CSharp/Test/GlyphExtensionsTests.cs

@@ -173,7 +173,7 @@ public void TestWithEventsMemberGlyph()
                 isWithEvents: true);
         }
 
-        private void TestGlyph(
+        private static void TestGlyph(
             StandardGlyphGroup expectedGlyphGroup,
             SymbolKind kind = SymbolKind.Method,
             Accessibility declaredAccessibility = Accessibility.NotApplicable,

src/VisualStudio/CSharp/Test/Interactive/Commands/ResetInteractiveTests.cs

@@ -26,7 +26,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Interactive.Commands
     [UseExportProvider]
     public class ResetInteractiveTests
     {
-        private string WorkspaceXmlStr =>
+        private const string WorkspaceXmlStr =
 @"<Workspace>
     <Project Language=""Visual Basic"" AssemblyName=""ResetInteractiveVisualBasicSubproject"" CommonReferences=""true"">
         <Document FilePath=""VisualBasicDocument""></Document>

src/VisualStudio/CSharp/Test/Options/OptionViewModelTests.cs

@@ -37,7 +37,7 @@ public object GetService(Type serviceType)
             }
         }
 
-        private string GetText(AbstractOptionPreviewViewModel viewModel)
+        private static string GetText(AbstractOptionPreviewViewModel viewModel)
         {
             return viewModel.TextViewHost.TextView.TextBuffer.CurrentSnapshot.GetText().ToString();
         }

src/VisualStudio/CSharp/Test/PersistentStorage/AbstractPersistentStorageTests.cs

@@ -81,16 +81,16 @@ public void Dispose()
             _persistentFolderRoot.Dispose();
         }
 
-        private string GetData1(Size size)
+        private static string GetData1(Size size)
             => size == Size.Small ? SmallData1 : size == Size.Medium ? MediumData1 : LargeData1;
 
-        private string GetData2(Size size)
+        private static string GetData2(Size size)
             => size == Size.Small ? SmallData2 : size == Size.Medium ? MediumData2 : LargeData2;
 
-        private Checksum? GetChecksum1(bool withChecksum)
+        private static Checksum? GetChecksum1(bool withChecksum)
             => withChecksum ? s_checksum1 : null;
 
-        private Checksum? GetChecksum2(bool withChecksum)
+        private static Checksum? GetChecksum2(bool withChecksum)
             => withChecksum ? s_checksum2 : null;
 
         [Fact]
@@ -248,7 +248,7 @@ public async Task PersistentService_Document_SimultaneousWrites()
             Assert.True(value < NumThreads);
         }
 
-        private void DoSimultaneousWrites(Func<string, Task> write)
+        private static void DoSimultaneousWrites(Func<string, Task> write)
         {
             var barrier = new Barrier(NumThreads);
             var countdown = new CountdownEvent(NumThreads);
@@ -812,7 +812,7 @@ public TestPersistentStorageLocationService()
             public override bool IsSupported(Workspace workspace) => true;
         }
 
-        private void DoSimultaneousReads(Func<Task<string>> read, string expectedValue)
+        private static void DoSimultaneousReads(Func<Task<string>> read, string expectedValue)
         {
             var barrier = new Barrier(NumThreads);
             var countdown = new CountdownEvent(NumThreads);

src/VisualStudio/Core/Test.Next/Services/PerformanceTrackerServiceTests.cs

@@ -113,7 +113,7 @@ private static IEnumerable<AnalyzerPerformanceInfo> CreateSnapshots(Dictionary<s
             }
         }
 
-        private (Dictionary<string, double[]> matrix, int dataCount) CreateMatrix(string testFile)
+        private static (Dictionary<string, double[]> matrix, int dataCount) CreateMatrix(string testFile)
         {
             var matrix = new Dictionary<string, double[]>();
 

src/VisualStudio/Core/Test/AnalyzerSupport/AnalyzerDependencyCheckerTests.vb

@@ -861,7 +861,7 @@ public class A
             Assert.False(ignorableAssemblyList.Includes(alpha))
         End Sub
 
-        Private Function BuildLibrary(directory As DisposableDirectory, fileContents As String, libraryName As String, ParamArray referenceNames As String()) As String
+        Private Shared Function BuildLibrary(directory As DisposableDirectory, fileContents As String, libraryName As String, ParamArray referenceNames As String()) As String
             Dim sourceFile = directory.CreateFile(libraryName + ".cs").WriteAllText(fileContents).Path
             Dim tempOut = Path.Combine(directory.Path, libraryName + ".out")
             Dim libraryOut = Path.Combine(directory.Path, libraryName + ".dll")

src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb

@@ -253,7 +253,7 @@ class MyClass
             Assert.True(viewModel.TrySubmit())
         End Sub
 
-        Private Sub AssertTypeBindingIconAndTextIs(viewModel As AddParameterDialogViewModel, currentIcon As String, expectedMessage As String)
+        Private Shared Sub AssertTypeBindingIconAndTextIs(viewModel As AddParameterDialogViewModel, currentIcon As String, expectedMessage As String)
             Assert.True(viewModel.TypeIsEmptyImage = If(NameOf(viewModel.TypeIsEmptyImage) = currentIcon, Visibility.Visible, Visibility.Collapsed))
             Assert.True(viewModel.TypeDoesNotParseImage = If(NameOf(viewModel.TypeDoesNotParseImage) = currentIcon, Visibility.Visible, Visibility.Collapsed))
             Assert.True(viewModel.TypeDoesNotBindImage = If(NameOf(viewModel.TypeDoesNotBindImage) = currentIcon, Visibility.Visible, Visibility.Collapsed))
@@ -262,7 +262,7 @@ class MyClass
             Assert.Equal(expectedMessage, viewModel.TypeBindsDynamicStatus)
         End Sub
 
-        Private Sub VerifyOpeningState(viewModel As AddParameterDialogViewModel)
+        Private Shared Sub VerifyOpeningState(viewModel As AddParameterDialogViewModel)
             Assert.True(viewModel.TypeBindsDynamicStatus = ServicesVSResources.Please_enter_a_type_name)
 
             Assert.True(viewModel.TypeIsEmptyImage = Visibility.Visible)
@@ -285,7 +285,7 @@ class MyClass
             Assert.Equal(ServicesVSResources.A_type_and_name_must_be_provided, message)
         End Sub
 
-        Private Function GetViewModelTestStateAsync(
+        Private Shared Function GetViewModelTestStateAsync(
             markup As XElement,
             languageName As String) As AddParameterViewModelTestState
 

src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb

@@ -393,23 +393,23 @@ class Goo
 
         End Sub
 
-        Private Sub AssertPermuted(permutation As Integer(), actualParameterList As List(Of ChangeSignatureDialogViewModel.ParameterViewModel), originalParameterList As ImmutableArray(Of IParameterSymbol))
+        Private Shared Sub AssertPermuted(permutation As Integer(), actualParameterList As List(Of ChangeSignatureDialogViewModel.ParameterViewModel), originalParameterList As ImmutableArray(Of IParameterSymbol))
             Dim finalParameterList = actualParameterList.Where(Function(p) Not p.IsRemoved)
             For index = 0 To permutation.Length - 1
                 Dim expected = originalParameterList(permutation(index))
                 Assert.Equal(expected, DirectCast(finalParameterList(index), ExistingParameterViewModel).ParameterSymbol)
             Next
         End Sub
 
-        Private Sub VerifyOpeningState(viewModel As ChangeSignatureDialogViewModel, openingSignatureDisplay As String)
+        Private Shared Sub VerifyOpeningState(viewModel As ChangeSignatureDialogViewModel, openingSignatureDisplay As String)
             Assert.Equal(openingSignatureDisplay, viewModel.TEST_GetSignatureDisplayText())
             Dim message As String = Nothing
             Assert.False(viewModel.CanSubmit(message))
             Assert.Equal(ServicesVSResources.You_must_change_the_signature, message)
             Assert.False(viewModel.CanMoveUp)
         End Sub
 
-        Private Sub VerifyParameterInfo(
+        Private Shared Sub VerifyParameterInfo(
             viewModel As ChangeSignatureDialogViewModel,
                 parameterIndex As Integer,
                 Optional modifier As String = Nothing,
@@ -446,7 +446,7 @@ class Goo
             End If
         End Sub
 
-        Private Async Function GetViewModelTestStateAsync(
+        Private Shared Async Function GetViewModelTestStateAsync(
             markup As XElement,
             languageName As String) As Tasks.Task(Of ChangeSignatureViewModelTestState)
 

src/VisualStudio/Core/Test/ClassView/SyncClassViewTests.vb

@@ -860,7 +860,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ClassView
 
 #End Region
 
-        Private Sub Test(
+        Private Shared Sub Test(
             workspaceDefinition As XElement,
             ParamArray presentationNodes As NodeVerifier()
         )

src/VisualStudio/Core/Test/CodeModel/AbstractCodeElementTests`1.vb

@@ -1109,13 +1109,13 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel
                 End Sub)
         End Sub
 
-        Private Sub TestAllParameterNamesByName(parameters As EnvDTE.CodeElements, expectedParameterNames() As String)
+        Private Shared Sub TestAllParameterNamesByName(parameters As EnvDTE.CodeElements, expectedParameterNames() As String)
             For index = 0 To expectedParameterNames.Count() - 1
                 Assert.NotNull(parameters.Item(expectedParameterNames(index)))
             Next
         End Sub
 
-        Private Sub TestAllParameterNamesByIndex(parameters As EnvDTE.CodeElements, expectedParameterNames() As String)
+        Private Shared Sub TestAllParameterNamesByIndex(parameters As EnvDTE.CodeElements, expectedParameterNames() As String)
             For index = 0 To expectedParameterNames.Count() - 1
                 ' index + 1 for Item because Parameters are not zero indexed
                 Assert.Equal(expectedParameterNames(index), parameters.Item(index + 1).Name)

src/VisualStudio/Core/Test/CommonControls/MemberSelectionViewModelTests.vb

@@ -153,15 +153,15 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CommonControls
             Assert.False(FindMemberByName("FooEvent", viewModel.Members).IsChecked)
         End Function
 
-        Private Function FindMemberByName(name As String, memberArray As ImmutableArray(Of PullMemberUpSymbolViewModel)) As PullMemberUpSymbolViewModel
+        Private Shared Function FindMemberByName(name As String, memberArray As ImmutableArray(Of PullMemberUpSymbolViewModel)) As PullMemberUpSymbolViewModel
             Dim member = memberArray.FirstOrDefault(Function(memberViewModel) memberViewModel.SymbolName.Equals(name))
             If (member Is Nothing) Then
                 Assert.True(False, $"No member called {name} found")
             End If
             Return member
         End Function
 
-        Private Async Function GetViewModelAsync(markup As XElement, languageName As String) As Task(Of MemberSelectionViewModel)
+        Private Shared Async Function GetViewModelAsync(markup As XElement, languageName As String) As Task(Of MemberSelectionViewModel)
             Dim workspaceXml =
             <Workspace>
                 <Project Language=<%= languageName %> CommonReferences="true">

src/VisualStudio/Core/Test/CommonControls/NewTypeDestinationSelectionViewModelTests.vb

@@ -211,7 +211,7 @@ class $$MyClass
             monitor.Detach()
         End Function
 
-        Private Async Function GetViewModelAsync(markup As XElement,
+        Private Shared Async Function GetViewModelAsync(markup As XElement,
                               languageName As String,
                               defaultTypeName As String,
                               Optional defaultNamespace As String = "",

src/VisualStudio/Core/Test/Completion/CSharpCompletionSnippetNoteTests.vb

@@ -129,7 +129,7 @@ class C
             End Using
         End Function
 
-        Private Function CreateCSharpSnippetExpansionNoteTestState(xElement As XElement, ParamArray snippetShortcuts As String()) As TestState
+        Private Shared Function CreateCSharpSnippetExpansionNoteTestState(xElement As XElement, ParamArray snippetShortcuts As String()) As TestState
             Dim state = TestStateFactory.CreateCSharpTestState(
                 xElement,
                 extraExportedTypes:=New List(Of Type) From {GetType(CSharpMockCompletionProvider), GetType(TestCSharpSnippetInfoService)})

src/VisualStudio/Core/Test/Completion/VisualBasicCompletionSnippetNoteTests.vb

@@ -78,7 +78,7 @@ End Class]]></document>
             End Using
         End Function
 
-        Private Function CreateVisualBasicSnippetExpansionNoteTestState(xElement As XElement, ParamArray snippetShortcuts As String()) As TestState
+        Private Shared Function CreateVisualBasicSnippetExpansionNoteTestState(xElement As XElement, ParamArray snippetShortcuts As String()) As TestState
             Dim state = TestStateFactory.CreateVisualBasicTestState(
                 xElement,
                 New List(Of Type) From {GetType(VisualBasicMockCompletionProvider), GetType(TestVisualBasicSnippetInfoService)})

src/VisualStudio/Core/Test/Diagnostics/DiagnosticTableDataSourceTests.vb

@@ -775,7 +775,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Diagnostics
             End Using
         End Function
 
-        Private Sub RunCompilerAnalyzer(workspace As TestWorkspace)
+        Private Shared Sub RunCompilerAnalyzer(workspace As TestWorkspace)
             Dim snapshot = workspace.CurrentSolution
 
             Dim analyzerService = Assert.IsType(Of DiagnosticAnalyzerService)(workspace.ExportProvider.GetExportedValue(Of IDiagnosticAnalyzerService)())
@@ -786,11 +786,11 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Diagnostics
             service.GetTestAccessor().WaitUntilCompletion(workspace, SpecializedCollections.SingletonEnumerable(analyzerService.CreateIncrementalAnalyzer(workspace)).WhereNotNull().ToImmutableArray())
         End Sub
 
-        Private Function CreateItem(documentId As DocumentId, Optional severity As DiagnosticSeverity = DiagnosticSeverity.Error) As DiagnosticData
+        Private Shared Function CreateItem(documentId As DocumentId, Optional severity As DiagnosticSeverity = DiagnosticSeverity.Error) As DiagnosticData
             Return CreateItem(documentId.ProjectId, documentId, severity)
         End Function
 
-        Private Function CreateItem(projectId As ProjectId, documentId As DocumentId, Optional severity As DiagnosticSeverity = DiagnosticSeverity.Error, Optional link As String = Nothing) As DiagnosticData
+        Private Shared Function CreateItem(projectId As ProjectId, documentId As DocumentId, Optional severity As DiagnosticSeverity = DiagnosticSeverity.Error, Optional link As String = Nothing) As DiagnosticData
             Return New DiagnosticData(
                 id:="test",
                 category:="test",

src/VisualStudio/Core/Test/Diagnostics/TodoListTableDataSourceTests.vb

@@ -359,7 +359,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Diagnostics
             End Using
         End Sub
 
-        Private Function CreateItem(documentId As DocumentId) As TodoCommentData
+        Private Shared Function CreateItem(documentId As DocumentId) As TodoCommentData
             Return New TodoCommentData(
                 priority:=0,
                 message:="test",

src/VisualStudio/Core/Test/ExtractInterface/ExtractInterfaceViewModelTests.vb

@@ -272,7 +272,7 @@ public class $$MyClass
             Assert.Equal("Goo(string)", viewModel.MemberContainers.ElementAt(4).SymbolName)
         End Function
 
-        Private Async Function GetViewModelAsync(markup As XElement,
+        Private Shared Async Function GetViewModelAsync(markup As XElement,
                               languageName As String,
                               defaultInterfaceName As String,
                               Optional defaultNamespace As String = "",

src/VisualStudio/Core/Test/GenerateType/GenerateTypeViewModelTests.vb

@@ -806,12 +806,12 @@ namespace A
             File.Delete(pathString)
         End Function
 
-        Private Function PopulateProjectFolders(list As List(Of String), ParamArray values As String()) As List(Of String)
+        Private Shared Function PopulateProjectFolders(list As List(Of String), ParamArray values As String()) As List(Of String)
             list.AddRange(values)
             Return list
         End Function
 
-        Private Function GetOneProjectWorkspace(
+        Private Shared Function GetOneProjectWorkspace(
             documentContent As XElement,
             languageName As String,
             projectName As String,

src/VisualStudio/Core/Test/GoToDefinition/GoToDefinitionApiTests.vb

@@ -16,7 +16,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.GoToDefinition
     <[UseExportProvider]>
     Public Class GoToDefinitionApiTests
 
-        Private Async Function TestAsync(workspaceDefinition As XElement, expectSuccess As Boolean) As Tasks.Task
+        Private Shared Async Function TestAsync(workspaceDefinition As XElement, expectSuccess As Boolean) As Tasks.Task
             Using workspace = TestWorkspace.Create(workspaceDefinition, composition:=GoToTestHelpers.Composition)
                 Dim solution = workspace.CurrentSolution
                 Dim cursorDocument = workspace.Documents.First(Function(d) d.CursorPosition.HasValue)

src/VisualStudio/Core/Test/LanguageBlockTests.vb

@@ -233,7 +233,7 @@ System.Console$$.WriteLine(message)
 ", LanguageNames.VisualBasic, SourceCodeKind.Regular)
         End Sub
 
-        Private Sub VerifyNoBlock(markup As String, languageName As String, Optional sourceCodeKind As SourceCodeKind = SourceCodeKind.Regular)
+        Private Shared Sub VerifyNoBlock(markup As String, languageName As String, Optional sourceCodeKind As SourceCodeKind = SourceCodeKind.Regular)
             Dim xml = <Workspace>
                           <Project Language=<%= languageName %> CommonReferences="True">
                               <Document>
@@ -257,7 +257,7 @@ System.Console$$.WriteLine(message)
             End Using
         End Sub
 
-        Private Sub VerifyBlock(markup As String, languageName As String, expectedDescription As String)
+        Private Shared Sub VerifyBlock(markup As String, languageName As String, expectedDescription As String)
             Dim xml = <Workspace>
                           <Project Language=<%= languageName %> CommonReferences="True">
                               <Document>

src/VisualStudio/Core/Test/MoveToNamespace/MoveToNamespaceDialogViewModelTests.vb

@@ -70,7 +70,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.MoveToNamespace
             Assert.False(viewModel.ShowMessage)
         End Sub
 
-        Private Function CreateViewModel(Optional defaultNamespace As String = Nothing, Optional availableNamespaces As ImmutableArray(Of String) = Nothing) As MoveToNamespaceDialogViewModel
+        Private Shared Function CreateViewModel(Optional defaultNamespace As String = Nothing, Optional availableNamespaces As ImmutableArray(Of String) = Nothing) As MoveToNamespaceDialogViewModel
             If (defaultNamespace Is Nothing) Then
                 defaultNamespace = "Default.Namespace"
             End If

src/VisualStudio/Core/Test/Preview/PreviewChangesTests.vb

@@ -357,13 +357,13 @@ End Class
             Next
         End Sub
 
-        Private Sub AssertChildCount(list As ChangeList, count As UInteger)
+        Private Shared Sub AssertChildCount(list As ChangeList, count As UInteger)
             Dim actualCount As UInteger = Nothing
             list.GetItemCount(actualCount)
             Assert.Equal(count, actualCount)
         End Sub
 
-        Private Sub AssertChildText(list As ChangeList, index As UInteger, text As String)
+        Private Shared Sub AssertChildText(list As ChangeList, index As UInteger, text As String)
             Dim actualText As String = Nothing
             list.GetText(index, Nothing, actualText)
             Assert.Equal(text, actualText)

src/VisualStudio/Core/Test/Progression/GraphNodeCreationTests.vb

@@ -14,7 +14,7 @@ Imports Roslyn.Test.Utilities
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
     <UseExportProvider, Trait(Traits.Feature, Traits.Features.Progression)>
     Public Class GraphNodeCreationTests
-        Private Async Function AssertCreatedNodeIsAsync(code As String, expectedId As String, xml As XElement, Optional language As String = "C#") As Task
+        Private Shared Async Function AssertCreatedNodeIsAsync(code As String, expectedId As String, xml As XElement, Optional language As String = "C#") As Task
             Using testState = ProgressionTestState.Create(
                 <Workspace>
                     <Project Language=<%= language %> CommonReferences="true" FilePath="Z:\Project.csproj">

src/VisualStudio/Core/Test/Progression/GraphNodeIdTests.vb

@@ -11,7 +11,7 @@ Imports Roslyn.Test.Utilities
 Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.Progression
     <UseExportProvider, Trait(Traits.Feature, Traits.Features.Progression)>
     Public Class GraphNodeIdTests
-        Private Async Function AssertMarkedNodeIdIsAsync(code As String, expectedId As String, Optional language As String = "C#", Optional symbolTransform As Func(Of ISymbol, ISymbol) = Nothing) As Task
+        Private Shared Async Function AssertMarkedNodeIdIsAsync(code As String, expectedId As String, Optional language As String = "C#", Optional symbolTransform As Func(Of ISymbol, ISymbol) = Nothing) As Task
             Using testState = ProgressionTestState.Create(
                 <Workspace>
                     <Project Language=<%= language %> CommonReferences="true" FilePath="Z:\Project.csproj">