Skip to content

Temporary convertions in mshobject #9149

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
iSazonov wants to merge 13 commits into from
Closed

Temporary convertions in mshobject #9149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e7221cd
HasGeneratedReservedMembers
iSazonov Mar 16, 2019
fd0766e
DotNetStaticAdapter
iSazonov Mar 16, 2019
8038c4e
DotNetInstanceAdapter
iSazonov Mar 16, 2019
9d6bfb1
ClrMembers
iSazonov Mar 16, 2019
2ac60a5
AdaptedMembers
iSazonov Mar 16, 2019
4f06b80
MemberResolution
iSazonov Mar 16, 2019
00eb582
ImmediateBaseObjectIsEmpty
iSazonov Mar 16, 2019
6190524
TokenText
iSazonov Mar 16, 2019
fa130ec
ToStringFromDeserialization
iSazonov Mar 16, 2019
803e010
IsDeserialized
iSazonov Mar 16, 2019
d8ff2f4
StoreTypeNameAndInstanceMembersLocally
iSazonov Mar 16, 2019
8b69140
Reorder
iSazonov Mar 16, 2019
555cf68
Minor fixes
iSazonov Mar 16, 2019
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
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ private bool HandlePrimitiveKnownTypePSObject(object source, string property, in

bool sourceHandled = false;
PSObject moSource = source as PSObject;
if (moSource != null && !moSource.immediateBaseObjectIsEmpty)
if (moSource != null && !moSource.ImmediateBaseObjectIsEmpty)
{
// Check if baseObject is primitive known type
object baseObject = moSource.ImmediateBaseObject;
Expand All @@ -367,7 +367,7 @@ private bool HandleKnownContainerTypes(object source, string property, int depth
IDictionary dictionary = null;

// If passed in object is PSObject with no baseobject, return false.
if (mshSource != null && mshSource.immediateBaseObjectIsEmpty)
if (mshSource != null && mshSource.ImmediateBaseObjectIsEmpty)
{
return false;
}
Expand Down Expand Up @@ -411,7 +411,7 @@ private bool HandleKnownContainerTypes(object source, string property, int depth
// We serialize properties of enumerable and on deserialization mark the object
// as Deserialized. So if object is marked deserialized, we should write properties.
// Note: we do not serialize the properties of IEnumerable if depth is zero.
if (depth != 0 && (ct == ContainerType.Enumerable || (mshSource != null && mshSource.isDeserialized)))
if (depth != 0 && (ct == ContainerType.Enumerable || (mshSource != null && mshSource.IsDeserialized)))
{
// Note:Depth is the depth for serialization of baseObject.
// Depth for serialization of each property is one less.
Expand Down Expand Up @@ -595,7 +595,7 @@ private void HandleComplexTypePSObject(PSObject source, string property, int dep
bool isEnum = false;
bool isPSObject = false;

if (!source.immediateBaseObjectIsEmpty)
if (!source.ImmediateBaseObjectIsEmpty)
{
isEnum = source.ImmediateBaseObject is Enum;
isPSObject = source.ImmediateBaseObject is PSObject;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetMember.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected override void ProcessRecord()
Adapter staticAdapter = null;
if (this.Static == true)
{
staticAdapter = PSObject.dotNetStaticAdapter;
staticAdapter = PSObject.DotNetStaticAdapter;
object baseObject = this.InputObject.BaseObject;
baseObjectAsType = baseObject as System.Type ?? baseObject.GetType();
typeName = baseObjectAsType.FullName;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ private static object ProcessValue(object obj, int currentDepth, in ConvertToJso
{
if (currentDepth > context.MaxDepth)
{
if (pso != null && pso.immediateBaseObjectIsEmpty)
if (pso != null && pso.ImmediateBaseObjectIsEmpty)
{
// The obj is a pure PSObject, we convert the original PSObject to a string,
// instead of its base object in this case
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6564,7 +6564,7 @@ internal static void CompleteMemberHelper(
return;
}

members = PSObject.dotNetStaticAdapter.BaseGetMembers<PSMemberInfo>(type);
members = PSObject.DotNetStaticAdapter.BaseGetMembers<PSMemberInfo>(type);
}
else
{
Expand Down
22 changes: 11 additions & 11 deletions src/System.Management.Automation/engine/CoreAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ internal static Type EffectiveArgumentType(object arg)

internal static void SetReferences(object[] arguments, MethodInformation methodInformation, object[] originalArguments)
{
using (PSObject.memberResolution.TraceScope("Checking for possible references."))
using (PSObject.MemberResolution.TraceScope("Checking for possible references."))
{
ParameterInformation[] parameters = methodInformation.parameters;
for (int i = 0; (i < originalArguments.Length) && (i < parameters.Length) && (i < arguments.Length); i++)
Expand Down Expand Up @@ -1567,7 +1567,7 @@ internal static void SetReferences(object[] arguments, MethodInformation methodI
}

object argument = arguments[i];
PSObject.memberResolution.WriteLine("Argument '{0}' was a reference so it will be set to \"{1}\".", i + 1, argument);
PSObject.MemberResolution.WriteLine("Argument '{0}' was a reference so it will be set to \"{1}\".", i + 1, argument);
originalArgumentReference.Value = argument;
}
}
Expand Down Expand Up @@ -1741,7 +1741,7 @@ internal static object MethodArgumentConvertTo(object valueToConvert,
bool isParameterByRef, int parameterIndex, Type resultType,
IFormatProvider formatProvider)
{
using (PSObject.memberResolution.TraceScope("Method argument conversion."))
using (PSObject.MemberResolution.TraceScope("Method argument conversion."))
{
if (resultType == null)
{
Expand Down Expand Up @@ -1772,7 +1772,7 @@ internal static object UnReference(object obj, out bool isArgumentByRef)
PSReference reference = obj as PSReference;
if (reference != null)
{
PSObject.memberResolution.WriteLine("Parameter was a reference.");
PSObject.MemberResolution.WriteLine("Parameter was a reference.");
isArgumentByRef = true;
return reference.Value;
}
Expand All @@ -1785,7 +1785,7 @@ internal static object UnReference(object obj, out bool isArgumentByRef)

if (reference != null)
{
PSObject.memberResolution.WriteLine("Parameter was an PSObject containing a reference.");
PSObject.MemberResolution.WriteLine("Parameter was an PSObject containing a reference.");
isArgumentByRef = true;
return reference.Value;
}
Expand All @@ -1796,7 +1796,7 @@ internal static object UnReference(object obj, out bool isArgumentByRef)
internal static object PropertySetAndMethodArgumentConvertTo(object valueToConvert,
Type resultType, IFormatProvider formatProvider)
{
using (PSObject.memberResolution.TraceScope("Converting parameter \"{0}\" to \"{1}\".", valueToConvert, resultType))
using (PSObject.MemberResolution.TraceScope("Converting parameter \"{0}\" to \"{1}\".", valueToConvert, resultType))
{
if (resultType == null)
{
Expand All @@ -1808,7 +1808,7 @@ internal static object PropertySetAndMethodArgumentConvertTo(object valueToConve
{
if (resultType == typeof(object))
{
PSObject.memberResolution.WriteLine("Parameter was an PSObject and will be converted to System.Object.");
PSObject.MemberResolution.WriteLine("Parameter was an PSObject and will be converted to System.Object.");
// we use PSObject.Base so we don't return
// PSCustomObject
return PSObject.Base(mshObj);
Expand Down Expand Up @@ -4061,7 +4061,7 @@ internal static object MethodInvokeDotNet(

string methodDefinition = bestMethod.methodDefinition;
ScriptTrace.Trace(1, "TraceMethodCall", ParserStrings.TraceMethodCall, methodDefinition);
PSObject.memberResolution.WriteLine("Calling Method: {0}", methodDefinition);
PSObject.MemberResolution.WriteLine("Calling Method: {0}", methodDefinition);
return AuxiliaryMethodInvoke(target, newArguments, bestMethod, arguments);
}

Expand All @@ -4084,9 +4084,9 @@ internal static object ConstructorInvokeDotNet(Type type, ConstructorInfo[] cons

private static object InvokeResolvedConstructor(MethodInformation bestMethod, object[] newArguments, object[] arguments)
{
if ((PSObject.memberResolution.Options & PSTraceSourceOptions.WriteLine) != 0)
if ((PSObject.MemberResolution.Options & PSTraceSourceOptions.WriteLine) != 0)
{
PSObject.memberResolution.WriteLine("Calling Constructor: {0}", DotNetAdapter.GetMethodInfoOverloadDefinition(null,
PSObject.MemberResolution.WriteLine("Calling Constructor: {0}", DotNetAdapter.GetMethodInfoOverloadDefinition(null,
bestMethod.method, 0));
}

Expand All @@ -4107,7 +4107,7 @@ internal static void ParameterizedPropertyInvokeSet(string propertyName, object
// of all parameters but the last one
object[] newArguments;
MethodInformation bestMethod = GetBestMethodAndArguments(propertyName, methodInformation, arguments, out newArguments);
PSObject.memberResolution.WriteLine("Calling Set Method: {0}", bestMethod.methodDefinition);
PSObject.MemberResolution.WriteLine("Calling Set Method: {0}", bestMethod.methodDefinition);
ParameterInfo[] bestMethodParameters = bestMethod.method.GetParameters();
Type propertyType = bestMethodParameters[bestMethodParameters.Length - 1].ParameterType;

Expand Down
46 changes: 23 additions & 23 deletions src/System.Management.Automation/engine/MshMemberInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3329,11 +3329,11 @@ internal override PSMemberInfoInternalCollection<PSMemberInfo> InternalMembers

private void GenerateInternalMembersFromBase()
{
if (_psObject.isDeserialized)
if (_psObject.IsDeserialized)
{
if (_psObject.clrMembers != null)
if (_psObject.ClrMembers != null)
{
foreach (PSMemberInfo member in _psObject.clrMembers)
foreach (PSMemberInfo member in _psObject.ClrMembers)
{
internalMembers.Add(member.Copy());
}
Expand All @@ -3342,7 +3342,7 @@ private void GenerateInternalMembersFromBase()
else
{
foreach (PSMemberInfo member in
PSObject.dotNetInstanceAdapter.BaseGetMembers<PSMemberInfo>(_psObject.ImmediateBaseObject))
PSObject.DotNetInstanceAdapter.BaseGetMembers<PSMemberInfo>(_psObject.ImmediateBaseObject))
{
internalMembers.Add(member.Copy());
}
Expand All @@ -3353,11 +3353,11 @@ private PSMemberInfoInternalCollection<PSMemberInfo> GetInternalMembersFromAdapt
{
PSMemberInfoInternalCollection<PSMemberInfo> retVal = new PSMemberInfoInternalCollection<PSMemberInfo>();

if (_psObject.isDeserialized)
if (_psObject.IsDeserialized)
{
if (_psObject.adaptedMembers != null)
if (_psObject.AdaptedMembers != null)
{
foreach (PSMemberInfo member in _psObject.adaptedMembers)
foreach (PSMemberInfo member in _psObject.AdaptedMembers)
{
retVal.Add(member.Copy());
}
Expand All @@ -3377,7 +3377,7 @@ private PSMemberInfoInternalCollection<PSMemberInfo> GetInternalMembersFromAdapt

private void GenerateInternalMembersFromPSObject()
{
PSMemberInfoCollection<PSMemberInfo> members = PSObject.dotNetInstanceAdapter.BaseGetMembers<PSMemberInfo>(
PSMemberInfoCollection<PSMemberInfo> members = PSObject.DotNetInstanceAdapter.BaseGetMembers<PSMemberInfo>(
_psObject);
foreach (PSMemberInfo member in members)
{
Expand Down Expand Up @@ -4382,9 +4382,9 @@ internal class PSMemberInfoIntegratingCollection<T> : PSMemberInfoCollection<T>,

private void GenerateAllReservedMembers()
{
if (!_mshOwner.hasGeneratedReservedMembers)
if (!_mshOwner.HasGeneratedReservedMembers)
{
_mshOwner.hasGeneratedReservedMembers = true;
_mshOwner.HasGeneratedReservedMembers = true;
ReservedNameMembers.GeneratePSExtendedMemberSet(_mshOwner);
ReservedNameMembers.GeneratePSBaseMemberSet(_mshOwner);
ReservedNameMembers.GeneratePSObjectMemberSet(_mshOwner);
Expand Down Expand Up @@ -4676,7 +4676,7 @@ public override T this[string name]
{
get
{
using (PSObject.memberResolution.TraceScope("Lookup"))
using (PSObject.MemberResolution.TraceScope("Lookup"))
{
if (string.IsNullOrEmpty(name))
{
Expand All @@ -4697,7 +4697,7 @@ public override T this[string name]
member = instanceMembers[name];
if (member is T memberAsT)
{
PSObject.memberResolution.WriteLine("Found PSObject instance member: {0}.", name);
PSObject.MemberResolution.WriteLine("Found PSObject instance member: {0}.", name);
return memberAsT;
}
}
Expand All @@ -4711,7 +4711,7 @@ public override T this[string name]
// In membersets we cannot replicate the instance when adding
// since the memberset might not yet have an associated PSObject.
// We replicate the instance when returning the members of the memberset.
PSObject.memberResolution.WriteLine("Found PSMemberSet member: {0}.", name);
PSObject.MemberResolution.WriteLine("Found PSMemberSet member: {0}.", name);
member.ReplicateInstance(delegateOwner);
return memberAsT;
}
Expand Down Expand Up @@ -4748,7 +4748,7 @@ public override T this[string name]

private PSMemberInfoInternalCollection<T> GetIntegratedMembers(MshMemberMatchOptions matchOptions)
{
using (PSObject.memberResolution.TraceScope("Generating the total list of members"))
using (PSObject.MemberResolution.TraceScope("Generating the total list of members"))
{
PSMemberInfoInternalCollection<T> returnValue = new PSMemberInfoInternalCollection<T>();
object delegateOwner;
Expand Down Expand Up @@ -4794,14 +4794,14 @@ private PSMemberInfoInternalCollection<T> GetIntegratedMembers(MshMemberMatchOpt
PSMemberInfo previousMember = returnValue[member.Name];
if (previousMember != null)
{
PSObject.memberResolution.WriteLine("Member \"{0}\" of type \"{1}\" has been ignored because a member with the same name and type \"{2}\" is already present.",
PSObject.MemberResolution.WriteLine("Member \"{0}\" of type \"{1}\" has been ignored because a member with the same name and type \"{2}\" is already present.",
member.Name, member.MemberType, previousMember.MemberType);
continue;
}

if (!member.MatchesOptions(matchOptions))
{
PSObject.memberResolution.WriteLine("Skipping hidden member \"{0}\".", member.Name);
PSObject.MemberResolution.WriteLine("Skipping hidden member \"{0}\".", member.Name);
continue;
}

Expand Down Expand Up @@ -4871,7 +4871,7 @@ public override ReadOnlyPSMemberInfoCollection<T> Match(string name, PSMemberTyp
/// <exception cref="ArgumentException">For invalid arguments.</exception>
internal override ReadOnlyPSMemberInfoCollection<T> Match(string name, PSMemberTypes memberTypes, MshMemberMatchOptions matchOptions)
{
using (PSObject.memberResolution.TraceScope("Matching \"{0}\"", name))
using (PSObject.MemberResolution.TraceScope("Matching \"{0}\"", name))
{
if (string.IsNullOrEmpty(name))
{
Expand All @@ -4886,7 +4886,7 @@ internal override ReadOnlyPSMemberInfoCollection<T> Match(string name, PSMemberT
WildcardPattern nameMatch = MemberMatch.GetNamePattern(name);
PSMemberInfoInternalCollection<T> allMembers = GetIntegratedMembers(matchOptions);
ReadOnlyPSMemberInfoCollection<T> returnValue = new ReadOnlyPSMemberInfoCollection<T>(MemberMatch.Match(allMembers, name, nameMatch, memberTypes));
PSObject.memberResolution.WriteLine("{0} total matches.", returnValue.Count);
PSObject.MemberResolution.WriteLine("{0} total matches.", returnValue.Count);
return returnValue;
}
}
Expand Down Expand Up @@ -4919,21 +4919,21 @@ internal struct Enumerator<S> : IEnumerator<S> where S : PSMemberInfo
/// <param name="integratingCollection">Members we are enumerating.</param>
internal Enumerator(PSMemberInfoIntegratingCollection<S> integratingCollection)
{
using (PSObject.memberResolution.TraceScope("Enumeration Start"))
using (PSObject.MemberResolution.TraceScope("Enumeration Start"))
{
_currentIndex = -1;
_current = null;
_allMembers = integratingCollection.GetIntegratedMembers(MshMemberMatchOptions.None);
if (integratingCollection._mshOwner != null)
{
integratingCollection.GenerateAllReservedMembers();
PSObject.memberResolution.WriteLine("Enumerating PSObject with type \"{0}\".", integratingCollection._mshOwner.ImmediateBaseObject.GetType().FullName);
PSObject.memberResolution.WriteLine("PSObject instance members: {0}", _allMembers.VisibleCount);
PSObject.MemberResolution.WriteLine("Enumerating PSObject with type \"{0}\".", integratingCollection._mshOwner.ImmediateBaseObject.GetType().FullName);
PSObject.MemberResolution.WriteLine("PSObject instance members: {0}", _allMembers.VisibleCount);
}
else
{
PSObject.memberResolution.WriteLine("Enumerating PSMemberSet \"{0}\".", integratingCollection._memberSetOwner.Name);
PSObject.memberResolution.WriteLine("MemberSet instance members: {0}", _allMembers.VisibleCount);
PSObject.MemberResolution.WriteLine("Enumerating PSMemberSet \"{0}\".", integratingCollection._memberSetOwner.Name);
PSObject.MemberResolution.WriteLine("MemberSet instance members: {0}", _allMembers.VisibleCount);
}
}
}
Expand Down
Loading