admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply the InlineAsTypeCheck in the engine code - 2nd pass (#19694)

Browse Source
This commit is contained in:
Dmitry Volodin
2023-07-10 17:17:08 -07:00
committed by GitHub
parent b679b59e73
commit a26b09d71e
22 changed files with 93 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs
+2 -4
View File
@@ -176,15 +176,13 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// need to check the type:
// it can be a string or a script block
ScriptBlock sb = val as ScriptBlock;
if (sb != null)
if (val is ScriptBlock sb)
{
PSPropertyExpression ex = new PSPropertyExpression(sb);
return ex;
}
string s = val as string;
if (s != null)
if (val is string s)
{
if (string.IsNullOrEmpty(s))
{
src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
+20 -39
View File
@@ -131,9 +131,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
_cache ??= new FormattedObjectsCache(this.LineOutput.RequiresBuffering);
// no need for formatting, just process the object
FormatStartData formatStart = o as FormatStartData;
if (formatStart != null)
if (o is FormatStartData formatStart)
{
// get autosize flag from object
// turn on group caching
@@ -145,8 +143,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
else
{
// If the format info doesn't define column widths, then auto-size based on the first ten elements
TableHeaderInfo headerInfo = formatStart.shapeInfo as TableHeaderInfo;
if ((headerInfo != null) &&
if ((formatStart.shapeInfo is TableHeaderInfo headerInfo) &&
(headerInfo.tableColumnInfoList.Count > 0) &&
(headerInfo.tableColumnInfoList[0].width == 0))
{
@@ -258,8 +255,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// <returns>Whether the object needs to be shunted to preprocessing.</returns>
private bool NeedsPreprocessing(object o)
{
FormatEntryData fed = o as FormatEntryData;
if (fed != null)
if (o is FormatEntryData fed)
{
// we got an already pre-processed object
if (!fed.outOfBand)
@@ -322,8 +318,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// need to abort the command
string violatingCommand = "format-*";
StartData sdObj = obj as StartData;
if (sdObj != null)
if (obj is StartData sdObj)
{
if (sdObj.shapeInfo is WideViewHeaderInfo)
{
@@ -383,18 +378,16 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
FormatMessagesContextManager.OutputContext parentContext,
FormatInfoData formatInfoData)
{
FormatStartData formatStartData = formatInfoData as FormatStartData;
// initialize the format context
if (formatStartData != null)
if (formatInfoData is FormatStartData formatStartData)
{
FormatOutputContext foc = new FormatOutputContext(parentContext, formatStartData);
return foc;
}
GroupStartData gsd = formatInfoData as GroupStartData;
// we are starting a group, initialize the group context
if (gsd != null)
if (formatInfoData is GroupStartData gsd)
{
GroupOutputContext goc = null;
@@ -544,8 +537,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
private void ProcessOutOfBandPayload(FormatEntryData fed)
{
// try if it is raw text
RawTextFormatEntry rte = fed.formatEntryInfo as RawTextFormatEntry;
if (rte != null)
if (fed.formatEntryInfo is RawTextFormatEntry rte)
{
if (fed.isHelpObject)
{
@@ -564,8 +556,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
}
// try if it is a complex entry
ComplexViewEntry cve = fed.formatEntryInfo as ComplexViewEntry;
if (cve != null && cve.formatValueList != null)
if (fed.formatEntryInfo is ComplexViewEntry cve && cve.formatValueList != null)
{
ComplexWriter complexWriter = new ComplexWriter();
@@ -575,8 +566,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
return;
}
// try if it is a list view
ListViewEntry lve = fed.formatEntryInfo as ListViewEntry;
if (lve != null && lve.listViewFieldList != null)
if (fed.formatEntryInfo is ListViewEntry lve && lve.listViewFieldList != null)
{
ListWriter listWriter = new ListWriter();
@@ -628,9 +618,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
for (FormatMessagesContextManager.OutputContext oc = _ctxManager.ActiveOutputContext; oc != null; oc = oc.ParentContext)
{
FormatOutputContext foc = oc as FormatOutputContext;
if (foc != null)
if (oc is FormatOutputContext foc)
return foc;
}
@@ -655,17 +643,13 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
_formattingHint = null;
TableHeaderInfo thi = formatStartData.shapeInfo as TableHeaderInfo;
if (thi != null)
if (formatStartData.shapeInfo is TableHeaderInfo thi)
{
ProcessCachedGroupOnTable(thi, objects);
return;
}
WideViewHeaderInfo wvhi = formatStartData.shapeInfo as WideViewHeaderInfo;
if (wvhi != null)
if (formatStartData.shapeInfo is WideViewHeaderInfo wvhi)
{
ProcessCachedGroupOnWide(wvhi, objects);
return;
@@ -982,11 +966,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// </summary>
internal override void Initialize()
{
TableFormattingHint tableHint = this.InnerCommand.RetrieveFormattingHint() as TableFormattingHint;
int[] columnWidthsHint = null;
// We expect that console width is less then 120.
// We expect that console width is less than 120.
if (tableHint != null)
if (this.InnerCommand.RetrieveFormattingHint() is TableFormattingHint tableHint)
{
columnWidthsHint = tableHint.columnWidths;
}
@@ -1215,13 +1198,11 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// set the hard wider default, to be used if no other info is available
int itemsPerRow = 2;
// get the header info and the view hint
WideFormattingHint hint = this.InnerCommand.RetrieveFormattingHint() as WideFormattingHint;
// get the header info
int columnsOnTheScreen = GetConsoleWindowWidth(this.InnerCommand._lo.ColumnNumber);
// give a preference to the hint, if there
if (hint != null && hint.maxWidth > 0)
if (this.InnerCommand.RetrieveFormattingHint() is WideFormattingHint hint && hint.maxWidth > 0)
{
itemsPerRow = TableWriter.ComputeWideViewBestItemsPerRowFit(hint.maxWidth, columnsOnTheScreen);
}
@@ -1402,10 +1383,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// <param name="fed">FormatEntryData to process.</param>
internal override void ProcessPayload(FormatEntryData fed)
{
ComplexViewEntry cve = fed.formatEntryInfo as ComplexViewEntry;
if (cve == null || cve.formatValueList == null)
return;
_writer.WriteObject(cve.formatValueList);
if (fed.formatEntryInfo is ComplexViewEntry cve && cve.formatValueList is not null)
{
_writer.WriteObject(cve.formatValueList);
}
}
private readonly ComplexWriter _writer = new ComplexWriter();
src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs
+3 -6
View File
@@ -70,8 +70,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
foreach (object obj in fe.formatValueList)
{
FormatEntry feChild = obj as FormatEntry;
if (feChild != null)
if (obj is FormatEntry feChild)
{
if (currentDepth < maxRecursionDepth)
{
@@ -100,15 +99,13 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
continue;
}
FormatTextField ftf = obj as FormatTextField;
if (ftf != null)
if (obj is FormatTextField ftf)
{
this.AddToBuffer(ftf.text);
continue;
}
FormatPropertyField fpf = obj as FormatPropertyField;
if (fpf != null)
if (obj is FormatPropertyField fpf)
{
this.AddToBuffer(fpf.propertyValue);
}
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs
+3 -7
View File
@@ -384,14 +384,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
match = true;
}
if (match && !allowAttributes)
if (match && !allowAttributes && n is XmlElement e && e.Attributes.Count > 0)
{
XmlElement e = n as XmlElement;
if (e != null && e.Attributes.Count > 0)
{
// Error at XPath {0} in file {1}: The XML Element {2} does not allow attributes.
ReportError(StringUtil.Format(FormatAndOutXmlLoadingStrings.AttributesNotAllowed, ComputeCurrentXPath(), FilePath, n.Name));
}
// Error at XPath {0} in file {1}: The XML Element {2} does not allow attributes.
ReportError(StringUtil.Format(FormatAndOutXmlLoadingStrings.AttributesNotAllowed, ComputeCurrentXPath(), FilePath, n.Name));
}
return match;
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs
+3 -11
View File
@@ -179,14 +179,12 @@ namespace System.Management.Automation
return new CustomItemNewline();
}
var textToken = token as TextToken;
if (textToken != null)
if (token is TextToken textToken)
{
return new CustomItemText { Text = textToken.text };
}
var frameToken = token as FrameToken;
if (frameToken != null)
if (token is FrameToken frameToken)
{
var frame = new CustomItemFrame
{
@@ -211,8 +209,7 @@ namespace System.Management.Automation
return frame;
}
var cpt = token as CompoundPropertyToken;
if (cpt != null)
if (token is CompoundPropertyToken cpt)
{
var cie = new CustomItemExpression { EnumerateCollection = cpt.enumerateCollection };
@@ -234,11 +231,6 @@ namespace System.Management.Automation
return cie;
}
var fpt = token as FieldPropertyToken;
if (fpt != null)
{
}
Diagnostics.Assert(false, "Unexpected formatting token kind");
return null;
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs
+1 -2
View File
@@ -318,8 +318,7 @@ namespace System.Management.Automation
Label = definition.label.text;
}
FieldPropertyToken fpt = definition.formatTokenList[0] as FieldPropertyToken;
if (fpt != null)
if (definition.formatTokenList[0] is FieldPropertyToken fpt)
{
if (fpt.fieldFormattingDirective.formatString != null)
{
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs
+1 -2
View File
@@ -446,10 +446,9 @@ namespace System.Management.Automation
foreach (TableRowItemDefinition itemdef in rowdefinition.rowItemDefinitionList)
{
FieldPropertyToken fpt = itemdef.formatTokenList[0] as FieldPropertyToken;
TableControlColumn column;
if (fpt != null)
if (itemdef.formatTokenList[0] is FieldPropertyToken fpt)
{
column = new TableControlColumn(fpt.expression.expressionValue, itemdef.alignment,
fpt.expression.isScriptBlock, fpt.fieldFormattingDirective.formatString);
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs
+1 -2
View File
@@ -204,8 +204,7 @@ namespace System.Management.Automation
internal WideControlEntryItem(WideControlEntryDefinition definition) : this()
{
FieldPropertyToken fpt = definition.formatTokenList[0] as FieldPropertyToken;
if (fpt != null)
if (definition.formatTokenList[0] is FieldPropertyToken fpt)
{
DisplayEntry = new DisplayEntry(fpt.expression);
FormatString = fpt.fieldFormattingDirective.formatString;
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
+3 -6
View File
@@ -143,9 +143,8 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
}
int currentMatch = BestMatchIndexUndefined;
TypeReference tr = r as TypeReference;
if (tr != null)
if (r is TypeReference tr)
{
// we have a type
currentMatch = MatchTypeIndex(tr.name, currentObject, ex);
@@ -486,9 +485,8 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
foreach (TypeOrGroupReference togr in vd.appliesTo.referenceList)
{
StringBuilder sb = new StringBuilder();
TypeReference tr = togr as TypeReference;
sb.Append(isMatched ? "MATCH FOUND" : "NOT MATCH");
if (tr != null)
if (togr is TypeReference tr)
{
sb.AppendFormat(
CultureInfo.InvariantCulture,
@@ -601,8 +599,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
foreach (TypeOrGroupReference r in appliesTo.referenceList)
{
// if it is a type reference, just add the type name
TypeReference tr = r as TypeReference;
if (tr != null)
if (r is TypeReference tr)
{
if (!allTypes.Contains(tr.name))
allTypes.Add(tr.name);
src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs
+4 -8
View File
@@ -1085,20 +1085,17 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
private FormatToken LoadFormatTokenFromObjectModel(CustomItemBase item, int viewIndex, string typeName)
{
var newline = item as CustomItemNewline;
if (newline != null)
if (item is CustomItemNewline newline)
{
return new NewLineToken { count = newline.Count };
}
var text = item as CustomItemText;
if (text != null)
if (item is CustomItemText text)
{
return new TextToken { text = text.Text };
}
var expr = item as CustomItemExpression;
if (expr != null)
if (item is CustomItemExpression expr)
{
var cpt = new CompoundPropertyToken { enumerateCollection = expr.EnumerateCollection };
@@ -1766,9 +1763,8 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
private bool LoadStringResourceReference(XmlNode n, out StringResourceReference resource)
{
resource = null;
XmlElement e = n as XmlElement;
if (e == null)
if (n is not XmlElement e)
{
// Error at XPath {0} in file {1}: Node should be an XmlElement.
this.ReportError(StringUtil.Format(FormatAndOutXmlLoadingStrings.NonXmlElementNode, ComputeCurrentXPath(), FilePath));
src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs
+1 -2
View File
@@ -68,8 +68,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
internal void Process(object o)
{
PacketInfoData formatData = o as PacketInfoData;
FormatEntryData fed = formatData as FormatEntryData;
if (fed != null)
if (formatData is FormatEntryData fed)
{
OutputContext ctx = null;
src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs
+6 -12
View File
@@ -141,13 +141,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
return;
}
// check if we have a view with autosize checked
if (this.dataBaseInfo.view != null && this.dataBaseInfo.view.mainControl != null)
if (this.dataBaseInfo.view != null && this.dataBaseInfo.view.mainControl != null
&& this.dataBaseInfo.view.mainControl is ControlBody controlBody && controlBody.autosize.HasValue)
{
ControlBody controlBody = this.dataBaseInfo.view.mainControl as ControlBody;
if (controlBody != null && controlBody.autosize.HasValue)
{
_autosize = controlBody.autosize.Value;
}
_autosize = controlBody.autosize.Value;
}
}
@@ -439,17 +436,14 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
if (formatTokenList.Count != 0)
{
FormatToken token = formatTokenList[0];
FieldPropertyToken fpt = token as FieldPropertyToken;
if (fpt != null)
if (token is FieldPropertyToken fpt)
{
PSPropertyExpression ex = this.expressionFactory.CreateFromExpressionToken(fpt.expression, this.dataBaseInfo.view.loadingInfo);
fpf.propertyValue = this.GetExpressionDisplayValue(so, enumerationLimit, ex, fpt.fieldFormattingDirective, out result);
}
else
else if (token is TextToken tt)
{
TextToken tt = token as TextToken;
if (tt != null)
fpf.propertyValue = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
fpf.propertyValue = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
}
}
else
src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs
+5 -10
View File
@@ -107,8 +107,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
ComplexControlBody complexBody = null;
// we might have a reference
ControlReference controlReference = control as ControlReference;
if (controlReference != null && controlReference.controlType == typeof(ComplexControlBody))
if (control is ControlReference controlReference && controlReference.controlType == typeof(ComplexControlBody))
{
// retrieve the reference
complexBody = DisplayDataQuery.ResolveControlReference(
@@ -205,8 +204,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
#region foreach loop
foreach (FormatToken t in formatTokenList)
{
TextToken tt = t as TextToken;
if (tt != null)
if (t is TextToken tt)
{
FormatTextField ftf = new FormatTextField();
ftf.text = _db.displayResourceManagerCache.GetTextTokenString(tt);
@@ -214,8 +212,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
continue;
}
var newline = t as NewLineToken;
if (newline != null)
if (t is NewLineToken newline)
{
for (int i = 0; i < newline.count; i++)
{
@@ -225,8 +222,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
continue;
}
FrameToken ft = t as FrameToken;
if (ft != null)
if (t is FrameToken ft)
{
// instantiate a new entry and attach a frame info object
FormatEntry feFrame = new FormatEntry();
@@ -245,8 +241,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
continue;
}
#region CompoundPropertyToken
CompoundPropertyToken cpt = t as CompoundPropertyToken;
if (cpt != null)
if (t is CompoundPropertyToken cpt)
{
if (!EvaluateDisplayCondition(so, cpt.conditionToken))
{
src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs
+4 -7
View File
@@ -114,20 +114,17 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
// we try to fall back and see if we have an un-resolved PSPropertyExpression
FormatToken token = listItem.formatTokenList[0];
FieldPropertyToken fpt = token as FieldPropertyToken;
if (fpt != null)
if (token is FieldPropertyToken fpt)
{
PSPropertyExpression ex = this.expressionFactory.CreateFromExpressionToken(fpt.expression, this.dataBaseInfo.view.loadingInfo);
// use the un-resolved PSPropertyExpression string as a label
lvf.label = ex.ToString();
}
else
else if (token is TextToken tt)
{
TextToken tt = token as TextToken;
if (tt != null)
// we had a text token, use it as a label (last resort...)
lvf.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
// we had a text token, use it as a label (last resort...)
lvf.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
}
}
src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+3 -8
View File
@@ -191,18 +191,13 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
token = rowItem.formatTokenList[0];
if (token != null)
{
FieldPropertyToken fpt = token as FieldPropertyToken;
if (fpt != null)
if (token is FieldPropertyToken fpt)
{
ci.label = fpt.expression.expressionValue;
}
else
else if (token is TextToken tt)
{
TextToken tt = token as TextToken;
if (tt != null)
{
ci.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
}
ci.label = this.dataBaseInfo.db.displayResourceManagerCache.GetTextTokenString(tt);
}
}
else
src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs
+2 -4
View File
@@ -646,8 +646,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
ErrorRecord errorRecord = null;
string msg = null;
PSPropertyExpressionError psPropertyExpressionError = error as PSPropertyExpressionError;
if (psPropertyExpressionError != null)
if (error is PSPropertyExpressionError psPropertyExpressionError)
{
errorRecord = new ErrorRecord(
psPropertyExpressionError.result.Exception,
@@ -660,8 +659,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
errorRecord.ErrorDetails = new ErrorDetails(msg);
}
StringFormatError formattingError = error as StringFormatError;
if (formattingError != null)
if (error is StringFormatError formattingError)
{
errorRecord = new ErrorRecord(
formattingError.exception,
src/System.Management.Automation/FormatAndOutput/common/FormatXMLWriter.cs
+3 -6
View File
@@ -385,8 +385,7 @@ namespace Microsoft.PowerShell.Commands
internal void WriteCustomItem(CustomItemBase item)
{
var newline = item as CustomItemNewline;
if (newline != null)
if (item is CustomItemNewline newline)
{
for (int i = 0; i < newline.Count; i++)
{
@@ -396,15 +395,13 @@ namespace Microsoft.PowerShell.Commands
return;
}
var text = item as CustomItemText;
if (text != null)
if (item is CustomItemText text)
{
_writer.WriteElementString("Text", text.Text);
return;
}
var expr = item as CustomItemExpression;
if (expr != null)
if (item is CustomItemExpression expr)
{
_writer.WriteStartElement("ExpressionBinding");
if (expr.EnumerateCollection)
src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
+2 -4
View File
@@ -30,8 +30,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
internal bool IsFormatInfoData(PSObject so)
{
var fid = PSObject.Base(so) as FormatInfoData;
if (fid != null)
if (PSObject.Base(so) is FormatInfoData fid)
{
if (fid is FormatStartData ||
fid is FormatEndData ||
@@ -86,8 +85,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// <returns>Deserialized object or null.</returns>
internal object Deserialize(PSObject so)
{
var fid = PSObject.Base(so) as FormatInfoData;
if (fid != null)
if (PSObject.Base(so) is FormatInfoData fid)
{
if (fid is FormatStartData ||
fid is FormatEndData ||
src/System.Management.Automation/FormatAndOutput/common/OutputQueue.cs
+6 -10
View File
@@ -43,8 +43,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// <returns>Objects the cache needs to return. It can be null.</returns>
internal List<PacketInfoData> Add(PacketInfoData o)
{
FormatStartData fsd = o as FormatStartData;
if (fsd != null)
if (o is FormatStartData fsd)
{
// just cache the reference (used during the notification call)
_formatStartData = fsd;
@@ -120,12 +119,10 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
{
// add only of it's not a control message
// and it's not out of band
FormatEntryData fed = o as FormatEntryData;
if (fed == null || fed.outOfBand)
return;
_currentObjectCount++;
if (o is FormatEntryData fed && !fed.outOfBand)
{
_currentObjectCount++;
}
}
private void Notify()
@@ -139,8 +136,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
foreach (PacketInfoData x in _queue)
{
FormatEntryData fed = x as FormatEntryData;
if (fed != null && fed.outOfBand)
if (x is FormatEntryData fed && fed.outOfBand)
continue;
validObjects.Add(x);
src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
+18 -28
View File
@@ -121,8 +121,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// <param name="obj">Object to extract the IEnumerable from.</param>
internal static IEnumerable GetEnumerable(object obj)
{
PSObject mshObj = obj as PSObject;
if (mshObj != null)
if (obj is PSObject mshObj)
{
obj = mshObj.BaseObject;
}
@@ -228,8 +227,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
IEnumerator enumerator = e.GetEnumerator();
if (enumerator != null)
{
IBlockingEnumerator<object> be = enumerator as IBlockingEnumerator<object>;
if (be != null)
if (enumerator is IBlockingEnumerator<object> be)
{
while (be.MoveNext(false))
{
@@ -418,22 +416,18 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
private static List<PSPropertyExpression> GetDefaultPropertySet(PSMemberSet standardMembersSet)
{
if (standardMembersSet != null)
if (standardMembersSet != null && standardMembersSet.Members[TypeTable.DefaultDisplayPropertySet] is PSPropertySet defaultDisplayPropertySet)
{
PSPropertySet defaultDisplayPropertySet = standardMembersSet.Members[TypeTable.DefaultDisplayPropertySet] as PSPropertySet;
if (defaultDisplayPropertySet != null)
List<PSPropertyExpression> retVal = new List<PSPropertyExpression>();
foreach (string prop in defaultDisplayPropertySet.ReferencedPropertyNames)
{
List<PSPropertyExpression> retVal = new List<PSPropertyExpression>();
foreach (string prop in defaultDisplayPropertySet.ReferencedPropertyNames)
if (!string.IsNullOrEmpty(prop))
{
if (!string.IsNullOrEmpty(prop))
{
retVal.Add(new PSPropertyExpression(prop));
}
retVal.Add(new PSPropertyExpression(prop));
}
return retVal;
}
return retVal;
}
return new List<PSPropertyExpression>();
@@ -457,21 +451,17 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
private static PSPropertyExpression GetDefaultNameExpression(PSMemberSet standardMembersSet)
{
if (standardMembersSet != null)
if (standardMembersSet != null && standardMembersSet.Members[TypeTable.DefaultDisplayProperty] is PSNoteProperty defaultDisplayProperty)
{
PSNoteProperty defaultDisplayProperty = standardMembersSet.Members[TypeTable.DefaultDisplayProperty] as PSNoteProperty;
if (defaultDisplayProperty != null)
string expressionString = defaultDisplayProperty.Value.ToString();
if (string.IsNullOrEmpty(expressionString))
{
string expressionString = defaultDisplayProperty.Value.ToString();
if (string.IsNullOrEmpty(expressionString))
{
// invalid data, the PSObject is empty
return null;
}
else
{
return new PSPropertyExpression(expressionString);
}
// invalid data, the PSObject is empty
return null;
}
else
{
return new PSPropertyExpression(expressionString);
}
}
src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
+1 -2
View File
@@ -215,8 +215,7 @@ namespace Microsoft.PowerShell.Commands
foreach (PSMemberInfo member in members)
{
// it can be a property set
PSPropertySet propertySet = member as PSPropertySet;
if (propertySet != null)
if (member is PSPropertySet propertySet)
{
if (expand)
{
src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs
+1 -3
View File
@@ -69,9 +69,7 @@ namespace Microsoft.PowerShell.Commands
((OutputManagerInner)this.implementation).LineOutput = lineOutput;
MshCommandRuntime mrt = this.CommandRuntime as MshCommandRuntime;
if (mrt != null)
if (this.CommandRuntime is MshCommandRuntime mrt)
{
mrt.MergeUnclaimedPreviousErrorResults = true;
}