Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
</ItemGroup>
<Import Project="../Common/CommonProps.props" />
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/Binding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ await context.EvaluateFunctionAsync(
}
finally
{
await Task.WhenAll(garbage.ToArray()).ConfigureAwait(false);
await Task.WhenAll(garbage).ConfigureAwait(false);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/BrowserData/Firefox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private static void SyncPreferences(Dictionary<string, object> defaultPreference
var userPath = Path.Combine(tempUserDataDirectory, "user.js");
var lines = string.Join(
"\n",
defaultPreferences.Select(i => $"user_pref({JsonSerializer.Serialize(i.Key)}, {JsonSerializer.Serialize(i.Value)});").ToArray());
defaultPreferences.Select(i => $"user_pref({JsonSerializer.Serialize(i.Key)}, {JsonSerializer.Serialize(i.Value)});"));

BackupFile(userPath);
BackupFile(prefsPath);
Expand Down
10 changes: 1 addition & 9 deletions lib/PuppeteerSharp/Cdp/CdpBrowser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,7 @@ public override async Task<IBrowserContext> CreateBrowserContextAsync(BrowserCon
}

/// <inheritdoc/>
public override IBrowserContext[] BrowserContexts()
{
var contexts = _contexts.Values.ToArray<IBrowserContext>();

var allContexts = new IBrowserContext[contexts.Length + 1];
allContexts[0] = DefaultContext;
contexts.CopyTo(allContexts, 1);
return allContexts;
}
public override IBrowserContext[] BrowserContexts() => [DefaultContext, .. _contexts.Values];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is beautiful.


internal static async Task<CdpBrowser> CreateAsync(
SupportedBrowser browserToCreate,
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/Cdp/CdpCDPSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ internal override void Close(string closeReason)
CloseReason = closeReason;
IsClosed = true;

foreach (var callback in _callbacks.Values.ToArray())
foreach (var callback in _callbacks.Values)
{
callback.TaskWrapper.TrySetException(new TargetClosedException(
$"Protocol error({callback.Method}): Target closed.",
Expand Down
4 changes: 2 additions & 2 deletions lib/PuppeteerSharp/Cdp/Connection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,14 @@ internal void Close(string closeReason)
Transport.StopReading();
Disconnected?.Invoke(this, EventArgs.Empty);

foreach (var session in _sessions.Values.ToArray())
foreach (var session in _sessions.Values)
{
session.Close(closeReason);
}

_sessions.Clear();

foreach (var response in _callbacks.Values.ToArray())
foreach (var response in _callbacks.Values)
{
response.TaskWrapper.TrySetException(new TargetClosedException(
$"Protocol error({response.Method}): Target closed.",
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/Cdp/FrameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ private void OnLifeCycleEvent(LifecycleEventResponse e)

private void OnExecutionContextsCleared(CDPSession session)
{
foreach (var key in _contextIdToContext.Keys.ToArray())
foreach (var key in _contextIdToContext.Keys)
{
var context = _contextIdToContext[key];
if (context.Client != session)
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ await Task.WhenAll(
var url = kv.Value.Url;
var text = kv.Value.Source;
styleSheetIdToCoverage.TryGetValue(styleSheetId, out var responseRanges);
var ranges = Coverage.ConvertToDisjointRanges(responseRanges ?? new List<CoverageRange>());
var ranges = Coverage.ConvertToDisjointRanges(responseRanges ?? []);
coverage.Add(new CoverageEntry
{
Url = url,
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/PageCoverage/Coverage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public Task StartCSSCoverageAsync(CoverageStartOptions options = null)
/// <inheritdoc/>
public Task<CoverageEntry[]> StopCSSCoverageAsync() => _cssCoverage.StopAsync();

internal static CoverageEntryRange[] ConvertToDisjointRanges(List<CoverageRange> nestedRanges)
internal static CoverageEntryRange[] ConvertToDisjointRanges(IEnumerable<CoverageRange> nestedRanges)
{
var points = new List<CoverageEntryPoint>();
foreach (var range in nestedRanges)
Expand Down
2 changes: 1 addition & 1 deletion lib/PuppeteerSharp/PageCoverage/JSCoverage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ await Task.WhenAll(
continue;
}

var flattenRanges = entry.Functions.SelectMany(f => f.Ranges).ToList();
var flattenRanges = entry.Functions.SelectMany(f => f.Ranges);
var ranges = Coverage.ConvertToDisjointRanges(flattenRanges);
coverage.Add(new JSCoverageEntry
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ internal void ClearCustomQueryHandlers()
}
}

private IEnumerable<string> CustomQueryHandlerNames() => _queryHandlers.Keys.ToArray();
private IEnumerable<string> CustomQueryHandlerNames() => _queryHandlers.Keys;
}
}
12 changes: 6 additions & 6 deletions lib/PuppeteerSharp/WaitTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@ internal async Task RerunAsync()
return fun(...args);
});
}",
new object[]
{
[
new LazyArg(async context => await context.GetPuppeteerUtilAsync().ConfigureAwait(false)),
_fn,
}.Concat(_args).ToArray()).ConfigureAwait(false);
.._args
]).ConfigureAwait(false);
}
else
{
Expand All @@ -127,12 +127,12 @@ internal async Task RerunAsync()
return fun(...args);
}, root || document);
}",
new object[]
{
[
new LazyArg(async context => await context.GetPuppeteerUtilAsync().ConfigureAwait(false)),
_root,
_fn,
}.Concat(_args).ToArray()).ConfigureAwait(false);
.._args
]).ConfigureAwait(false);
}

// Note that FrameWaitForFunctionTests listen for this particular message to orchestrate the test execution
Expand Down
Loading