Skip to content

backport #881 in a different way #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 21, 2019
Merged

backport #881 in a different way #884

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e033118
backport #881 in a different way
TylerLeonhardt Mar 20, 2019
0486dea
simpler
TylerLeonhardt Mar 20, 2019
65dcf35
switch back to reflecting
TylerLeonhardt Mar 20, 2019
db3e098
address feedback
TylerLeonhardt Mar 21, 2019
2d00d9e
more feedback
TylerLeonhardt Mar 21, 2019
1bff5cf
safe check
TylerLeonhardt Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 51 additions & 27 deletions src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Management.Automation.Runspaces;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
Expand All @@ -28,6 +28,8 @@

namespace Microsoft.PowerShell.EditorServices.Protocol.Server
{
using System.Management.Automation;

public class LanguageServer
{
private static CancellationTokenSource s_existingRequestCancellation;
Expand All @@ -42,6 +44,15 @@ public class LanguageServer

private static readonly SymbolInformation[] s_emptySymbolResult = new SymbolInformation[0];

// Since the NamedPipeConnectionInfo type is only available in 5.1+
// we have to use Activator to support older version of PS.
// This code only lives in the v1.X of the extension.
// The 2.x version of the code can be found here:
// https://github.com/PowerShell/PowerShellEditorServices/pull/881
private static readonly ConstructorInfo s_namedPipeConnectionInfoCtor = typeof(PSObject).GetTypeInfo().Assembly
.GetType("System.Management.Automation.Runspaces.NamedPipeConnectionInfo")
?.GetConstructor(new [] { typeof(int) });

private ILogger Logger;
private bool profilesLoaded;
private bool consoleReplStarted;
Expand Down Expand Up @@ -1234,48 +1245,61 @@ protected async Task HandleCommentHelpRequest(
await requestContext.SendResult(result);
}

private static Runspace GetRemoteRunspace(int pid)
{
var namedPipeConnectionInfoInstance = s_namedPipeConnectionInfoCtor.Invoke(new object[] { pid });
return RunspaceFactory.CreateRunspace(namedPipeConnectionInfoInstance as RunspaceConnectionInfo);
}

protected async Task HandleGetRunspaceRequestAsync(
string processId,
RequestContext<GetRunspaceResponse[]> requestContext)
{
var runspaceResponses = new List<GetRunspaceResponse>();
IEnumerable<PSObject> runspaces = null;

if (this.editorSession.PowerShellContext.LocalPowerShellVersion.Version.Major >= 5)
{
if (processId == null) {
processId = "current";
}

var isNotCurrentProcess = processId != null && processId != "current";

var psCommand = new PSCommand();

if (isNotCurrentProcess) {
psCommand.AddCommand("Enter-PSHostProcess").AddParameter("Id", processId).AddStatement();
}

psCommand.AddCommand("Get-Runspace");

StringBuilder sb = new StringBuilder();
IEnumerable<Runspace> runspaces = await editorSession.PowerShellContext.ExecuteCommand<Runspace>(psCommand, sb);
if (runspaces != null)
// If the processId is a valid int, we need to run Get-Runspace within that process
// otherwise just use the current runspace.
if (int.TryParse(processId, out int pid))
{
foreach (var p in runspaces)

// Create a remote runspace that we will invoke Get-Runspace in.
using(Runspace rs = GetRemoteRunspace(pid))
using(var ps = PowerShell.Create())
{
runspaceResponses.Add(
new GetRunspaceResponse
{
Id = p.Id,
Name = p.Name,
Availability = p.RunspaceAvailability.ToString()
});
rs.Open();
ps.Runspace = rs;
// Returns deserialized Runspaces. For simpler code, we use PSObject and rely on dynamic later.
runspaces = ps.AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace").Invoke<PSObject>();
}
}
else
{
var psCommand = new PSCommand().AddCommand("Microsoft.PowerShell.Utility\\Get-Runspace");
var sb = new StringBuilder();
// returns (not deserialized) Runspaces. For simpler code, we use PSObject and rely on dynamic later.
runspaces = await editorSession.PowerShellContext.ExecuteCommand<PSObject>(psCommand, sb);
}
}

if (isNotCurrentProcess) {
var exitCommand = new PSCommand();
exitCommand.AddCommand("Exit-PSHostProcess");
await editorSession.PowerShellContext.ExecuteCommand(exitCommand);
var runspaceResponses = new List<GetRunspaceResponse>();

if (runspaces != null)
{
foreach (dynamic runspace in runspaces)
{
runspaceResponses.Add(
new GetRunspaceResponse
{
Id = runspace.Id,
Name = runspace.Name,
Availability = runspace.RunspaceAvailability.ToString()
});
}
}

Expand Down