Remove unused code (#2296)

* Remove unused code

* go a few versions back

* Fix dispose code

* fancy stuff

Author: kblok

lib/.editorconfig

@@ -322,10 +322,13 @@ dotnet_diagnostic.CA1303.severity = none
 # IL3000: Avoid accessing Assembly file path when publishing as a single file
 dotnet_diagnostic.IL3000.severity = none
 
-# C++ Files
+# C++ Files
+
+# Default severity for analyzer diagnostics with category 'Usage'
+dotnet_analyzer_diagnostic.category-Usage.severity = none
 
-# Default severity for analyzer diagnostics with category 'Usage'
-dotnet_analyzer_diagnostic.category-Usage.severity = none
+# Default severity for analyzer diagnostics with category 'CodeQuality'
+dotnet_analyzer_diagnostic.category-CodeQuality.severity = error
 
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

lib/PuppeteerSharp/Browser.cs

@@ -25,7 +25,6 @@ public class Browser : IBrowser
         private readonly Func<TargetInfo, bool> _isPageTargetFunc;
         private readonly BrowserContext _defaultContext;
         private readonly CustomQueriesManager _customQueriesManager = new();
-        private readonly Func<Task> _closeCallback;
         private Task _closeTask;
 
         internal Browser(
@@ -35,15 +34,13 @@ internal Browser(
             bool ignoreHTTPSErrors,
             ViewPortOptions defaultViewport,
             LauncherBase launcher,
-            Func<Task> closeCallback = null,
             Func<TargetInfo, bool> targetFilter = null,
             Func<TargetInfo, bool> isPageTargetFunc = null)
         {
             IgnoreHTTPSErrors = ignoreHTTPSErrors;
             DefaultViewport = defaultViewport;
             Launcher = launcher;
             Connection = connection;
-            _closeCallback = closeCallback;
             _targetFilterCallback = targetFilter ?? ((TargetInfo _) => true);
             _logger = Connection.LoggerFactory.CreateLogger<Browser>();
             _isPageTargetFunc =
@@ -271,7 +268,6 @@ internal static async Task<Browser> CreateAsync(
             bool ignoreHTTPSErrors,
             ViewPortOptions defaultViewPort,
             LauncherBase launcher,
-            Func<Task> closeCallback = null,
             Func<TargetInfo, bool> targetFilter = null,
             Func<TargetInfo, bool> isPageTargetCallback = null,
             Action<IBrowser> initAction = null)
@@ -283,7 +279,6 @@ internal static async Task<Browser> CreateAsync(
                 ignoreHTTPSErrors,
                 defaultViewPort,
                 launcher,
-                closeCallback,
                 targetFilter,
                 isPageTargetCallback);
 

lib/PuppeteerSharp/BrowserFetcher.cs

@@ -263,25 +263,6 @@ private static void ExtractTar(string zipPath, string folderPath)
             process.WaitForExit();
         }
 
-        private string GetFolderPath(string revision)
-            => Path.Combine(CacheDir, $"{Platform}-{revision}");
-
-        private void NativeExtractToDirectory(string zipPath, string folderPath)
-        {
-            var destinationDirectoryInfo = new DirectoryInfo(folderPath);
-
-            if (!destinationDirectoryInfo.Exists)
-            {
-                destinationDirectoryInfo.Create();
-            }
-
-            using var process = new Process();
-            process.StartInfo.FileName = "unzip";
-            process.StartInfo.Arguments = $"\"{zipPath}\" -d \"{folderPath}\"";
-            process.Start();
-            process.WaitForExit();
-        }
-
         private Task InstallDMGAsync(string dmgPath, string folderPath)
         {
             try

lib/PuppeteerSharp/IsolatedWorld.cs

@@ -498,60 +498,5 @@ private async Task OnBindingCalledAsync(BindingCalledResponse e)
                 _logger.LogError(ex.ToString());
             }
         }
-
-        private async Task<IElementHandle> WaitForSelectorAsync(string selectorOrXPath, bool isXPath, WaitForSelectorOptions options = null)
-        {
-            options ??= new WaitForSelectorOptions();
-            var waitForVisible = options?.Visible ?? false;
-            var waitForHidden = options?.Hidden ?? false;
-            var timeout = options.Timeout ?? _timeoutSettings.Timeout;
-
-            const string predicate = @"function predicate(selectorOrXPath, isXPath, waitForVisible, waitForHidden) {
-                const node = isXPath
-                  ? document.evaluate(selectorOrXPath, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
-                  : document.querySelector(selectorOrXPath);
-                if (!node)
-                  return waitForHidden;
-                if (!waitForVisible && !waitForHidden)
-                  return node;
-                const element = node.nodeType === Node.TEXT_NODE ? node.parentElement : node;
-
-                const style = window.getComputedStyle(element);
-                const isVisible = style && style.visibility !== 'hidden' && hasVisibleBoundingBox();
-                const success = (waitForVisible === isVisible || waitForHidden === !isVisible);
-                return success ? node : null;
-
-                function hasVisibleBoundingBox() {
-                  const rect = element.getBoundingClientRect();
-                  return !!(rect.top || rect.bottom || rect.width || rect.height);
-                }
-              }";
-            var polling = waitForVisible || waitForHidden ? WaitForFunctionPollingOption.Raf : WaitForFunctionPollingOption.Mutation;
-
-            using var waitTask = new WaitTask(
-                this,
-                predicate,
-                false,
-                polling,
-                null, // Polling interval
-                timeout,
-                options.Root,
-                null,
-                new object[] { selectorOrXPath, isXPath, options.Visible, options.Hidden });
-
-            var handle = await waitTask.Task.ConfigureAwait(false);
-
-            if (handle is not IElementHandle elementHandle)
-            {
-                if (handle != null)
-                {
-                    await handle.DisposeAsync().ConfigureAwait(false);
-                }
-
-                return null;
-            }
-
-            return elementHandle;
-        }
     }
 }

lib/PuppeteerSharp/Launcher.cs

@@ -143,7 +143,6 @@ public async Task<IBrowser> ConnectAsync(ConnectOptions options)
                         options.IgnoreHTTPSErrors,
                         options.DefaultViewport,
                         null,
-                        null,
                         options.TargetFilter,
                         null,
                         options.InitAction)

lib/PuppeteerSharp/PuppeteerSharp.csproj

@@ -32,7 +32,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -49,6 +49,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.3.1">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />

lib/PuppeteerSharp/WaitTask.cs

@@ -79,6 +79,11 @@ public void Dispose()
                 return;
             }
 
+            if (_timeoutTimer is { Status: TaskStatus.RanToCompletion or TaskStatus.Faulted or TaskStatus.Canceled } timeoutTimer)
+            {
+                timeoutTimer.Dispose();
+            }
+
             _cts.Dispose();
 
             _isDisposed = true;