admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes per Andy comments, and add revert of colors at end of PS

Browse Source
This commit is contained in:
George Fleming
2016-03-23 16:17:06 -07:00
parent aab00e2ee1
commit 5e9c31107c
2 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Linux.Host/main.cs
+11 -5
View File
@@ -109,6 +109,9 @@ OPTIONS
}
// TODO: check for input on stdin
ConsoleColor InitialForegroundColor = Console.ForegroundColor;
ConsoleColor InitialBackgroundColor = Console.BackgroundColor;
// Create the listener and run it
Listener listener = new Listener(initialScript, loadProfiles);
@@ -118,6 +121,9 @@ OPTIONS
listener.Run();
}
Console.ForegroundColor = InitialForegroundColor;
Console.BackgroundColor = InitialBackgroundColor;
// Exit with the desired exit code that was set by the exit command.
// The exit code is set in the host by the MyHost.SetShouldExit() method.
System.Environment.Exit(listener.ExitCode);
@@ -129,7 +135,7 @@ OPTIONS
/// <summary>
/// Used to read user input.
/// </summary>
internal ConsoleReadLine consoleReadLine = new ConsoleReadLine();
internal ConsoleReadLine consoleReadLine;
/// <summary>
/// Holds a reference to the runspace for this interpeter.
@@ -213,6 +219,7 @@ OPTIONS
InitialSessionState iss = InitialSessionState.CreateDefault2();
this.myRunSpace = RunspaceFactory.CreateRunspace(this.myHost, iss);
this.myRunSpace.Open();
this.consoleReadLine = new ConsoleReadLine(this.myHost.Runspace, this.myHost.UI);
if (this.myRunSpace.Debugger != null)
{
@@ -222,7 +229,6 @@ OPTIONS
// feature. In order to debug Workflow script functions the debugger
// DebugMode must include the DebugModes.LocalScript flag.
this.myRunSpace.Debugger.SetDebugMode(DebugModes.LocalScript);
}
if (loadProfiles)
@@ -554,9 +560,9 @@ OPTIONS
prompt = "PS> ";
}
this.myHost.UI.Write(ConsoleColor.White, Console.BackgroundColor, prompt);
this.myHost.UI.Write(prompt);
ConsoleReadLine.ReadResult result = consoleReadLine.Read(this.myHost.Runspace, this.myHost.UI, false, initialCommand);
ConsoleReadLine.ReadResult result = consoleReadLine.Read(false, initialCommand);
switch(result.state)
{
@@ -597,7 +603,7 @@ OPTIONS
string prompt = incompleteLine ? ">> " : "[DBG] PS >> ";
this.myHost.UI.Write(prompt);
ConsoleReadLine.ReadResult result = consoleReadLine.Read(this.myHost.Runspace, this.myHost.UI, true, initialCommand);
ConsoleReadLine.ReadResult result = consoleReadLine.Read(true, initialCommand);
switch(result.state)
{
src/Microsoft.PowerShell.Linux.Host/readline.cs
+55 -39
View File
@@ -101,6 +101,21 @@ namespace Microsoft.PowerShell.Linux.Host
/// </summary>
private string killBuffer = String.Empty;
/// <summary>
/// Indicator that command input is complete
/// </summary>
private bool commandComplete;
/// <summary>
/// Indicator that current command is to be aborted
/// </summary>
private bool abort;
/// <summary>
/// Indicator that we are to redraw current command
/// </summary>
private bool redraw;
/// <summary>
/// What Read() outputs
/// </summary>
@@ -122,7 +137,7 @@ namespace Microsoft.PowerShell.Linux.Host
/// <summary>
/// Initializes a new instance of the ConsoleReadLine class.
/// </summary>
public ConsoleReadLine()
public ConsoleReadLine(Runspace runspace, PSHostUserInterface hostUI)
{
this.tokenColors = new ConsoleColor[]
{
@@ -147,20 +162,17 @@ namespace Microsoft.PowerShell.Linux.Host
this.defaultColor, // LineContinuation
this.defaultColor, // Position
};
this.powershell.Runspace = runspace;
this.ui = hostUI;
}
/// <summary>
/// Read a line of text, colorizing while typing.
/// </summary>
/// <returns>The command line read</returns>
public ReadResult Read(Runspace runspace, PSHostUserInterface hostUI, bool nested, string initialValue)
public ReadResult Read(bool nested, string initialValue)
{
this.powershell.Runspace = runspace;
this.ui = hostUI;
this.Initialize();
bool commandComplete = false;
bool abort = false;
bool redraw = false;
if (!String.IsNullOrEmpty(initialValue))
{
@@ -168,28 +180,34 @@ namespace Microsoft.PowerShell.Linux.Host
this.Render();
}
Console.TreatControlCAsInput = true;
while (true)
{
ConsoleKeyInfo key = Console.ReadKey(true);
try
{
ConsoleKeyInfo key = Console.ReadKey(true);
// Basic Emacs-style readline implementation
if (key.Modifiers.HasFlag(ConsoleModifiers.Control))
{
commandComplete = ProcessControlKey(key, nested, ref abort, ref redraw);
}
else if (key.Modifiers.HasFlag(ConsoleModifiers.Alt))
{
commandComplete = ProcessAltKey(key);
}
// Unmodified keys
else
{
commandComplete = ProcessNormalKey(key, nested);
}
// Basic Emacs-style readline implementation
if (key.Modifiers.HasFlag(ConsoleModifiers.Control))
{
commandComplete = ProcessControlKey(key, nested);
}
else if (key.Modifiers.HasFlag(ConsoleModifiers.Alt))
{
commandComplete = ProcessAltKey(key);
}
// Unmodified keys
else
{
commandComplete = ProcessNormalKey(key, nested);
}
previousKeyPress = key;
previousKeyPress = key;
}
catch
{
// if anything goes wrong, abort
abort = true;
}
if (abort)
{
@@ -211,7 +229,7 @@ namespace Microsoft.PowerShell.Linux.Host
/// <summary>
/// Process Control-Key combo
/// </summary>
private bool ProcessControlKey(ConsoleKeyInfo key, bool nested, ref bool abort, ref bool redraw)
private bool ProcessControlKey(ConsoleKeyInfo key, bool nested)
{
switch (key.Key)
{
@@ -237,7 +255,7 @@ namespace Microsoft.PowerShell.Linux.Host
this.OnRight(false);
break;
case ConsoleKey.R:
return this.ReverseSearch(nested, ref abort);
return this.ReverseSearch(nested);
case ConsoleKey.J:
previousKeyPress = key;
return true;
@@ -247,7 +265,6 @@ namespace Microsoft.PowerShell.Linux.Host
return false;
case ConsoleKey.C:
this.Abort();
abort = true;
return true;
case ConsoleKey.P:
this.OnUpArrow(nested);
@@ -365,6 +382,10 @@ namespace Microsoft.PowerShell.Linux.Host
this.current = 0;
this.rendered = 0;
this.cursor = new Cursor();
this.commandComplete = false;
this.abort = false;
this.redraw = false;
Console.TreatControlCAsInput = true;
}
/// <summary>
@@ -592,7 +613,7 @@ namespace Microsoft.PowerShell.Linux.Host
/// <summary>
/// Reverse search through history
/// </summary>
private bool ReverseSearch(bool nested, ref bool abort)
private bool ReverseSearch(bool nested)
{
GetHistory(nested);
@@ -609,17 +630,12 @@ namespace Microsoft.PowerShell.Linux.Host
while (true)
{
OnEscape();
ConsoleColor saveFGColor = Console.ForegroundColor;
ui.Write("(");
Console.ForegroundColor = ConsoleColor.Red;
ui.Write(String.Format("{0}", failed));
Console.ForegroundColor = saveFGColor;
ui.Write(String.Format("reverse-i-search)'{0}", searchString.ToString()));
ui.Write(ConsoleColor.Red, Console.BackgroundColor, $"{failed}");
ui.Write($"bck-i-search)'{searchString}");
this.current = this.cursor.GetPosition();
ui.Write("': ");
Console.ForegroundColor = ConsoleColor.Green;
ui.Write(String.Format("{0}", searchResult));
Console.ForegroundColor = saveFGColor;
ui.Write(ConsoleColor.Green, Console.BackgroundColor, $"{searchResult}");
this.rendered = this.cursor.GetPosition();
this.cursor.Place(this.current);
@@ -635,7 +651,6 @@ namespace Microsoft.PowerShell.Linux.Host
break;
case ConsoleKey.C:
Abort();
abort = true;
return true;
default:
terminateSearch = true;
@@ -695,7 +710,7 @@ namespace Microsoft.PowerShell.Linux.Host
string result = reverseSearchHistory(searchString.ToString(), ref searchPos);
if (String.IsNullOrEmpty(result))
{
failed = "failed ";
failed = "failed-";
}
else
{
@@ -1024,6 +1039,7 @@ namespace Microsoft.PowerShell.Linux.Host
Console.ForegroundColor = ConsoleColor.Red;
ui.WriteLine("^C");
Console.ForegroundColor = saveFGColor;
this.abort = true;
}
/// <summary>