From 4af77aee6f52a323cfd1a8364b0c1dcaa3019d1c Mon Sep 17 00:00:00 2001
From: Maxim Dobroselsky <m.hall.muz@gmail.com>
Date: Mon, 6 May 2024 22:19:36 +0300
Subject: [PATCH] Default RestDetectionSettings

---
 .../Rests/RestDetectionSettings.cs            | 10 ++++--
 .../Interaction/Rests/RestsUtilities.cs       | 34 +++++--------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/DryWetMidi/Interaction/Rests/RestDetectionSettings.cs b/DryWetMidi/Interaction/Rests/RestDetectionSettings.cs
index 885656a60..5bf11c76a 100644
--- a/DryWetMidi/Interaction/Rests/RestDetectionSettings.cs
+++ b/DryWetMidi/Interaction/Rests/RestDetectionSettings.cs
@@ -11,12 +11,14 @@ public sealed class RestDetectionSettings
     {
         #region Constants
 
+        private static readonly Func<ITimedObject, object> NoNotesKeySelector = obj => obj is Note ? "Note" : null;
+
         /// <summary>
         /// Rests will be built only at spaces without notes at all.
         /// </summary>
         public static readonly RestDetectionSettings NoNotes = new RestDetectionSettings
         {
-            KeySelector = obj => obj is Note ? "Note" : null
+            KeySelector = NoNotesKeySelector
         };
 
         /// <summary>
@@ -66,9 +68,11 @@ public sealed class RestDetectionSettings
         /// <summary>
         /// Gets or sets a function that returns the key of an object. Please read
         /// <see href="xref:a_getting_objects#rests">Getting objects: Rests</see> article to
-        /// understand the key concept.
+        /// understand the key concept. The default key selector is
+        /// <c>obj => obj is Note ? "Note" : null</c> which means rests will be built
+        /// between notes where there are no notes at all.
         /// </summary>
-        public Func<ITimedObject, object> KeySelector { get; set; }
+        public Func<ITimedObject, object> KeySelector { get; set; } = NoNotesKeySelector;
 
         #endregion
     }
diff --git a/DryWetMidi/Interaction/Rests/RestsUtilities.cs b/DryWetMidi/Interaction/Rests/RestsUtilities.cs
index 305c6ffe9..249dd93a9 100644
--- a/DryWetMidi/Interaction/Rests/RestsUtilities.cs
+++ b/DryWetMidi/Interaction/Rests/RestsUtilities.cs
@@ -21,23 +21,14 @@ public static class RestsUtilities
         /// <param name="settings">Settings according to which rests should be detected and built.</param>
         /// <returns>Collection with objects from <paramref name="timedObjects"/> and rests
         /// between them.</returns>
-        /// <exception cref="ArgumentNullException">
-        /// <para>One of the following errors occurred:</para>
-        /// <list type="bullet">
-        /// <item>
-        /// <description><paramref name="timedObjects"/> is <c>null</c>.</description>
-        /// </item>
-        /// <item>
-        /// <description><paramref name="settings"/> is <c>null</c>.</description>
-        /// </item>
-        /// </list>
-        /// </exception>
+        /// <exception cref="ArgumentNullException"><paramref name="timedObjects"/> is <c>null</c>.</exception>
         public static IEnumerable<ITimedObject> WithRests(
             this IEnumerable<ITimedObject> timedObjects,
-            RestDetectionSettings settings)
+            RestDetectionSettings settings = null)
         {
             ThrowIfArgument.IsNull(nameof(timedObjects), timedObjects);
-            ThrowIfArgument.IsNull(nameof(settings), settings);
+
+            settings = settings ?? new RestDetectionSettings();
 
             timedObjects = GetSortedObjects(timedObjects);
             var rests = GetSortedRestsFromObjects(timedObjects, settings);
@@ -51,23 +42,14 @@ public static IEnumerable<ITimedObject> WithRests(
         /// <param name="timedObjects">The input objects collection.</param>
         /// <param name="settings">Settings according to which rests should be detected and built.</param>
         /// <returns>Collection of rests between objects within <paramref name="timedObjects"/>.</returns>
-        /// <exception cref="ArgumentNullException">
-        /// <para>One of the following errors occurred:</para>
-        /// <list type="bullet">
-        /// <item>
-        /// <description><paramref name="timedObjects"/> is <c>null</c>.</description>
-        /// </item>
-        /// <item>
-        /// <description><paramref name="settings"/> is <c>null</c>.</description>
-        /// </item>
-        /// </list>
-        /// </exception>
+        /// <exception cref="ArgumentNullException"><paramref name="timedObjects"/> is <c>null</c>.</exception>
         public static ICollection<Rest> GetRests(
             this IEnumerable<ITimedObject> timedObjects,
-            RestDetectionSettings settings)
+            RestDetectionSettings settings = null)
         {
             ThrowIfArgument.IsNull(nameof(timedObjects), timedObjects);
-            ThrowIfArgument.IsNull(nameof(settings), settings);
+
+            settings = settings ?? new RestDetectionSettings();
 
             timedObjects = GetSortedObjects(timedObjects);
             return GetSortedRestsFromObjects(timedObjects, settings);