Add Count and Length property to [pscustomobject]

iSazonov · iSazonov · commit 51b2a0014c65 · 2017-12-26T16:38:02.000+03:00
Add new tests
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -5690,6 +5690,11 @@ internal static object GetAdaptedValue(object obj, string member)
                 return memberInfo.Value;
             }
 
+            if (string.Equals(member, "Length", StringComparison.OrdinalIgnoreCase) || string.Equals(member, "Count", StringComparison.OrdinalIgnoreCase))
+            {
+                return 1;
+            }
+
             if (context != null && context.IsStrictVersion(2))
             {
                 // If the member is undefined and we're in strict mode, throw an exception...
diff --git a/test/powershell/engine/ETS/Adapter.Tests.ps1 b/test/powershell/engine/ETS/Adapter.Tests.ps1
@@ -112,6 +112,27 @@ Describe "Adapter Tests" -tags "CI" {
             Remove-TypeData TestCodeMethodInvokationWithVoidReturn
         }
     }
+
+    It "Count and length property works for singletons" {
+        $x = 5
+        $x.Count | Should Be 1
+        $x.Length | Should Be 1
+
+        $null.Count | Should Be 0
+        $null.Length | Should Be 0
+
+        (10).Count | Should Be 1
+        (10).Length | Should Be 1
+
+        ("a").Count | Should Be 1
+        ("a").Length | Should Be 1
+
+        ([psobject] @{ foo = 'bar' }).Count | Should Be 1
+        ([psobject] @{ foo = 'bar' }).Length | Should Be 1
+
+        ([pscustomobject] @{ foo = 'bar' }).Count | Should Be 1
+        ([pscustomobject] @{ foo = 'bar' }).Length | Should Be 1
+    }
 }
 
 Describe "Adapter XML Tests" -tags "CI" {

Original file line number	Diff line number	Diff line change
`@@ -5690,6 +5690,11 @@ internal static object GetAdaptedValue(object obj, string member)`
`5690`	`5690`	`return memberInfo.Value;`
`5691`	`5691`	`}`
`5692`	`5692`
	`5693`	`+ if (string.Equals(member, "Length", StringComparison.OrdinalIgnoreCase) \|\| string.Equals(member, "Count", StringComparison.OrdinalIgnoreCase))`
	`5694`	`+ {`
	`5695`	`+ return 1;`
	`5696`	`+ }`
	`5697`	`+`
`5693`	`5698`	`if (context != null && context.IsStrictVersion(2))`
`5694`	`5699`	`{`
`5695`	`5700`	`// If the member is undefined and we're in strict mode, throw an exception...`