Skip to content

Fix IDE0044: MakeFieldReadonly part 15 #13970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 1 commit into from
Nov 5, 2020
Merged

Fix IDE0044: MakeFieldReadonly part 15 #13970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/System.Management.Automation/namespaces/CoreCommandContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal sealed class CmdletProviderContext
[Dbg.TraceSourceAttribute(
"CmdletProviderContext",
"The context under which a core command is being run.")]
private static Dbg.PSTraceSource s_tracer =
private static readonly Dbg.PSTraceSource s_tracer =
Dbg.PSTraceSource.GetTracer("CmdletProviderContext",
"The context under which a core command is being run.");

Expand Down Expand Up @@ -294,12 +294,12 @@ internal CmdletProviderContext(
/// If the constructor that takes a context to copy is
/// called, this will be set to the context being copied.
/// </summary>
private CmdletProviderContext _copiedContext;
private readonly CmdletProviderContext _copiedContext;

/// <summary>
/// The credentials under which the operation should run.
/// </summary>
private PSCredential _credentials = PSCredential.Empty;
private readonly PSCredential _credentials = PSCredential.Empty;

/// <summary>
/// The force parameter gives guidance to providers on how vigorously they
Expand All @@ -312,7 +312,7 @@ internal CmdletProviderContext(
/// made visible to anyone and should only be set through the
/// constructor.
/// </summary>
private Cmdlet _command;
private readonly Cmdlet _command;

/// <summary>
/// This makes the origin of the provider request visible to the internals.
Expand All @@ -327,7 +327,7 @@ internal CmdletProviderContext(
/// If it is false, the objects will be accumulated until the
/// GetErrorObjects method is called.
/// </summary>
private bool _streamErrors;
private readonly bool _streamErrors;

/// <summary>
/// A collection in which objects that are written using the WriteObject(s)
Expand Down
30 changes: 15 additions & 15 deletions src/System.Management.Automation/namespaces/FileSystemContentStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,33 @@ internal class FileSystemContentReaderWriter : IContentReader, IContentWriter
[Dbg.TraceSourceAttribute(
"FileSystemContentStream",
"The provider content reader and writer for the file system")]
private static Dbg.PSTraceSource s_tracer =
private static readonly Dbg.PSTraceSource s_tracer =
Dbg.PSTraceSource.GetTracer("FileSystemContentStream",
"The provider content reader and writer for the file system");

#endregion tracer

private string _path;
private string _streamName;
private FileMode _mode;
private FileAccess _access;
private FileShare _share;
private Encoding _encoding;
private CmdletProvider _provider;
private readonly string _path;
private readonly string _streamName;
private readonly FileMode _mode;
private readonly FileAccess _access;
private readonly FileShare _share;
private readonly Encoding _encoding;
private readonly CmdletProvider _provider;

private FileStream _stream;
private StreamReader _reader;
private StreamWriter _writer;
private bool _usingByteEncoding;
private readonly bool _usingByteEncoding;

private const char DefaultDelimiter = '\n';

private string _delimiter = $"{DefaultDelimiter}";
private int[] _offsetDictionary;
private bool _usingDelimiter;
private StringBuilder _currentLineContent;
private readonly string _delimiter = $"{DefaultDelimiter}";
private readonly int[] _offsetDictionary;
private readonly bool _usingDelimiter;
private readonly StringBuilder _currentLineContent;
private bool _waitForChanges;
private bool _isRawStream;
private readonly bool _isRawStream;
private long _fileOffset;

private FileAttributes _oldAttributes;
Expand All @@ -75,7 +75,7 @@ internal class FileSystemContentReaderWriter : IContentReader, IContentWriter
private bool _alreadyDetectEncoding = false;

// False to add a newline to the end of the output string, true if not.
private bool _suppressNewline = false;
private readonly bool _suppressNewline = false;

/// <summary>
/// Constructor for the content stream.
Expand Down
26 changes: 13 additions & 13 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public sealed partial class FileSystemProvider : NavigationCmdletProvider,
/// using "FileSystemProvider" as the category.
/// </summary>
[Dbg.TraceSourceAttribute("FileSystemProvider", "The namespace navigation provider for the file system")]
private static Dbg.PSTraceSource s_tracer =
private static readonly Dbg.PSTraceSource s_tracer =
Dbg.PSTraceSource.GetTracer("FileSystemProvider", "The namespace navigation provider for the file system");

/// <summary>
Expand All @@ -90,7 +90,7 @@ public FileSystemProvider()

private Collection<WildcardPattern> _excludeMatcher = null;

private static System.IO.EnumerationOptions _enumerationOptions = new System.IO.EnumerationOptions
private static readonly System.IO.EnumerationOptions _enumerationOptions = new System.IO.EnumerationOptions
{
MatchType = MatchType.Win32,
MatchCasing = MatchCasing.CaseInsensitive,
Expand Down Expand Up @@ -7374,7 +7374,7 @@ private struct NetResource
/// </summary>
private class InodeTracker
{
private HashSet<(UInt64, UInt64)> _visitations;
private readonly HashSet<(UInt64, UInt64)> _visitations;

/// <summary>
/// Construct a new InodeTracker with an initial path.
Expand Down Expand Up @@ -7598,7 +7598,7 @@ internal FileSystemContentDynamicParametersBase(FileSystemProvider provider)
_provider = provider;
}

private FileSystemProvider _provider;
private readonly FileSystemProvider _provider;

/// <summary>
/// Gets or sets the encoding method used when
Expand Down Expand Up @@ -8830,9 +8830,9 @@ internal static class CopyFileRemoteUtils

internal const string PSCopyToSessionHelperName = @"PSCopyToSessionHelper";

private static string s_driveMaxSizeErrorFormatString = FileSystemProviderStrings.DriveMaxSizeError;
private static string s_PSCopyToSessionHelperDefinition = StringUtil.Format(PSCopyToSessionHelperDefinitionFormat, @"[ValidateNotNullOrEmpty()]", s_driveMaxSizeErrorFormatString);
private static string s_PSCopyToSessionHelperDefinitionRestricted = StringUtil.Format(PSCopyToSessionHelperDefinitionFormat, @"[ValidateUserDrive()]", s_driveMaxSizeErrorFormatString);
private static readonly string s_driveMaxSizeErrorFormatString = FileSystemProviderStrings.DriveMaxSizeError;
private static readonly string s_PSCopyToSessionHelperDefinition = StringUtil.Format(PSCopyToSessionHelperDefinitionFormat, @"[ValidateNotNullOrEmpty()]", s_driveMaxSizeErrorFormatString);
private static readonly string s_PSCopyToSessionHelperDefinitionRestricted = StringUtil.Format(PSCopyToSessionHelperDefinitionFormat, @"[ValidateUserDrive()]", s_driveMaxSizeErrorFormatString);

private const string PSCopyToSessionHelperDefinitionFormat = @"
param (
Expand Down Expand Up @@ -9281,13 +9281,13 @@ function PSCreateDirectoryOnRemoteSession
}}
";

private static string s_PSCopyToSessionHelper = functionToken + PSCopyToSessionHelperName + @"
private static readonly string s_PSCopyToSessionHelper = functionToken + PSCopyToSessionHelperName + @"
{
" + s_PSCopyToSessionHelperDefinition + @"
}
";

private static Hashtable s_PSCopyToSessionHelperFunction = new Hashtable() {
private static readonly Hashtable s_PSCopyToSessionHelperFunction = new Hashtable() {
{nameToken, PSCopyToSessionHelperName},
{definitionToken, s_PSCopyToSessionHelperDefinitionRestricted}
};
Expand All @@ -9298,8 +9298,8 @@ function PSCreateDirectoryOnRemoteSession

internal const string PSCopyFromSessionHelperName = @"PSCopyFromSessionHelper";

private static string s_PSCopyFromSessionHelperDefinition = StringUtil.Format(PSCopyFromSessionHelperDefinitionFormat, @"[ValidateNotNullOrEmpty()]");
private static string s_PSCopyFromSessionHelperDefinitionRestricted = StringUtil.Format(PSCopyFromSessionHelperDefinitionFormat, @"[ValidateUserDrive()]");
private static readonly string s_PSCopyFromSessionHelperDefinition = StringUtil.Format(PSCopyFromSessionHelperDefinitionFormat, @"[ValidateNotNullOrEmpty()]");
private static readonly string s_PSCopyFromSessionHelperDefinitionRestricted = StringUtil.Format(PSCopyFromSessionHelperDefinitionFormat, @"[ValidateUserDrive()]");

private const string PSCopyFromSessionHelperDefinitionFormat = @"
param (
Expand Down Expand Up @@ -9778,7 +9778,7 @@ PSGetPathDirAndFiles @params
}
";

private static Hashtable s_PSCopyFromSessionHelperFunction = new Hashtable() {
private static readonly Hashtable s_PSCopyFromSessionHelperFunction = new Hashtable() {
{nameToken, PSCopyFromSessionHelperName},
{definitionToken, s_PSCopyFromSessionHelperDefinitionRestricted}
};
Expand All @@ -9790,7 +9790,7 @@ PSGetPathDirAndFiles @params
internal const string PSCopyRemoteUtilsName = @"PSCopyRemoteUtils";

internal static readonly string PSCopyRemoteUtilsDefinition = StringUtil.Format(PSCopyRemoteUtilsDefinitionFormat, @"[ValidateNotNullOrEmpty()]", PSValidatePathFunction);
private static string s_PSCopyRemoteUtilsDefinitionRestricted = StringUtil.Format(PSCopyRemoteUtilsDefinitionFormat, @"[ValidateUserDrive()]", PSValidatePathFunction);
private static readonly string s_PSCopyRemoteUtilsDefinitionRestricted = StringUtil.Format(PSCopyRemoteUtilsDefinitionFormat, @"[ValidateUserDrive()]", PSValidatePathFunction);

private const string PSCopyRemoteUtilsDefinitionFormat = @"
param (
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/namespaces/LocationGlobber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal sealed class LocationGlobber
[Dbg.TraceSourceAttribute(
"LocationGlobber",
"The location globber converts PowerShell paths with glob characters to zero or more paths.")]
private static Dbg.PSTraceSource s_tracer =
private static readonly Dbg.PSTraceSource s_tracer =
Dbg.PSTraceSource.GetTracer("LocationGlobber",
"The location globber converts PowerShell paths with glob characters to zero or more paths.");

Expand All @@ -35,7 +35,7 @@ internal sealed class LocationGlobber
[Dbg.TraceSourceAttribute(
"PathResolution",
"Traces the path resolution algorithm.")]
private static Dbg.PSTraceSource s_pathResolutionTracer =
private static readonly Dbg.PSTraceSource s_pathResolutionTracer =
Dbg.PSTraceSource.GetTracer(
"PathResolution",
"Traces the path resolution algorithm.",
Expand Down Expand Up @@ -1654,7 +1654,7 @@ internal bool IsAbsolutePath(string path, out string driveName)
/// <summary>
/// The instance of session state on which this globber acts.
/// </summary>
private SessionState _sessionState;
private readonly SessionState _sessionState;

/// <summary>
/// Removes the back tick "`" from any of the glob characters in the path.
Expand Down
8 changes: 4 additions & 4 deletions src/System.Management.Automation/namespaces/PathInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public string ProviderPath
}

private string _providerPath;
private SessionState _sessionState;
private readonly SessionState _sessionState;

/// <summary>
/// Gets the MSH path that this object represents.
Expand All @@ -89,9 +89,9 @@ public string Path
}
}

private PSDriveInfo _drive;
private ProviderInfo _provider;
private string _path = string.Empty;
private readonly PSDriveInfo _drive;
private readonly ProviderInfo _provider;
private readonly string _path = string.Empty;

/// <summary>
/// Gets a string representing the MSH path.
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/namespaces/ProviderDeclarationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public CmdletProviderAttribute(
ProviderCapabilities = providerCapabilities;
}

private char[] _illegalCharacters = new char[] { ':', '\\', '[', ']', '?', '*' };
private readonly char[] _illegalCharacters = new char[] { ':', '\\', '[', ']', '?', '*' };

/// <summary>
/// Gets the name of the provider.
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/namespaces/RegistryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public sealed partial class RegistryProvider :
[Dbg.TraceSourceAttribute(
"RegistryProvider",
"The namespace navigation provider for the Windows Registry")]
private static Dbg.PSTraceSource s_tracer =
private static readonly Dbg.PSTraceSource s_tracer =
Dbg.PSTraceSource.GetTracer("RegistryProvider",
"The namespace navigation provider for the Windows Registry");

Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/namespaces/RegistryWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static object ConvertUIntToValueForRegistryIfNeeded(object value, Registr

internal class RegistryWrapper : IRegistryWrapper
{
private RegistryKey _regKey;
private readonly RegistryKey _regKey;

internal RegistryWrapper(RegistryKey regKey)
{
Expand Down Expand Up @@ -246,8 +246,8 @@ public ObjectSecurity GetAccessControl(AccessControlSections includeSections)

internal class TransactedRegistryWrapper : IRegistryWrapper
{
private TransactedRegistryKey _txRegKey;
private CmdletProvider _provider;
private readonly TransactedRegistryKey _txRegKey;
private readonly CmdletProvider _provider;

internal TransactedRegistryWrapper(TransactedRegistryKey txRegKey, CmdletProvider provider)
{
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/namespaces/SessionStateProviderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,8 @@ internal SessionStateProviderBaseContentReaderWriter(string path, SessionStatePr
_provider = provider;
}

private string _path;
private SessionStateProviderBase _provider;
private readonly string _path;
private readonly SessionStateProviderBase _provider;

/// <summary>
/// Reads the content from the item.
Expand Down