Skip to content

Add -is $null and -isnot $null support to operators and Where-Object #10704

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
KirkMunro wants to merge 14 commits into from
Closed

Add -is $null and -isnot $null support to operators and Where-Object #10704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e8a0479
add -is/-isnot $null support
KirkMunro Oct 4, 2019
6aa6cdb
Codacy changes
KirkMunro Oct 4, 2019
0d55344
use IsNullLike for rhs comparison
KirkMunro Oct 9, 2019
9f52044
add more tests
KirkMunro Oct 9, 2019
1f15655
update Pester tests
KirkMunro Oct 9, 2019
7bcfa1a
more Pester test updates
KirkMunro Oct 9, 2019
d8c0854
Merge branch 'master' into add-is-and-isnot-null
KirkMunro Oct 13, 2019
1b87ab8
limit -is/-isnot $null to null literals
KirkMunro Oct 21, 2019
6d35013
Codacy and CodeFactor updates
KirkMunro Oct 21, 2019
ea7e4eb
more CodeFactor updates
KirkMunro Oct 21, 2019
e8d8c0e
code review updates
KirkMunro Oct 21, 2019
ad05791
merge master
KirkMunro Oct 23, 2019
84f5a1c
fix issue introduced in merge
KirkMunro Oct 23, 2019
cdd2cfc
Merge branch 'master' into add-is-and-isnot-null
KirkMunro Jun 14, 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
14 changes: 14 additions & 0 deletions src/System.Management.Automation/engine/lang/parserutils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,13 @@ private static object ReplaceOperatorImpl(ExecutionContext context, string input
/// <returns>The result of the operator.</returns>
Comment thread
KirkMunro marked this conversation as resolved.
internal static object IsOperator(ExecutionContext context, IScriptExtent errorPosition, object left, object right)
{
if (right is null)
{
return left is null
? _TrueObject
: _FalseObject;
}

object lval = PSObject.Base(left);
object rval = PSObject.Base(right);

Expand Down Expand Up @@ -1077,6 +1084,13 @@ internal static object IsOperator(ExecutionContext context, IScriptExtent errorP
/// <returns>The result of the operator.</returns>
internal static object IsNotOperator(ExecutionContext context, IScriptExtent errorPosition, object left, object right)
{
if (right is null)
{
return left is null
? _FalseObject
: _TrueObject;
}

object lval = PSObject.Base(left);
object rval = PSObject.Base(right);

Expand Down
5 changes: 5 additions & 0 deletions src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2145,6 +2145,11 @@ internal static Type ResolveTypeName(ITypeName typeName, IScriptExtent errorPos)

internal static bool IsInstance(object left, object right)
{
if (right is null)
{
return left is null;
Comment thread
KirkMunro marked this conversation as resolved.
Outdated
}

object lval = PSObject.Base(left);
object rval = PSObject.Base(right);

Expand Down
16 changes: 16 additions & 0 deletions test/powershell/Language/Operators/ComparisonOperator.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,22 @@ Describe "ComparisonOperator" -tag "CI" {
param($lhs, $operator, $rhs)
Invoke-Expression "$lhs $operator $rhs" | Should -BeFalse
}

It 'Should succeed in comparing null: <lhs> <operator> $null' -TestCases @(
@{lhs = '([Array]$null)'; operator = '-is'; rhs = '$null' }
@{lhs = '[pscustomobject]@{foo=1}'; operator = '-isnot'; rhs = '$null' }
) {
param($lhs, $operator, $rhs)
Invoke-Expression "$lhs $operator $rhs" | Should -BeTrue
}

It 'Should fail in comparing null: <lhs> <operator> $null' -TestCases @(
@{lhs = '([Array]$null)'; operator = '-isnot'; rhs = '$null' }
@{lhs = '[pscustomobject]@{foo=1}'; operator = '-is'; rhs = '$null' }
) {
param($lhs, $operator, $rhs)
Invoke-Expression "$lhs $operator $rhs" | Should -BeFalse
}
}

Describe "Bytewise Operator" -tag "CI" {
Expand Down
14 changes: 14 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Core/Where-Object.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ Describe "Where-Object" -Tags "CI" {
IPAddress = "192.168.0.1"
NumberOfCores = 1
Drives = 'C','D'
NICCards = @('Broadcom')
},
[PSCustomObject]@{
ComputerName = "BGP-5678"
IPAddress = ""
NumberOfCores = 2
Drives = 'C','D','E'
NICCards = $null
},
[PSCustomObject]@{
ComputerName = "MGC-9101"
NumberOfCores = 3
Drives = 'C'
NICCards = $null
}
)
}
Expand Down Expand Up @@ -142,4 +145,15 @@ Describe "Where-Object" -Tags "CI" {
$Result[0] | Should -Be $dynObj
$Result[1] | Should -Be $dynObj
}

It 'Where-Object Prop -Is $null' {
$Result = $Computers | Where-Object NICCards -Is $null
$Result | Should -HaveCount 2
}

It 'Where-Object Prop -IsNot $null' {
$Result = $Computers | Where-Object NICCards -IsNot $null
$Result | Should -HaveCount 1
}

}