Add 'AcceptNextSuggestionWord'

Author: daxian-dbw

PSReadLine/Movement.cs

@@ -318,6 +318,12 @@ public static void ForwardWord(ConsoleKeyInfo? key = null, object arg = null)
                 return;
             }
 
+            if (_singleton._current == _singleton._buffer.Length && numericArg > 0)
+            {
+                AcceptNextSuggestionWord(numericArg);
+                return;
+            }
+
             if (numericArg < 0)
             {
                 BackwardWord(key, -numericArg);

PSReadLine/PublicAPI.cs

@@ -246,5 +246,22 @@ public static void AcceptSuggestion()
                 Replace(0, _singleton._buffer.Length, _singleton._suggestionText);
             }
         }
+
+        /// <summary>
+        /// Accept the current or the next suggestion text word.
+        /// </summary>
+        public static void AcceptNextSuggestionWord(int numericArg)
+        {
+            if (_singleton._suggestionText != null)
+            {
+                int index = _singleton._buffer.Length;
+                while (numericArg-- > 0 && index < _singleton._suggestionText.Length)
+                {
+                    index = _singleton.FindForwardSuggestionWordPoint(index, _singleton.Options.WordDelimiters);
+                }
+
+                Replace(0, _singleton._buffer.Length, _singleton._suggestionText.Substring(0, index));
+            }
+        }
     }
 }

PSReadLine/Words.cs

@@ -94,6 +94,50 @@ private bool InWord(int index, string wordDelimiters)
             return !char.IsWhiteSpace(c) && wordDelimiters.IndexOf(c) < 0;
         }
 
+        private bool InWord(string text, int index, string wordDelimiters)
+        {
+            char c = text[index];
+            return !char.IsWhiteSpace(c) && wordDelimiters.IndexOf(c) < 0;
+        }
+
+        private int FindForwardSuggestionWordPoint(int currentIndex, string wordDelimiters)
+        {
+            System.Diagnostics.Debug.Assert(
+                _suggestionText != null && _suggestionText.Length > _buffer.Length,
+                "Caller needs to make srue the suggestion text exist.");
+
+            if (currentIndex >= _suggestionText.Length)
+            {
+                return _suggestionText.Length;
+            }
+
+            int i = currentIndex;
+            if (!InWord(_suggestionText, i, wordDelimiters))
+            {
+                // Scan to end of current non-word region
+                while (++i < _suggestionText.Length)
+                {
+                    if (InWord(_suggestionText, i, wordDelimiters))
+                    {
+                        break;
+                    }
+                }
+            }
+
+            if (i < _suggestionText.Length)
+            {
+                while (++i < _suggestionText.Length)
+                {
+                    if (!InWord(_suggestionText, i, wordDelimiters))
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return i;
+        }
+
         /// <summary>
         /// Find the end of the current/next word as defined by wordDelimiters and whitespace.
         /// </summary>