Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix case where tab completion is not at end of command

Browse Source
This commit is contained in:
George Fleming 2016-02-20 17:58:03 -08:00
parent 5d20ec8e37
commit 3a0eee9894
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Microsoft.PowerShell.Linux.Host/readline.cs
View File

@ -85,6 +85,11 @@ namespace Microsoft.PowerShell.Linux.Host
/// </summary>
private bool newHistory = false;
/// <summary>
/// Save buffer at time we hit <tab>
/// </summary>
private string preTabBuffer;
/// <summary>
/// Initializes a new instance of the ConsoleReadLine class.
/// </summary>
@ -235,7 +240,8 @@ namespace Microsoft.PowerShell.Linux.Host
//if the buffer has been modified in any way, get the new command completion
if (previousKeyPress.Key != ConsoleKey.Tab)
{
cmdCompleteOpt = CommandCompletion.CompleteInput(this.buffer.ToString(), this.current, options, powershell);
this.preTabBuffer = this.buffer.ToString();
cmdCompleteOpt = CommandCompletion.CompleteInput(this.preTabBuffer, this.current, options, powershell);
}
if (cmdCompleteOpt.CompletionMatches.Count == 0)
@ -263,24 +269,24 @@ namespace Microsoft.PowerShell.Linux.Host
if (!String.IsNullOrEmpty(tabResult))
{
var replaceIndex = cmdCompleteOpt.ReplacementIndex;
string replaceBuffer = this.buffer.ToString();
string replaceBuffer = this.preTabBuffer;
if (replaceBuffer.Length < replaceIndex)
{
replaceIndex = replaceBuffer.Length;
// something is wrong
return;
}
if (replaceBuffer.Length == replaceIndex)
{
tabResult = replaceBuffer + tabResult;
replaceBuffer = replaceBuffer + tabResult;
}
else
{
replaceBuffer = replaceBuffer.Remove(replaceIndex);
tabResult = replaceBuffer + tabResult;
}
replaceBuffer = replaceBuffer.Remove(replaceIndex, cmdCompleteOpt.ReplacementLength).Insert(replaceIndex, tabResult);
}
BufferFromString(tabResult);
BufferFromString(replaceBuffer);
this.Render();
if (moveLeftOneSpace)