Skip to content

fix(utility): nullable formatting #13800

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

Closed
georgettica wants to merge 2 commits into from
Closed

fix(utility): nullable formatting #13800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe4febe
fix(utility): nullable formatting
georgettica Oct 17, 2020
b2d4a2d
fix: change return value
georgettica Oct 18, 2020
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
11 changes: 5 additions & 6 deletions ...t.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public SwitchParameter AutoSize
get
{
if (_autosize.HasValue)
return _autosize.Value;
return _autosize.GetValueOrDefault();
return false;
}

Expand All @@ -70,7 +70,7 @@ public int Column
get
{
if (_column.HasValue)
return _column.Value;
return _column;
return -1;
}

Expand Down Expand Up @@ -106,7 +106,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
// we cannot specify -column and -autosize, they are mutually exclusive
if (_autosize.HasValue && _column.HasValue)
{
if (_autosize.Value)
if (_autosize)
{
// the user specified -autosize:true AND a column number
string msg = StringUtil.Format(FormatAndOut_format_xxx.CannotSpecifyAutosizeAndColumnsError);
Expand All @@ -132,17 +132,16 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
parameters.expansion = ProcessExpandParameter();

if (_autosize.HasValue)
parameters.autosize = _autosize.Value;
parameters.autosize = _autosize;

WideSpecificParameters wideSpecific = new WideSpecificParameters();
parameters.shapeParameters = wideSpecific;
if (_column.HasValue)
{
wideSpecific.columns = _column.Value;
wideSpecific.columns = _column;
}

return parameters;
}
}
}

2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ protected override void BeginProcessing()
{
if (SetSeed.HasValue)
{
Generator = new PolymorphicRandomNumberGenerator(SetSeed.Value);
Generator = new PolymorphicRandomNumberGenerator(SetSeed);
}

if (EffectiveParameterSet == MyParameterSet.RandomNumber)
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ internal static OrderByPropertyComparer CreateComparer(List<OrderByPropertyEntry
{
if (ascendingOverrides != null && ascendingOverrides[k].HasValue)
{
ascending[k] = ascendingOverrides[k].Value;
ascending[k] = ascendingOverrides[k];
}
else
{
Expand Down