Set SA1214 to "Error" and resolved errors. (hardkoded#1843)

drawcode · Oct 8, 2021 · 6fefa07 · 6fefa07
1 parent 067321e
commit 6fefa07
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 17 deletions.
diff --git a/lib/PuppeteerSharp.ruleset b/lib/PuppeteerSharp.ruleset
@@ -30,7 +30,7 @@
     <Rule Id="SA1720" Action="None" /> <!-- Error SA1720: Name contains type-->
     <Rule Id="SA1300" Action="None" /> <!-- Error SA1300: Element 'iFrame' should begin with an uppercase letter (SA1300)-->
     <Rule Id="SA1500" Action="None" /> <!-- Error SA1500: Braces for multi-line statements should not share line (SA1500)-->
-    <Rule Id="SA1214" Action="None" /> <!-- Error SA1214: Readonly fields should appear before non-readonly fields (SA1214)-->
+    <Rule Id="SA1214" Action="Error" /> <!-- Error SA1214: Readonly fields should appear before non-readonly fields (SA1214)-->
     <Rule Id="SA1642" Action="None" /> <!-- Error SA1642: Constructor summary documentation should begin with standard text (SA1642) (PuppeteerSharp)-->
     <Rule Id="SA1013" Action="Error" /> <!-- Error SA1013: Closing brace should be preceded by a space. (SA1013) -->
     <Rule Id="SA1515" Action="None" /> <!-- Error SA1515: Single-line comment should be preceded by blank line (SA1515) -->

diff --git a/lib/PuppeteerSharp/Connection.cs b/lib/PuppeteerSharp/Connection.cs
@@ -39,10 +39,10 @@ internal Connection(string url, int delay, bool enqueueAsyncMessages, IConnectio
         }
 
         #region Private Members
-        private int _lastId;
         private readonly ConcurrentDictionary<int, MessageTask> _callbacks;
         private readonly ConcurrentDictionary<string, CDPSession> _sessions;
         private readonly AsyncDictionaryHelper<string, CDPSession> _asyncSessions;
+        private int _lastId;
         #endregion
 
         #region Properties

diff --git a/lib/PuppeteerSharp/FrameManager.cs b/lib/PuppeteerSharp/FrameManager.cs
@@ -14,12 +14,12 @@ namespace PuppeteerSharp
     internal class FrameManager
     {
         private readonly ConcurrentDictionary<int, ExecutionContext> _contextIdToContext;
-        private bool _ensureNewDocumentNavigation;
         private readonly ILogger _logger;
         private readonly ConcurrentDictionary<string, Frame> _frames;
-        private const string RefererHeaderName = "referer";
         private readonly AsyncDictionaryHelper<string, Frame> _asyncFrames;
         private readonly List<string> _isolatedWorlds = new List<string>();
+        private bool _ensureNewDocumentNavigation;
+        private const string RefererHeaderName = "referer";
         private const string UtilityWorldName = "__puppeteer_utility_world__";
 
         private FrameManager(CDPSession client, Page page, bool ignoreHTTPSErrors, TimeoutSettings timeoutSettings)

diff --git a/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs b/lib/PuppeteerSharp/Helpers/AsyncMessageQueue.cs
@@ -14,10 +14,10 @@ namespace PuppeteerSharp.Helpers
     /// </summary>
     internal class AsyncMessageQueue : IDisposable
     {
-        private bool _disposed;
         private readonly List<MessageTask> _pendingTasks;
         private readonly bool _enqueueAsyncMessages;
         private readonly ILogger _logger;
+        private bool _disposed;
 
         public AsyncMessageQueue(bool enqueueAsyncMessages, ILogger logger = null)
         {

diff --git a/lib/PuppeteerSharp/LifecycleWatcher.cs b/lib/PuppeteerSharp/LifecycleWatcher.cs
@@ -27,14 +27,14 @@ internal class LifecycleWatcher : IDisposable
         private readonly IEnumerable<string> _expectedLifecycle;
         private readonly int _timeout;
         private readonly string _initialLoaderId;
-        private Request _navigationRequest;
-        private bool _hasSameDocumentNavigation;
         private readonly TaskCompletionSource<bool> _newDocumentNavigationTaskWrapper;
         private readonly TaskCompletionSource<bool> _sameDocumentNavigationTaskWrapper;
         private readonly TaskCompletionSource<bool> _lifecycleTaskWrapper;
         private readonly TaskCompletionSource<bool> _terminationTaskWrapper;
         [SuppressMessage("Microsoft.Usage", "CA2213:DisposableFieldsShouldBeDisposed", Justification = "False positive, as it is disposed.")]
         private readonly CancellationTokenSource _terminationCancellationToken;
+        private Request _navigationRequest;
+        private bool _hasSameDocumentNavigation;
 
         public LifecycleWatcher(
             FrameManager frameManager,

diff --git a/lib/PuppeteerSharp/NetworkManager.cs b/lib/PuppeteerSharp/NetworkManager.cs
@@ -26,20 +26,21 @@ internal class NetworkManager
             new ConcurrentDictionary<string, FetchRequestPausedResponse>();
 
         private readonly ILogger _logger;
-        private Dictionary<string, string> _extraHTTPHeaders;
-        private Credentials _credentials;
         private readonly ConcurrentSet<string> _attemptedAuthentications = new ConcurrentSet<string>();
-        private bool _userRequestInterceptionEnabled;
-        private bool _protocolRequestInterceptionEnabled;
         private readonly bool _ignoreHTTPSErrors;
-        private bool _userCacheDisabled;
         private readonly InternalNetworkConditions _emulatedNetworkConditions = new InternalNetworkConditions
         {
             Offline = false,
             Upload = -1,
             Download = -1,
             Latency = 0,
         };
+
+        private Dictionary<string, string> _extraHTTPHeaders;
+        private Credentials _credentials;
+        private bool _userRequestInterceptionEnabled;
+        private bool _protocolRequestInterceptionEnabled;
+        private bool _userCacheDisabled;
         #endregion
 
         internal NetworkManager(CDPSession client, bool ignoreHTTPSErrors, FrameManager frameManager)

diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs
@@ -42,13 +42,13 @@ public class Page : IDisposable, IAsyncDisposable
         private readonly Dictionary<string, Delegate> _pageBindings;
         private readonly IDictionary<string, Worker> _workers;
         private readonly ILogger _logger;
+        private readonly TaskCompletionSource<bool> _closeCompletedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        private readonly TimeoutSettings _timeoutSettings;
+        private readonly ConcurrentDictionary<Guid, TaskCompletionSource<FileChooser>> _fileChooserInterceptors;
         private PageGetLayoutMetricsResponse _burstModeMetrics;
         private bool _screenshotBurstModeOn;
         private ScreenshotOptions _screenshotBurstModeOptions;
-        private readonly TaskCompletionSource<bool> _closeCompletedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
         private TaskCompletionSource<bool> _sessionClosedTcs;
-        private readonly TimeoutSettings _timeoutSettings;
-        private readonly ConcurrentDictionary<Guid, TaskCompletionSource<FileChooser>> _fileChooserInterceptors;
 
         private static readonly Dictionary<string, decimal> _unitToPixels = new Dictionary<string, decimal> {
             { "px", 1 },

diff --git a/lib/PuppeteerSharp/PageAccessibility/AXNode.cs b/lib/PuppeteerSharp/PageAccessibility/AXNode.cs
@@ -17,11 +17,11 @@ internal class AXNode
         public bool Focusable { get; set; }
 
         private readonly string _name;
-        private string _role;
         private readonly bool _richlyEditable;
         private readonly bool _editable;
         private readonly bool _expanded;
         private readonly bool _hidden;
+        private string _role;
         private bool? _cachedHasFocusableChild;
 
         public AXNode(AccessibilityGetFullAXTreeResponse.AXTreeNode payload)

diff --git a/lib/PuppeteerSharp/Worker.cs b/lib/PuppeteerSharp/Worker.cs
@@ -28,10 +28,10 @@ public class Worker
     {
         private readonly ILogger _logger;
         private readonly CDPSession _client;
-        private ExecutionContext _executionContext;
         private readonly Func<ConsoleType, JSHandle[], StackTrace, Task> _consoleAPICalled;
         private readonly Action<EvaluateExceptionResponseDetails> _exceptionThrown;
         private readonly TaskCompletionSource<ExecutionContext> _executionContextCallback;
+        private ExecutionContext _executionContext;
         private Func<ExecutionContext, RemoteObject, JSHandle> _jsHandleFactory;
 
         internal Worker(