Include a space if we consider the accept suggestion word is complete.

Also update 'MayAddToHistory' to trim the trailing spaces of the command to be added.

Author: daxian-dbw

PSReadLine/History.cs

@@ -185,6 +185,7 @@ private string MaybeAddToHistory(
             bool fromDifferentSession = false,
             bool fromInitialRead = false)
         {
+            result = result.TrimEnd();
             var addToHistoryOption = GetAddToHistoryOption(result);
             if (addToHistoryOption != AddToHistoryOption.SkipAdding)
             {

PSReadLine/Words.cs

@@ -130,6 +130,13 @@ private int FindForwardSuggestionWordPoint(int currentIndex, string wordDelimite
                 {
                     if (!InWord(_suggestionText, i, wordDelimiters))
                     {
+                        if (_suggestionText[i] == ' ')
+                        {
+                            // If the end of this suggestion word is a space, then we consider the word
+                            // is complete and include the space in the accepted suggestion word.
+                            i++;
+                        }
+
                         break;
                     }
                 }