From 28af7910e89d0c9db2df08665a4ee76556039e0e Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Tue, 14 Jul 2020 06:54:39 -0700 Subject: [PATCH] Fix violations for IDE0036 (Order modifiers) and IDE0040 (Add accessibility modifiers) --- .../ChangeSignatureDialogViewModel.cs | 2 +- .../CodeModel/ICodeModelInstanceFactory.cs | 2 +- .../VisualStudioLspSolutionProvider.cs | 2 +- .../Core/Def/Implementation/Preview/ChangeList.cs | 2 +- .../VisualStudioWorkspaceImpl.OpenFileTracker.cs | 2 +- src/VisualStudio/Core/Test/ObjectBrowser/Helpers.vb | 2 +- .../IntegrationTests/CSharp/CSharpF1Help.cs | 2 +- .../IntegrationTests/VisualBasic/BasicF1Help.cs | 2 +- .../IntegrationTests/VisualBasic/BasicLineCommit.cs | 12 ++++++------ .../InProcess/MoveToNamespaceDialog_InProc.cs | 2 +- .../TestUtilities/InProcess/VisualStudio_InProc.cs | 6 +++--- .../Client/Projects/IRemoteProjectInfoProvider.cs | 2 +- .../LiveShare/Impl/LiveShareConstants.cs | 2 +- .../TestUtilities2/CodeModel/CodeModelTestHelpers.vb | 2 ++ .../TestUtilities2/VisualStudioTestExportProvider.vb | 2 ++ 15 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs index ea971cbd109..c48fdace957 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 c7c83c53c71..d647bfbfb70 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 26d4e9a0643..bd0c19b24d8 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 76876c1be05..6a7b14f7e94 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 ea6e5f5392d..e91abe40eac 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 676abecb321..35c426bf661 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 554210e8840..8040de044ee 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 b8c2d3d615a..32d5522127f 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 ae36deb7a52..7cd75f551ae 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 9005bd58361..c57d309bf91 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 13b7fd41467..32a8a07de4a 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 ee400b085be..7859963956a 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 e1127567995..0e82ee649e3 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 e1b44559b21..01fb3bdcd92 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 091eb4c4617..a51388fe234 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} -- GitLab