[StyleCleanUp] Address IDE warnings Part 2

src/Microsoft.DotNet.Wpf/src/.editorconfig

@@ -194,9 +194,6 @@ dotnet_diagnostic.IDE0005.severity = suggestion
 # IDE0017: Simplify object initialization
 dotnet_diagnostic.IDE0017.severity = suggestion
 
-# IDE0029: Use coalesce expression
-dotnet_diagnostic.IDE0029.severity = suggestion
-
 # IDE0030: Null check can be simplified
 dotnet_diagnostic.IDE0030.severity = suggestion
 

src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/XmlNodeComparer.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -28,7 +28,7 @@ internal XmlNodeComparer(SortDescriptionCollection sortParameters, XmlNamespaceM
         {
             _sortParameters = sortParameters;
             _namespaceManager = namespaceManager;
-            _culture = (culture == null) ? CultureInfo.InvariantCulture : culture;
+            _culture = culture ?? CultureInfo.InvariantCulture;
         }
 
         int IComparer.Compare(object o1, object o2)

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs

@@ -1278,7 +1278,7 @@ public LineBuffer(string line)
 
             public void SetLine(string line)
             {
-                Content = (line == null) ? string.Empty : line;
+                Content = line ?? string.Empty;
                 Index   = 0;
             }
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/TextShapeableCharacters.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -253,7 +253,7 @@ GlyphRun            glyphRun
             glyphRun.EmitBackground(drawingContext, _properties.BackgroundBrush);
 
             drawingContext.DrawGlyphRun(
-                foregroundBrush != null ? foregroundBrush : _properties.ForegroundBrush,
+                foregroundBrush ?? _properties.ForegroundBrush,
                 glyphRun
                 );
         }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InputManager.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -650,9 +650,9 @@ private bool ProcessStagingArea()
             // PreProcessedInputEventArgs and cast it to NotifyInputEventArgs
             // or ProcessInputEventArgs because a malicious user could upcast
             // the object and call inappropriate methods.
-            NotifyInputEventArgs notifyInputEventArgs = (_notifyInputEventArgs != null) ? _notifyInputEventArgs : new NotifyInputEventArgs();
-            ProcessInputEventArgs processInputEventArgs = (_processInputEventArgs != null) ? _processInputEventArgs : new ProcessInputEventArgs();
-            PreProcessInputEventArgs preProcessInputEventArgs = (_preProcessInputEventArgs != null) ? _preProcessInputEventArgs : new PreProcessInputEventArgs();
+            NotifyInputEventArgs notifyInputEventArgs = _notifyInputEventArgs ?? new NotifyInputEventArgs();
+            ProcessInputEventArgs processInputEventArgs = _processInputEventArgs ?? new ProcessInputEventArgs();
+            PreProcessInputEventArgs preProcessInputEventArgs = _preProcessInputEventArgs ?? new PreProcessInputEventArgs();
             _notifyInputEventArgs = null;
             _processInputEventArgs = null;
             _preProcessInputEventArgs = null;

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/QueryCursorEventArgs.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -44,7 +44,7 @@ public QueryCursorEventArgs(MouseDevice mouse, int timestamp, StylusDevice stylu
         public Cursor Cursor
         {
             get {return _cursor;}
-            set {_cursor = ((value == null) ? Cursors.None : value);}
+            set {_cursor = (value ?? Cursors.None);}
         }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/DrawingDrawingContext.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -1026,8 +1026,7 @@ public override void PushEffect(
             // NOTE:Disabling this API for now
 
             _currentDrawingGroup.BitmapEffect = effect;
-            _currentDrawingGroup.BitmapEffectInput = (effectInput != null) ?
-                                                        effectInput : new BitmapEffectInput();
+            _currentDrawingGroup.BitmapEffectInput = effectInput ?? new BitmapEffectInput();
 }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamily.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -191,7 +191,7 @@ public Uri BaseUri
         public override string ToString()
         {
             string source = _familyIdentifier.Source;
-            return source != null ? source : string.Empty;
+            return source ?? string.Empty;
         }
 
 

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/StreamGeometry.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -396,9 +396,7 @@ internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCh
                     data.hTransform = hTransform;
                     data.FillRule = FillRule;
 
-                    byte[] pathDataToMarshal = _data == null ?
-                        Geometry.GetEmptyPathGeometryData().SerializedData :
-                        _data;
+                    byte[] pathDataToMarshal = _data ?? GetEmptyPathGeometryData().SerializedData;
 
                     unsafe
                     {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Annotations/Component/MarkedHighlightComponent.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -54,7 +54,7 @@ public MarkedHighlightComponent(XmlQualifiedName type, DependencyObject host)
         {
             ArgumentNullException.ThrowIfNull(type);
 
-            _DPHost = host == null ? this : host;
+            _DPHost = host ?? this;
             ClipToBounds = false;
 
             //create anchor highlight. The second parameter controls

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Data/ViewManager.cs

@@ -554,7 +554,7 @@ internal ViewRecord GetViewRecord(object collection, CollectionViewSource cvs, T
                 else
                 {
                     // collection is not a factory - create an appropriate view
-                    IList il = (ilsList != null) ? ilsList : collection as IList;
+                    IList il = ilsList ?? collection as IList;
                     if (il != null)
                     {
                         // create a view on an IList or IBindingList
@@ -582,7 +582,7 @@ internal ViewRecord GetViewRecord(object collection, CollectionViewSource cvs, T
                     throw new ArgumentException(SR.Format(SR.CollectionView_WrongType, collectionViewType.Name));
 
                 // if collection is IListSource, get its list first (bug 1023903)
-                object arg = (ilsList != null) ? ilsList : collection;
+                object arg = ilsList ?? collection;
 
                 try
                 {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Globalization/LocalizableResourceBuilder.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -565,7 +565,7 @@ LocalizabilityAttribute second
         {
             if (first == null || second == null)
             {
-                return (first == null) ? second : first;
+                return first ?? second;
             }
 
             // min of two readability enum. The less the more restrictive.

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Ink/SelectionEditor.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -165,7 +165,7 @@ private void OnAdornerMouseButtonDownEvent(object sender, MouseButtonEventArgs a
                 // If the current captured device is Stylus, we should activate the LassoSelectionBehavior with
                 // the Stylus. Otherwise, use mouse.
                 EditingCoordinator.ActivateDynamicBehavior(EditingCoordinator.LassoSelectionBehavior,
-                    args.StylusDevice != null ? args.StylusDevice : args.Device);
+                    args.StylusDevice ?? args.Device);
             }
         }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PtsHost/FlowDocumentPage.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -292,7 +292,7 @@ internal IInputElement InputHitTestCore(Point point)
                     ie = _ptsPage.InputHitTest(point);
                 }
             }
-            return (ie != null) ? ie : _structuralCache.FormattingOwner as IInputElement;
+            return ie ?? _structuralCache.FormattingOwner as IInputElement;
         }
 
         /// <summary>
@@ -392,7 +392,7 @@ internal ReadOnlyCollection<ParagraphResult> FloatingElementResults
         }
 
         /// <summary>
-        /// Called when a UIElement-derived class which is hosted by a IContentHost changes it�s DesiredSize
+        /// Called when a UIElement-derived class which is hosted by a IContentHost changes it’s DesiredSize
         /// </summary>
         /// <param name="child">
         /// Child element whose DesiredSize has changed
@@ -1212,7 +1212,7 @@ IEnumerator<IInputElement> IContentHost.HostedElements
         }
 
         /// <summary>
-        /// Called when a UIElement-derived class which is hosted by a IContentHost changes it�s DesiredSize
+        /// Called when a UIElement-derived class which is hosted by a IContentHost changes it’s DesiredSize
         /// </summary>
         /// <param name="child">
         /// Child element whose DesiredSize has changed

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PtsHost/Line.cs

@@ -212,7 +212,7 @@ internal override TextSpan<CultureSpecificCharacterBufferRange> GetPrecedingText
                 precedingText = new CharacterBufferRange(precedingTextString, 0, precedingTextString.Length);                
 
                 StaticTextPointer pointer = position.CreateStaticPointer();
-                DependencyObject element = (pointer.Parent != null) ? pointer.Parent : _paraClient.Paragraph.Element;
+                DependencyObject element = pointer.Parent ?? _paraClient.Paragraph.Element;
                 culture = DynamicPropertyReader.GetCultureInfo(element);
             }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/PtsHost/OptimalTextSource.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -161,7 +161,7 @@ internal override TextSpan<CultureSpecificCharacterBufferRange> GetPrecedingText
 
 
                 StaticTextPointer pointer = position.CreateStaticPointer();
-                DependencyObject element = (pointer.Parent != null) ? pointer.Parent : _paraClient.Paragraph.Element;
+                DependencyObject element = pointer.Parent ?? _paraClient.Paragraph.Element;
                 culture = DynamicPropertyReader.GetCultureInfo(element);                
             }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Text/ComplexLine.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -101,7 +101,7 @@ public override TextSpan<CultureSpecificCharacterBufferRange> GetPrecedingText(i
                 precedingText = new CharacterBufferRange(precedingTextString, 0, precedingTextString.Length);                         
 
                 StaticTextPointer pointer = position.CreateStaticPointer();                
-                DependencyObject element = (pointer.Parent != null) ? pointer.Parent : _owner;                
+                DependencyObject element = pointer.Parent ?? _owner;                
                 culture = DynamicPropertyReader.GetCultureInfo(element);                
             }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/CommonItemDialog.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -121,7 +121,7 @@ public string DefaultDirectory
             get
             {
                 // Avoid returning a null string - return String.Empty instead.
-                return _defaultDirectory == null ? String.Empty : _defaultDirectory;
+                return _defaultDirectory ?? string.Empty;
             }
             set
             {
@@ -160,7 +160,7 @@ public string InitialDirectory
             get
             {
                 // Avoid returning a null string - return String.Empty instead.
-                return _initialDirectory == null ? String.Empty : _initialDirectory;
+                return _initialDirectory ?? string.Empty;
             }
             set
             {
@@ -179,7 +179,7 @@ public string RootDirectory
             get
             {
                 // Avoid returning a null string - return String.Empty instead.
-                return _rootDirectory == null ? String.Empty : _rootDirectory;
+                return _rootDirectory ?? string.Empty;
             }
             set
             {
@@ -218,7 +218,7 @@ public string Title
             get
             {
                 // Avoid returning a null string - return String.Empty instead.
-                return _title == null ? String.Empty : _title;
+                return _title ?? string.Empty;
             }
             set
             {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/FileDialog.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -262,7 +262,7 @@ public string DefaultExt
             {
                 // For string properties, it's important to not return null, as an empty
                 // string tends to make more sense to beginning developers.
-                return _defaultExtension == null ? String.Empty : _defaultExtension;
+                return _defaultExtension ?? string.Empty;
             }
 
             set
@@ -307,7 +307,7 @@ public string Filter
             {
                 // For string properties, it's important to not return null, as an empty
                 // string tends to make more sense to beginning developers.
-                return _filter == null ? String.Empty : _filter;
+                return _filter ?? string.Empty;
             }
 
             set

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/FrameworkContentElementAutomationPeer.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -44,7 +44,7 @@ protected override string GetAutomationIdCore()
                 }
             }
 
-            return result == null ? string.Empty : result;
+            return result ?? string.Empty;
         }
 
         ///

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/ItemAutomationPeer.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -677,7 +677,7 @@ private object RawItem
                 if (iwr != null)
                 {
                     object item = iwr.Target;
-                    return (item == null) ? DependencyProperty.UnsetValue : item;
+                    return item ?? DependencyProperty.UnsetValue;
                 }
                 else
                 {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridCellInfo.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -122,7 +122,7 @@ internal static DataGridCellInfo CreatePossiblyPartialCellInfo(object item, Data
             }
             else
             {
-                return new DataGridCellInfo(owner, column, (item == null) ? DependencyProperty.UnsetValue : item);
+                return new DataGridCellInfo(owner, column, item ?? DependencyProperty.UnsetValue);
             }
         }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DocumentPageView.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -103,7 +103,7 @@ public DocumentPaginator DocumentPaginator
         /// </summary>
         public DocumentPage DocumentPage
         {
-            get { return (_documentPage == null) ? DocumentPage.Missing : _documentPage; }
+            get { return _documentPage ?? DocumentPage.Missing; }
         }
 
         /// <summary>