Skip to content

Commit 786ba0b

Browse files
committed
Rename fields still using _lowerCamelCase names
1 parent 6972de2 commit 786ba0b

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

CommunityToolkit.Common/Deferred/DeferredEventArgs.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ public class DeferredEventArgs : EventArgs
1919
/// </summary>
2020
public static new DeferredEventArgs Empty => new();
2121

22-
private readonly object _eventDeferralLock = new();
22+
private readonly object eventDeferralLock = new();
2323

24-
private EventDeferral? _eventDeferral;
24+
private EventDeferral? eventDeferral;
2525

2626
/// <summary>
2727
/// Returns an <see cref="EventDeferral"/> which can be completed when deferred event is ready to continue.
2828
/// </summary>
2929
/// <returns><see cref="EventDeferral"/> instance.</returns>
3030
public EventDeferral GetDeferral()
3131
{
32-
lock (this._eventDeferralLock)
32+
lock (this.eventDeferralLock)
3333
{
34-
return this._eventDeferral ??= new EventDeferral();
34+
return this.eventDeferral ??= new EventDeferral();
3535
}
3636
}
3737

@@ -45,11 +45,11 @@ public EventDeferral GetDeferral()
4545
[Obsolete("This is an internal only method to be used by EventHandler extension classes, public callers should call GetDeferral() instead.")]
4646
public EventDeferral? GetCurrentDeferralAndReset()
4747
{
48-
lock (this._eventDeferralLock)
48+
lock (this.eventDeferralLock)
4949
{
50-
EventDeferral? eventDeferral = this._eventDeferral;
50+
EventDeferral? eventDeferral = this.eventDeferral;
5151

52-
this._eventDeferral = null;
52+
this.eventDeferral = null;
5353

5454
return eventDeferral;
5555
}

CommunityToolkit.Common/Deferred/EventDeferral.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ namespace CommunityToolkit.Common.Deferred;
1616
/// </summary>
1717
public class EventDeferral : IDisposable
1818
{
19-
//// TODO: If/when .NET 6 is base, we can upgrade to non-generic version
20-
private readonly TaskCompletionSource<object?> _taskCompletionSource = new();
19+
// TODO: If/when .NET 6 is base, we can upgrade to non-generic version
20+
private readonly TaskCompletionSource<object?> taskCompletionSource = new();
2121

2222
internal EventDeferral()
2323
{
@@ -26,7 +26,7 @@ internal EventDeferral()
2626
/// <summary>
2727
/// Call when finished with the Deferral.
2828
/// </summary>
29-
public void Complete() => this._taskCompletionSource.TrySetResult(null);
29+
public void Complete() => this.taskCompletionSource.TrySetResult(null);
3030

3131
/// <summary>
3232
/// Waits for the <see cref="EventDeferral"/> to be completed by the event handler.
@@ -38,9 +38,9 @@ internal EventDeferral()
3838
[Obsolete("This is an internal only method to be used by EventHandler extension classes, public callers should call GetDeferral() instead on the DeferredEventArgs.")]
3939
public async Task WaitForCompletion(CancellationToken cancellationToken)
4040
{
41-
using (cancellationToken.Register(() => this._taskCompletionSource.TrySetCanceled()))
41+
using (cancellationToken.Register(() => this.taskCompletionSource.TrySetCanceled()))
4242
{
43-
_ = await this._taskCompletionSource.Task;
43+
_ = await this.taskCompletionSource.Task;
4444
}
4545
}
4646

CommunityToolkit.Mvvm/Messaging/Internals/System/Runtime.CompilerServices/ConditionalWeakTable2{TKey,TValue}.ZeroAlloc.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private sealed class Container
307307
private readonly ConditionalWeakTable2<TKey, TValue> parent;
308308

309309
/// <summary>
310-
/// <c>_buckets[hashcode &amp; (_buckets.Length - 1)]</c> contains index of the first entry in bucket (-1 if empty).
310+
/// <c>buckets[hashcode &amp; (buckets.Length - 1)]</c> contains index of the first entry in bucket (-1 if empty).
311311
/// </summary>
312312
private int[] buckets;
313313

@@ -317,7 +317,7 @@ private sealed class Container
317317
private Entry[] entries;
318318

319319
/// <summary>
320-
/// <c>_firstFreeEntry &lt; _entries.Length => table</c> has capacity, entries grow from the bottom of the table.
320+
/// <c>firstFreeEntry &lt; entries.Length => table</c> has capacity, entries grow from the bottom of the table.
321321
/// </summary>
322322
private int firstFreeEntry;
323323

@@ -410,7 +410,7 @@ internal void CreateEntryNoResize(TKey key, TValue value)
410410
}
411411

412412
/// <summary>
413-
/// Worker for finding a key/value pair. Must hold _lock.
413+
/// Worker for finding a key/value pair. Must hold lock.
414414
/// </summary>
415415
internal bool TryGetValueWorker(TKey key, [MaybeNullWhen(false)] out TValue value)
416416
{
@@ -423,7 +423,7 @@ internal bool TryGetValueWorker(TKey key, [MaybeNullWhen(false)] out TValue valu
423423

424424
/// <summary>
425425
/// Returns -1 if not found (if key expires during FindEntry, this can be treated as "not found.").
426-
/// Must hold _lock, or be prepared to retry the search while holding _lock.
426+
/// Must hold lock, or be prepared to retry the search while holding lock.
427427
/// </summary>
428428
/// <remarks>This method requires <paramref name="value"/> to be on the stack to be properly tracked.</remarks>
429429
internal int FindEntry(TKey key, out object? value)
@@ -463,7 +463,7 @@ internal bool TryGetEntry(int index, [NotNullWhen(true)] out TKey? key, [MaybeNu
463463
{
464464
if (index < this.entries.Length)
465465
{
466-
// object? oKey = _entries[index].depHnd.UnsafeGetTargetAndDependent(out object? oValue);
466+
// object? oKey = entries[index].depHnd.UnsafeGetTargetAndDependent(out object? oValue);
467467
(object? oKey, object? oValue) = this.entries[index].depHnd.TargetAndDependent;
468468

469469
// Ensure we don't get finalized while accessing DependentHandle
@@ -522,10 +522,10 @@ private void RemoveIndex(int entryIndex)
522522
}
523523

524524
/// <summary>
525-
/// Resize, and scrub expired keys off bucket lists. Must hold _lock.
525+
/// Resize, and scrub expired keys off bucket lists. Must hold <see cref="lockObject"/>.
526526
/// </summary>
527527
/// <remarks>
528-
/// _firstEntry is less than _entries.Length on exit, that is, the table has at least one free entry.
528+
/// <see cref="firstFreeEntry"/> is less than <c>entries.Length</c> on exit, that is, the table has at least one free entry.
529529
/// </remarks>
530530
internal Container Resize()
531531
{

0 commit comments

Comments
 (0)