Skip to content

Return better error for pwsh command line argument WindowStyle on unsupported platforms. #5975

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
daxian-dbw merged 5 commits into from
Jan 24, 2018
Merged

Return better error for pwsh command line argument WindowStyle on unsupported platforms. #5975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f5f8f5
Return better error for WindowStyle on unsupported platforms.
thezim Jan 22, 2018
090a61e
Reword message.
thezim Jan 22, 2018
4ab2078
Remove an extra new line
daxian-dbw Jan 22, 2018
c322fa7
Add test for WindowStyle error on Linux and macOS.
thezim Jan 23, 2018
d021cf8
Revert "Add test for WindowStyle error on Linux and macOS."
thezim Jan 24, 2018
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
10 changes: 6 additions & 4 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ internal class CommandLineParameterParser
"noninteractive",
"inputformat",
"outputformat",
#if !UNIX
"windowstyle",
#endif
"encodedcommand",
"configurationname",
"file",
Expand Down Expand Up @@ -588,9 +586,13 @@ private void ParseHelper(string[] args)
break;
}
}
#if !UNIX
else if (MatchSwitch(switchKey, "windowstyle", "w"))
{
#if UNIX
WriteCommandLineError(
CommandLineParameterParserStrings.WindowStyleArgumentNotImplemented);
break;
#else
++i;
if (i >= args.Length)
{
Expand All @@ -611,8 +613,8 @@ private void ParseHelper(string[] args)
string.Format(CultureInfo.CurrentCulture, CommandLineParameterParserStrings.InvalidWindowStyleArgument, args[i], e.Message));
break;
}
}
#endif
}
else if (MatchSwitch(switchKey, "file", "f"))
{
if (!ParseFile(args, ref i, noexitSeen))
Expand Down
3 changes: 3 additions & 0 deletions src/Microsoft.PowerShell.ConsoleHost/resources/CommandLineParameterParserStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,7 @@
<data name="InvalidArgument" xml:space="preserve">
<value>Invalid argument '{0}', did you mean:</value>
</data>
<data name="WindowStyleArgumentNotImplemented" xml:space="preserve">
<value>Parameter -WindowStyle is not implemented on this platform.</value>
</data>
</root>