From 92e0cedb9395b1e4c6d050bc0d78c767e9919c74 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Mon, 28 Feb 2022 13:51:47 -0800
Subject: [PATCH] Finish redirection of `$Host.PrivateData`

We missed the middle layer: public host redirected to internal host, but
then internal host needed to redirect to `_hostInfo.PSHost`. Now that it
does, `$Host.PrivateData` actually shows the correct console color
values, and so `Write-Error 'something'` shows up in the correct color.

Also applied Roslynator suggestions to clean some things up.
---
 .../PowerShell/Host/PsesInternalHost.cs       | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs b/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
index 16a7dcc49..bf0316a65 100644
--- a/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
+++ b/src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs
@@ -63,17 +63,17 @@ internal class PsesInternalHost : PSHost, IHostSupportsInteractiveSession, IRuns
 
         private EngineIntrinsics _mainRunspaceEngineIntrinsics;
 
-        private bool _shouldExit = false;
+        private bool _shouldExit;
 
-        private int _shuttingDown = 0;
+        private int _shuttingDown;
 
         private string _localComputerName;
 
         private ConsoleKeyInfo? _lastKey;
 
-        private bool _skipNextPrompt = false;
+        private bool _skipNextPrompt;
 
-        private bool _resettingRunspace = false;
+        private bool _resettingRunspace;
 
         public PsesInternalHost(
             ILoggerFactory loggerFactory,
@@ -126,6 +126,8 @@ public PsesInternalHost(
 
         public override string Name { get; }
 
+        public override PSObject PrivateData => _hostInfo.PSHost.PrivateData;
+
         public override PSHostUserInterface UI { get; }
 
         public override Version Version { get; }
@@ -156,25 +158,13 @@ public PsesInternalHost(
 
         private bool ShouldExitExecutionLoop => _shouldExit || _shuttingDown != 0;
 
-        public override void EnterNestedPrompt()
-        {
-            PushPowerShellAndRunLoop(CreateNestedPowerShell(CurrentRunspace), PowerShellFrameType.Nested);
-        }
+        public override void EnterNestedPrompt() => PushPowerShellAndRunLoop(CreateNestedPowerShell(CurrentRunspace), PowerShellFrameType.Nested);
 
-        public override void ExitNestedPrompt()
-        {
-            SetExit();
-        }
+        public override void ExitNestedPrompt() => SetExit();
 
-        public override void NotifyBeginApplication()
-        {
-            _hostInfo.PSHost.NotifyBeginApplication();
-        }
+        public override void NotifyBeginApplication() => _hostInfo.PSHost.NotifyBeginApplication();
 
-        public override void NotifyEndApplication()
-        {
-            _hostInfo.PSHost.NotifyEndApplication();
-        }
+        public override void NotifyEndApplication() => _hostInfo.PSHost.NotifyEndApplication();
 
         public void PopRunspace()
         {
@@ -188,11 +178,8 @@ public void PushRunspace(Runspace runspace)
             PushPowerShellAndRunLoop(CreatePowerShellForRunspace(runspace), PowerShellFrameType.Remote);
         }
 
-        public override void SetShouldExit(int exitCode)
-        {
-            // TODO: Handle exit code if needed
-            SetExit();
-        }
+        // TODO: Handle exit code if needed
+        public override void SetShouldExit(int exitCode) => SetExit();
 
         /// <summary>
         /// Try to start the PowerShell loop in the host.