Use compound assignment in /Microsoft.PowerShell.Commands (PowerShell#17722)

Molkree · web-flow · commit 7ce0df7187ee · 2022-07-25T17:04:56.000-07:00
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -1053,10 +1053,7 @@ internal override void WriteObject(object outputObject)
 
             if (this.JobContext.ShowComputerName)
             {
-                if (pso == null)
-                {
-                    pso = PSObject.AsPSObject(outputObject);
-                }
+                pso ??= PSObject.AsPSObject(outputObject);
 
                 AddShowComputerNameMarker(pso);
                 if (cimInstance == null)
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
@@ -107,15 +107,12 @@ internal CimCmdletDefinitionContext CmdletDefinitionContext
         {
             get
             {
-                if (_cmdletDefinitionContext == null)
-                {
-                    _cmdletDefinitionContext = new CimCmdletDefinitionContext(
-                            this.ClassName,
-                            this.ClassVersion,
-                            this.ModuleVersion,
-                            this.Cmdlet.CommandInfo.CommandMetadata.SupportsShouldProcess,
-                            this.PrivateData);
-                }
+                _cmdletDefinitionContext ??= new CimCmdletDefinitionContext(
+                    this.ClassName,
+                    this.ClassVersion,
+                    this.ModuleVersion,
+                    this.Cmdlet.CommandInfo.CommandMetadata.SupportsShouldProcess,
+                    this.PrivateData);
 
                 return _cmdletDefinitionContext;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -1130,11 +1130,8 @@ internal static string GetLocaleName(string locale)
                         culture = CultureInfo.GetCultureInfo((int)localeNum);
                     }
 
-                    if (culture == null)
-                    {
-                        // If TryParse failed we'll try using the original string as culture name
-                        culture = CultureInfo.GetCultureInfo(locale);
-                    }
+                    // If TryParse failed we'll try using the original string as culture name
+                    culture ??= CultureInfo.GetCultureInfo(locale);
                 }
                 catch (Exception)
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/MovePropertyCommand.cs
@@ -61,10 +61,7 @@ public string[] Name
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _property = value;
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
@@ -95,10 +95,7 @@ protected override void ProcessRecord()
 
             // Initialize the content
 
-            if (_content == null)
-            {
-                _content = Array.Empty<object>();
-            }
+            _content ??= Array.Empty<object>();
 
             if (_pipingPaths)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
@@ -344,10 +344,7 @@ private List<MshParameter> ProcessParameter(object[] properties)
             TerminatingErrorContext invocationContext = new(this);
             ParameterProcessor processor =
                 new(new ConvertHTMLExpressionParameterDefinition());
-            if (properties == null)
-            {
-                properties = new object[] { "*" };
-            }
+            properties ??= new object[] { "*" };
 
             return processor.ProcessParameters(properties, invocationContext);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
@@ -275,10 +275,7 @@ protected void SetDebugPreferenceHelper(string processName, string[] appDomainNa
                 {
                     if (!string.IsNullOrEmpty(currentAppDomainName))
                     {
-                        if (appDomainNames == null)
-                        {
-                            appDomainNames = new List<string>();
-                        }
+                        appDomainNames ??= new List<string>();
 
                         appDomainNames.Add(currentAppDomainName.ToLowerInvariant());
                     }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
@@ -72,11 +72,8 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBod
                         FieldPropertyToken fpt = token as FieldPropertyToken;
                         if (fpt != null)
                         {
-                            if (displayName == null)
-                            {
-                                // Database does not provide a label(DisplayName) for the current property, use the expression value instead.
-                                displayName = fpt.expression.expressionValue;
-                            }
+                            // If Database does not provide a label(DisplayName) for the current property, use the expression value instead.
+                            displayName ??= fpt.expression.expressionValue;
 
                             if (fpt.expression.isScriptBlock)
                             {
@@ -170,10 +167,7 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parent
                         propertyName = (string)key;
                 }
 
-                if (propertyName == null)
-                {
-                    propertyName = association.ResolvedExpression.ToString();
-                }
+                propertyName ??= association.ResolvedExpression.ToString();
 
                 ColumnInfo columnInfo = new OriginalColumnInfo(propertyName, propertyName, propertyName, parentCmdlet);
 
@@ -233,10 +227,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                 }
             }
 
-            if (matchingRowDefinition == null)
-            {
-                matchingRowDefinition = match.BestMatch as TableRowDefinition;
-            }
+            matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
 
             if (matchingRowDefinition == null)
             {
@@ -254,10 +245,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
                         }
                     }
 
-                    if (matchingRowDefinition == null)
-                    {
-                        matchingRowDefinition = match.BestMatch as TableRowDefinition;
-                    }
+                    matchingRowDefinition ??= match.BestMatch as TableRowDefinition;
                 }
             }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
@@ -72,10 +72,7 @@ protected override void ProcessRecord()
             else if (AsString)
             {
                 string inputString = InputObject.ToString();
-                if (_lastObjectAsString == null)
-                {
-                    _lastObjectAsString = _lastObject.ToString();
-                }
+                _lastObjectAsString ??= _lastObject.ToString();
 
                 if (string.Equals(
                     inputString,
@@ -91,13 +88,10 @@ protected override void ProcessRecord()
             }
             else // compare as objects
             {
-                if (_comparer == null)
-                {
-                    _comparer = new ObjectCommandComparer(
-                        true, // ascending (doesn't matter)
-                        CultureInfo.CurrentCulture,
-                        true); // case-sensitive
-                }
+                _comparer ??= new ObjectCommandComparer(
+                    true, // ascending (doesn't matter)
+                    CultureInfo.CurrentCulture,
+                    true); // case-sensitive
 
                 isUnique = (_comparer.Compare(InputObject, _lastObject) != 0);
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
@@ -392,10 +392,7 @@ protected override void ProcessRecord()
 
                 if (!_hasProcessedFirstInputObject)
                 {
-                    if (Property == null)
-                    {
-                        Property = OrderByProperty.GetDefaultKeyPropertySet(InputObject);
-                    }
+                    Property ??= OrderByProperty.GetDefaultKeyPropertySet(InputObject);
 
                     _orderByProperty.ProcessExpressionParameter(this, Property);
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -443,10 +443,7 @@ public string[] Module
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _PSSnapins = value;
                 _commandParameterSpecified = true;
@@ -1044,10 +1041,7 @@ private List<T> RehydrateList<T>(string commandName, PSObject deserializedObject
 
         private List<T> RehydrateList<T>(string commandName, object deserializedList, Func<PSObject, T> itemRehydrator)
         {
-            if (itemRehydrator == null)
-            {
-                itemRehydrator = (PSObject pso) => ConvertTo<T>(commandName, pso);
-            }
+            itemRehydrator ??= (PSObject pso) => ConvertTo<T>(commandName, pso);
 
             List<T> result = null;
 
@@ -1068,17 +1062,14 @@ private List<T> RehydrateList<T>(string commandName, object deserializedList, Fu
 
         private Dictionary<TKey, TValue> RehydrateDictionary<TKey, TValue>(
             string commandName,
-            PSObject deserializedObject, 
+            PSObject deserializedObject,
             string propertyName,
             Func<PSObject, TValue> valueRehydrator)
         {
             Dbg.Assert(deserializedObject != null, "deserializedObject parameter != null");
             Dbg.Assert(!string.IsNullOrEmpty(propertyName), "propertyName parameter != null");
 
-            if (valueRehydrator == null)
-            {
-                valueRehydrator = (PSObject pso) => ConvertTo<TValue>(commandName, pso);
-            }
+            valueRehydrator ??= (PSObject pso) => ConvertTo<TValue>(commandName, pso);
 
             Dictionary<TKey, TValue> result = new();
             PSPropertyInfo deserializedDictionaryProperty = deserializedObject.Properties[propertyName];
@@ -3058,10 +3049,7 @@ internal List<string> GenerateProxyModule(
                 FileShare.None);
             using (TextWriter writer = new StreamWriter(psm1, encoding))
             {
-                if (listOfCommandMetadata == null)
-                {
-                    listOfCommandMetadata = new List<CommandMetadata>();
-                }
+                listOfCommandMetadata ??= new List<CommandMetadata>();
 
                 GenerateModuleHeader(writer);
                 GenerateHelperFunctions(writer);
@@ -3079,10 +3067,7 @@ internal List<string> GenerateProxyModule(
                 FileShare.None);
             using (TextWriter writer = new StreamWriter(formatPs1xml, encoding))
             {
-                if (listOfFormatData == null)
-                {
-                    listOfFormatData = new List<ExtendedTypeDefinition>();
-                }
+                listOfFormatData ??= new List<ExtendedTypeDefinition>();
 
                 GenerateFormatFile(writer, listOfFormatData);
                 formatPs1xml.SetLength(formatPs1xml.Position);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -561,8 +561,7 @@ private void AnalyzeObjectProperties(PSObject inObj)
         /// <param name="objValue">The value to analyze.</param>
         private void AnalyzeValue(string propertyName, object objValue)
         {
-            if (propertyName == null)
-                propertyName = thisObject;
+            propertyName ??= thisObject;
 
             Statistics stat = _statistics.EnsureEntry(propertyName);
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -259,10 +259,7 @@ internal void ProcessExpressionParameter(
                         }
                         else
                         {
-                            if (_unExpandedParametersWithWildCardPattern == null)
-                            {
-                                _unExpandedParametersWithWildCardPattern = new List<MshParameter>();
-                            }
+                            _unExpandedParametersWithWildCardPattern ??= new List<MshParameter>();
 
                             _unExpandedParametersWithWildCardPattern.Add(unexpandedParameter);
                         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointCommandBase.cs
@@ -30,10 +30,7 @@ public abstract class PSBreakpointCommandBase : PSCmdlet
         /// </summary>
         protected override void BeginProcessing()
         {
-            if (Runspace == null)
-            {
-                Runspace = Context.CurrentRunspace;
-            }
+            Runspace ??= Context.CurrentRunspace;
         }
 
         #endregion overrides
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
@@ -83,10 +83,7 @@ protected override void ProcessRecord()
                 }
                 else
                 {
-                    if (_listModifier == null)
-                    {
-                        _listModifier = CreatePSListModifier();
-                    }
+                    _listModifier ??= CreatePSListModifier();
 
                     PSMemberInfo memberInfo = InputObject.Members[Property];
                     if (memberInfo != null)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -38,10 +38,7 @@ protected string[] IncludeFilters
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _include = value;
             }
@@ -61,10 +58,7 @@ protected string[] ExcludeFilters
 
             set
             {
-                if (value == null)
-                {
-                    value = Array.Empty<string>();
-                }
+                value ??= Array.Empty<string>();
 
                 _exclude = value;
             }
@@ -258,10 +252,7 @@ public string[] Name
 
             set
             {
-                if (value == null)
-                {
-                    value = new string[] { "*" };
-                }
+                value ??= new string[] { "*" };
 
                 _name = value;
             }
@@ -741,10 +732,7 @@ protected override void ProcessRecord()
             {
                 if (Value != AutomationNull.Value)
                 {
-                    if (_valueList == null)
-                    {
-                        _valueList = new List<object>();
-                    }
+                    _valueList ??= new List<object>();
 
                     _valueList.Add(Value);
                 }
@@ -871,10 +859,7 @@ private void SetVariable(string[] varNames, object varValue)
                                 newVarValue,
                                 newOptions);
 
-                        if (Description == null)
-                        {
-                            Description = string.Empty;
-                        }
+                        Description ??= string.Empty;
 
                         varToSet.Description = Description;
 
@@ -1103,10 +1088,7 @@ protected override void ProcessRecord()
             // Removal of variables only happens in the local scope if the
             // scope wasn't explicitly specified by the user.
 
-            if (Scope == null)
-            {
-                Scope = "local";
-            }
+            Scope ??= "local";
 
             foreach (string varName in Name)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs

Original file line number	Diff line number	Diff line change
`@@ -1130,11 +1130,8 @@ internal static string GetLocaleName(string locale)`
`1130`	`1130`	`culture = CultureInfo.GetCultureInfo((int)localeNum);`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`		`- if (culture == null)`
`1134`		`- {`
`1135`		`- // If TryParse failed we'll try using the original string as culture name`
`1136`		`- culture = CultureInfo.GetCultureInfo(locale);`
`1137`		`- }`
	`1133`	`+ // If TryParse failed we'll try using the original string as culture name`
	`1134`	`+ culture ??= CultureInfo.GetCultureInfo(locale);`
`1138`	`1135`	`}`
`1139`	`1136`	`catch (Exception)`
`1140`	`1137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,7 @@ public string[] Name`
`61`	`61`
`62`	`62`	`set`
`63`	`63`	`{`
`64`		`- if (value == null)`
`65`		`- {`
`66`		`- value = Array.Empty<string>();`
`67`		`- }`
	`64`	`+ value ??= Array.Empty<string>();`
`68`	`65`
`69`	`66`	`_property = value;`
`70`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,7 @@ protected override void ProcessRecord()`
`95`	`95`
`96`	`96`	`// Initialize the content`
`97`	`97`
`98`		`- if (_content == null)`
`99`		`- {`
`100`		`- _content = Array.Empty<object>();`
`101`		`- }`
	`98`	`+ _content ??= Array.Empty<object>();`
`102`	`99`
`103`	`100`	`if (_pipingPaths)`
`104`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,7 @@ protected void SetDebugPreferenceHelper(string processName, string[] appDomainNa`
`275`	`275`	`{`
`276`	`276`	`if (!string.IsNullOrEmpty(currentAppDomainName))`
`277`	`277`	`{`
`278`		`- if (appDomainNames == null)`
`279`		`- {`
`280`		`- appDomainNames = new List<string>();`
`281`		`- }`
	`278`	`+ appDomainNames ??= new List<string>();`
`282`	`279`
`283`	`280`	`appDomainNames.Add(currentAppDomainName.ToLowerInvariant());`
`284`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,8 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBod`
`72`	`72`	`FieldPropertyToken fpt = token as FieldPropertyToken;`
`73`	`73`	`if (fpt != null)`
`74`	`74`	`{`
`75`		`- if (displayName == null)`
`76`		`- {`
`77`		`- // Database does not provide a label(DisplayName) for the current property, use the expression value instead.`
`78`		`- displayName = fpt.expression.expressionValue;`
`79`		`- }`
	`75`	`+ // If Database does not provide a label(DisplayName) for the current property, use the expression value instead.`
	`76`	`+ displayName ??= fpt.expression.expressionValue;`
`80`	`77`
`81`	`78`	`if (fpt.expression.isScriptBlock)`
`82`	`79`	`{`
`@@ -170,10 +167,7 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parent`
`170`	`167`	`propertyName = (string)key;`
`171`	`168`	`}`
`172`	`169`
`173`		`- if (propertyName == null)`
`174`		`- {`
`175`		`- propertyName = association.ResolvedExpression.ToString();`
`176`		`- }`
	`170`	`+ propertyName ??= association.ResolvedExpression.ToString();`
`177`	`171`
`178`	`172`	`ColumnInfo columnInfo = new OriginalColumnInfo(propertyName, propertyName, propertyName, parentCmdlet);`
`179`	`173`
`@@ -233,10 +227,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod`
`233`	`227`	`}`
`234`	`228`	`}`
`235`	`229`
`236`		`- if (matchingRowDefinition == null)`
`237`		`- {`
`238`		`- matchingRowDefinition = match.BestMatch as TableRowDefinition;`
`239`		`- }`
	`230`	`+ matchingRowDefinition ??= match.BestMatch as TableRowDefinition;`
`240`	`231`
`241`	`232`	`if (matchingRowDefinition == null)`
`242`	`233`	`{`
`@@ -254,10 +245,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod`
`254`	`245`	`}`
`255`	`246`	`}`
`256`	`247`
`257`		`- if (matchingRowDefinition == null)`
`258`		`- {`
`259`		`- matchingRowDefinition = match.BestMatch as TableRowDefinition;`
`260`		`- }`
	`248`	`+ matchingRowDefinition ??= match.BestMatch as TableRowDefinition;`
`261`	`249`	`}`
`262`	`250`	`}`
`263`	`251`
Original file line number	Diff line number	Diff line change
`@@ -392,10 +392,7 @@ protected override void ProcessRecord()`
`392`	`392`
`393`	`393`	`if (!_hasProcessedFirstInputObject)`
`394`	`394`	`{`
`395`		`- if (Property == null)`
`396`		`- {`
`397`		`- Property = OrderByProperty.GetDefaultKeyPropertySet(InputObject);`
`398`		`- }`
	`395`	`+ Property ??= OrderByProperty.GetDefaultKeyPropertySet(InputObject);`
`399`	`396`
`400`	`397`	`_orderByProperty.ProcessExpressionParameter(this, Property);`
`401`	`398`