Skip to content

Support command arguments for VisualEditing #5174

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

Open
sharpchen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support command arguments for VisualEditing #5174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 42 additions & 6 deletions PSReadLine/VisualEditing.vi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,51 @@ public partial class PSConsoleReadLine
/// </summary>
public static void ViEditVisually(ConsoleKeyInfo? key = null, object arg = null)
{
string editor = GetPreferredEditor();
if (string.IsNullOrWhiteSpace(editor))
// EDITOR can be a cmd with args such as `emacsclient -c`
// each component of the cmd may only be quoted by " due to internal design, see doc for `ProcessStartInfo.Arguments`
string cmd = GetPreferredEditor().Trim();

if (string.IsNullOrEmpty(cmd))
{
Ding();
return;
}

string exe = string.Empty;
string arguments = string.Empty;
bool exeQuoteUnmatched = false;

if (File.Exists(cmd)) // path/might contain space/foo.exe
{
exe = cmd;
}
else if (cmd.StartsWith('"')) // "path/with space/foo.exe" --args ...
{
int nextQuote = cmd.IndexOf('"', 1);

if (nextQuote != -1)
(exe, arguments) = (cmd[1..nextQuote], cmd[(nextQuote + 1)..]);
else
exeQuoteUnmatched = true;
}
else
{
// foo.exe
// foo.exe --args
// path/to/foo.exe --args
int firstSpace = cmd.IndexOf(' ');
(exe, arguments) = firstSpace != -1
? (cmd[..firstSpace], cmd[(firstSpace + 1)..])
: (cmd, string.Empty);
}

if (string.IsNullOrEmpty(exe) || exeQuoteUnmatched)
{
Ding();
return;
}

if (!(_singleton._engineIntrinsics?.InvokeCommand.GetCommand(editor, CommandTypes.Application) is
ApplicationInfo editorCommand))
if (_singleton._engineIntrinsics?.InvokeCommand.GetCommand(exe, CommandTypes.Application) is not ApplicationInfo editorCommand)
{
Ding();
return;
Expand All @@ -39,8 +75,8 @@ public static void ViEditVisually(ConsoleKeyInfo? key = null, object arg = null)
}
}

editor = editorCommand.Path;
var si = new ProcessStartInfo(editor, $"\"{tempPowerShellFile}\"")
exe = editorCommand.Path;
var si = new ProcessStartInfo(exe, $"{arguments} \"{tempPowerShellFile}\"")
{
UseShellExecute = false,
RedirectStandardError = false,
Expand Down