Merge pull request #392 from daviwil/fix-vscps-575

Remove session errors that exist after integrated console startup

Author: daviwil

src/PowerShellEditorServices/Session/Capabilities/DscBreakpointCapability.cs

@@ -93,7 +93,7 @@ public static DscBreakpointCapability CheckForCapability(
                     powerShell.AddCommand("Import-Module");
                     powerShell.AddArgument(@"C:\Program Files\DesiredStateConfiguration\1.0.0.0\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.psd1");
                     powerShell.AddParameter("PassThru");
-                    powerShell.AddParameter("ErrorAction", "SilentlyContinue");
+                    powerShell.AddParameter("ErrorAction", "Ignore");
 
                     PSObject moduleInfo = null;
 

src/PowerShellEditorServices/Session/RemoteFileManager.cs

@@ -375,64 +375,72 @@ private void HandlePSEventReceived(object sender, PSEventArgs args)
 
         private void RegisterPSEditFunction(RunspaceDetails runspaceDetails)
         {
-            try
+            if (runspaceDetails.Location == RunspaceLocation.Remote &&
+                runspaceDetails.Context == RunspaceContext.Original)
             {
-                runspaceDetails.Runspace.Events.ReceivedEvents.PSEventReceived += HandlePSEventReceived;
+                try
+                {
+                    runspaceDetails.Runspace.Events.ReceivedEvents.PSEventReceived += HandlePSEventReceived;
 
-                var createScript =
-                    string.Format(
-                        CreatePSEditFunctionScript,
-                        (runspaceDetails.Location == RunspaceLocation.Local &&
-                         runspaceDetails.Context == RunspaceContext.Original)
-                            ? string.Empty : "-Forward");
+                    var createScript =
+                        string.Format(
+                            CreatePSEditFunctionScript,
+                            (runspaceDetails.Location == RunspaceLocation.Local &&
+                             runspaceDetails.Context == RunspaceContext.Original)
+                                ? string.Empty : "-Forward");
 
-                PSCommand createCommand = new PSCommand();
-                createCommand
-                    .AddScript(createScript)
-                    .AddParameter("PSEditFunction", PSEditFunctionScript);
+                    PSCommand createCommand = new PSCommand();
+                    createCommand
+                        .AddScript(createScript)
+                        .AddParameter("PSEditFunction", PSEditFunctionScript);
 
-                if (runspaceDetails.Context == RunspaceContext.DebuggedRunspace)
-                {
-                    this.powerShellContext.ExecuteCommand(createCommand).Wait();
-                }
-                else
-                {
-                    using (var powerShell = System.Management.Automation.PowerShell.Create())
+                    if (runspaceDetails.Context == RunspaceContext.DebuggedRunspace)
                     {
-                        powerShell.Runspace = runspaceDetails.Runspace;
-                        powerShell.Commands = createCommand;
-                        powerShell.Invoke();
+                        this.powerShellContext.ExecuteCommand(createCommand).Wait();
+                    }
+                    else
+                    {
+                        using (var powerShell = System.Management.Automation.PowerShell.Create())
+                        {
+                            powerShell.Runspace = runspaceDetails.Runspace;
+                            powerShell.Commands = createCommand;
+                            powerShell.Invoke();
+                        }
                     }
                 }
-            }
-            catch (RemoteException e)
-            {
-                Logger.WriteException("Could not create psedit function.", e);
+                catch (RemoteException e)
+                {
+                    Logger.WriteException("Could not create psedit function.", e);
+                }
             }
         }
 
         private void RemovePSEditFunction(RunspaceDetails runspaceDetails)
         {
-            try
+            if (runspaceDetails.Location == RunspaceLocation.Remote &&
+                runspaceDetails.Context == RunspaceContext.Original)
             {
-                if (runspaceDetails.Runspace.Events != null)
+                try
                 {
-                    runspaceDetails.Runspace.Events.ReceivedEvents.PSEventReceived -= HandlePSEventReceived;
-                }
+                    if (runspaceDetails.Runspace.Events != null)
+                    {
+                        runspaceDetails.Runspace.Events.ReceivedEvents.PSEventReceived -= HandlePSEventReceived;
+                    }
 
-                if (runspaceDetails.Runspace.RunspaceStateInfo.State == RunspaceState.Opened)
-                {
-                    using (var powerShell = System.Management.Automation.PowerShell.Create())
+                    if (runspaceDetails.Runspace.RunspaceStateInfo.State == RunspaceState.Opened)
                     {
-                        powerShell.Runspace = runspaceDetails.Runspace;
-                        powerShell.Commands.AddScript(RemovePSEditFunctionScript);
-                        powerShell.Invoke();
+                        using (var powerShell = System.Management.Automation.PowerShell.Create())
+                        {
+                            powerShell.Runspace = runspaceDetails.Runspace;
+                            powerShell.Commands.AddScript(RemovePSEditFunctionScript);
+                            powerShell.Invoke();
+                        }
                     }
                 }
-            }
-            catch (Exception e) when (e is RemoteException || e is PSInvalidOperationException)
-            {
-                Logger.WriteException("Could not remove psedit function.", e);
+                catch (Exception e) when (e is RemoteException || e is PSInvalidOperationException)
+                {
+                    Logger.WriteException("Could not remove psedit function.", e);
+                }
             }
         }