diff --git a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs index ea971cbd109828f113b471dd0903a235cd62835b..c48fdace957b818b06c37310049cb671f32695c6 100644 --- a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs +++ b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs @@ -149,7 +149,7 @@ private void UpdateNameConflictMarkers() public AddParameterDialogViewModel CreateAddParameterDialogViewModel() => new AddParameterDialogViewModel(_document, _positionForTypeBinding); - List CreateParameterViewModels(ImmutableArray parameters, ref int initialIndex) + private List CreateParameterViewModels(ImmutableArray parameters, ref int initialIndex) { var list = new List(); foreach (ExistingParameter existingParameter in parameters) diff --git a/src/VisualStudio/Core/Def/Implementation/CodeModel/ICodeModelInstanceFactory.cs b/src/VisualStudio/Core/Def/Implementation/CodeModel/ICodeModelInstanceFactory.cs index c7c83c53c71e4396606ce10e8888cc00175176a9..d647bfbfb700e28a039f75bd5844193f2766f272 100644 --- a/src/VisualStudio/Core/Def/Implementation/CodeModel/ICodeModelInstanceFactory.cs +++ b/src/VisualStudio/Core/Def/Implementation/CodeModel/ICodeModelInstanceFactory.cs @@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.CodeModel { - interface ICodeModelInstanceFactory + internal interface ICodeModelInstanceFactory { /// /// Requests the project system to create a through the project system. diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs index 26d4e9a0643135814d71e6b7d08b21a71d3a4275..bd0c19b24d8d3e2aaf0de03161bd4af385bfe45a 100644 --- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs +++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspSolutionProvider.cs @@ -17,7 +17,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.LanguageClient { [Export(typeof(ILspSolutionProvider)), Shared] - class VisualStudioLspSolutionProvider : ILspSolutionProvider + internal class VisualStudioLspSolutionProvider : ILspSolutionProvider { private readonly VisualStudioWorkspace _visualStudioWorkspace; private readonly MiscellaneousFilesWorkspace _miscellaneousFilesWorkspace; diff --git a/src/VisualStudio/Core/Def/Implementation/Preview/ChangeList.cs b/src/VisualStudio/Core/Def/Implementation/Preview/ChangeList.cs index 76876c1be054650a2ce1609a06b3f71d68c4df42..6a7b14f7e94ce33e2b6a3cdf14149111b09f4f44 100644 --- a/src/VisualStudio/Core/Def/Implementation/Preview/ChangeList.cs +++ b/src/VisualStudio/Core/Def/Implementation/Preview/ChangeList.cs @@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Implementation.Preview { internal partial class ChangeList : IVsPreviewChangesList, IVsLiteTreeList { - public readonly static ChangeList Empty = new ChangeList(Array.Empty()); + public static readonly ChangeList Empty = new ChangeList(Array.Empty()); internal AbstractChange[] Changes { get; } diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs index ea6e5f5392d39d3629b27db410391f603b42c910..e91abe40eac218b6f1d0d160ecc1576fbce00a3c 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs @@ -110,7 +110,7 @@ void IRunningDocumentTableEventListener.OnRenameDocument(string newMoniker, stri { } - public async static Task CreateAsync(VisualStudioWorkspaceImpl workspace, IAsyncServiceProvider asyncServiceProvider) + public static async Task CreateAsync(VisualStudioWorkspaceImpl workspace, IAsyncServiceProvider asyncServiceProvider) { var runningDocumentTable = (IVsRunningDocumentTable)await asyncServiceProvider.GetServiceAsync(typeof(SVsRunningDocumentTable)).ConfigureAwait(true); var componentModel = (IComponentModel)await asyncServiceProvider.GetServiceAsync(typeof(SComponentModel)).ConfigureAwait(true); diff --git a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb index 676abecb32128e54baf513c46aeba3cbf5a8600b..35c426bf66118d336ec3bfc8f690a8613b2cb959 100644 --- a/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb +++ b/src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb @@ -17,7 +17,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ObjectBrowser Private ReadOnly _workspace As TestWorkspace Private ReadOnly _libraryManager As AbstractObjectBrowserLibraryManager - Sub New(workspace As TestWorkspace, libraryManager As AbstractObjectBrowserLibraryManager) + Public Sub New(workspace As TestWorkspace, libraryManager As AbstractObjectBrowserLibraryManager) _workspace = workspace _libraryManager = libraryManager End Sub diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpF1Help.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpF1Help.cs index 554210e8840ba8597da3aeff87717f761b99ccd4..8040de044ee73189798cea95da6dc7a4f7ac8a8b 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpF1Help.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpF1Help.cs @@ -22,7 +22,7 @@ public CSharpF1Help(VisualStudioInstanceFactory instanceFactory, ITestOutputHelp } [WpfFact, Trait(Traits.Feature, Traits.Features.F1Help)] - void F1Help() + private void F1Help() { var text = @" using System; diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicF1Help.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicF1Help.cs index b8c2d3d615aa6e1c42c5dd264190ab671e55ea8d..32d5522127fac7efa950f469af583e0271e61a7e 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicF1Help.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicF1Help.cs @@ -22,7 +22,7 @@ public BasicF1Help(VisualStudioInstanceFactory instanceFactory, ITestOutputHelpe } [WpfFact, Trait(Traits.Feature, Traits.Features.F1Help)] - void F1Help() + private void F1Help() { var text = @" Imports System diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs index ae36deb7a5207f0aea766c422135dc8243320bcb..7cd75f551ae115e722c2e6cf40dec33cf30707d8 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/VisualBasic/BasicLineCommit.cs @@ -24,7 +24,7 @@ public BasicLineCommit(VisualStudioInstanceFactory instanceFactory, ITestOutputH } [WpfFact, Trait(Traits.Feature, Traits.Features.LineCommit)] - void CaseCorrection() + private void CaseCorrection() { VisualStudio.Editor.SetText(@"Module Goo Sub M() @@ -38,7 +38,7 @@ End Sub } [WpfFact, Trait(Traits.Feature, Traits.Features.LineCommit)] - void UndoWithEndConstruct() + private void UndoWithEndConstruct() { VisualStudio.Editor.SetText(@"Module Module1 Sub Main() @@ -56,7 +56,7 @@ End Sub } [WpfFact, Trait(Traits.Feature, Traits.Features.LineCommit)] - void UndoWithoutEndConstruct() + private void UndoWithoutEndConstruct() { VisualStudio.Editor.SetText(@"Module Module1 @@ -80,7 +80,7 @@ End Sub } [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/34637"), Trait(Traits.Feature, Traits.Features.LineCommit)] - void CommitOnSave() + private void CommitOnSave() { VisualStudio.Editor.SetText(@"Module Module1 Sub Main() @@ -98,7 +98,7 @@ End Module } [WpfFact, Trait(Traits.Feature, Traits.Features.LineCommit)] - void CommitOnFocusLost() + private void CommitOnFocusLost() { VisualStudio.Editor.SetText(@"Module M Sub M() @@ -118,7 +118,7 @@ End Sub } [WpfFact, Trait(Traits.Feature, Traits.Features.LineCommit)] - void CommitOnFocusLostDoesNotFormatWithPrettyListingOff() + private void CommitOnFocusLostDoesNotFormatWithPrettyListingOff() { try { diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/MoveToNamespaceDialog_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/MoveToNamespaceDialog_InProc.cs index 9005bd58361cc1905ff360440f012feb9e39e0b2..c57d309bf91fcdb085327d37eab1bebe5f0ed260 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/MoveToNamespaceDialog_InProc.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/MoveToNamespaceDialog_InProc.cs @@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.IntegrationTest.Utilities.InProcess { - class MoveToNamespaceDialog_InProc : AbstractCodeRefactorDialog_InProc + internal class MoveToNamespaceDialog_InProc : AbstractCodeRefactorDialog_InProc { private MoveToNamespaceDialog_InProc() { diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudio_InProc.cs b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudio_InProc.cs index 13b7fd41467d6a5229951a264efa9051d21e88ab..32a8a07de4abb4b0189d7c8b082e34c436158466 100644 --- a/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudio_InProc.cs +++ b/src/VisualStudio/IntegrationTest/TestUtilities/InProcess/VisualStudio_InProc.cs @@ -20,13 +20,13 @@ public static VisualStudio_InProc Create() public new void WaitForApplicationIdle(TimeSpan timeout) => InProcComponent.WaitForApplicationIdle(timeout); - new public void WaitForSystemIdle() + public new void WaitForSystemIdle() => InProcComponent.WaitForSystemIdle(); - new public bool IsCommandAvailable(string commandName) + public new bool IsCommandAvailable(string commandName) => InProcComponent.IsCommandAvailable(commandName); - new public void ExecuteCommand(string commandName, string args = "") + public new void ExecuteCommand(string commandName, string args = "") => InProcComponent.ExecuteCommand(commandName, args); public string[] GetAvailableCommands() diff --git a/src/VisualStudio/LiveShare/Impl/Client/Projects/IRemoteProjectInfoProvider.cs b/src/VisualStudio/LiveShare/Impl/Client/Projects/IRemoteProjectInfoProvider.cs index ee400b085beb26d4171acea694aa628b62d5fbff..7859963956a2633422f01cc823a608bffa702aef 100644 --- a/src/VisualStudio/LiveShare/Impl/Client/Projects/IRemoteProjectInfoProvider.cs +++ b/src/VisualStudio/LiveShare/Impl/Client/Projects/IRemoteProjectInfoProvider.cs @@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.LanguageServices.LiveShare.Client.Projects { - interface IRemoteProjectInfoProvider + internal interface IRemoteProjectInfoProvider { Task> GetRemoteProjectInfosAsync(CancellationToken cancellationToken); } diff --git a/src/VisualStudio/LiveShare/Impl/LiveShareConstants.cs b/src/VisualStudio/LiveShare/Impl/LiveShareConstants.cs index e1127567995e47247f98e06052263634d89f0e76..0e82ee649e3537c5098a5f899b5182a90746cd82 100644 --- a/src/VisualStudio/LiveShare/Impl/LiveShareConstants.cs +++ b/src/VisualStudio/LiveShare/Impl/LiveShareConstants.cs @@ -4,7 +4,7 @@ namespace Microsoft.VisualStudio.LanguageServices.LiveShare { - class LiveShareConstants + internal class LiveShareConstants { // The service name for an LSP server implemented using Roslyn designed to be used with the Roslyn client public const string RoslynContractName = "Roslyn"; diff --git a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestHelpers.vb b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestHelpers.vb index e1b44559b21de296c9e012f3207f68c35e17da45..01fb3bdcd920b12c4ea7db2504ca4f7421592b87 100644 --- a/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestHelpers.vb +++ b/src/VisualStudio/TestUtilities2/CodeModel/CodeModelTestHelpers.vb @@ -29,7 +29,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.CodeModel Public SystemWindowsFormsPath As String Public SystemDrawingPath As String +#Disable Warning IDE0040 ' Add accessibility modifiers - https://github.com/dotnet/roslyn/issues/45962 Sub New() +#Enable Warning IDE0040 ' Add accessibility modifiers SystemWindowsFormsPath = GetType(System.Windows.Forms.Form).Assembly.Location SystemDrawingPath = GetType(System.Drawing.Point).Assembly.Location End Sub diff --git a/src/VisualStudio/TestUtilities2/VisualStudioTestExportProvider.vb b/src/VisualStudio/TestUtilities2/VisualStudioTestExportProvider.vb index 091eb4c4617358c3afe9c87d165248b0bcbc16ab..a51388fe234b796ae733ebfcd3fd484eb237fbbd 100644 --- a/src/VisualStudio/TestUtilities2/VisualStudioTestExportProvider.vb +++ b/src/VisualStudio/TestUtilities2/VisualStudioTestExportProvider.vb @@ -13,7 +13,9 @@ Imports Microsoft.CodeAnalysis.Editor.UnitTests Namespace Microsoft.VisualStudio.LanguageServices.UnitTests Public Module VisualStudioTestExportProvider +#Disable Warning IDE0040 ' Add accessibility modifiers - https://github.com/dotnet/roslyn/issues/45962 Sub New() +#Enable Warning IDE0040 ' Add accessibility modifiers Dim additionalAssemblies = {GetType(CSharpCodeModelService).Assembly, GetType(VisualBasicCodeModelService).Assembly}