Fix IDE1005 (simplify delegate invocation)

dotnet · Aug 10, 2019 · b99887e · b99887e
1 parent 8f42789
commit b99887e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs
@@ -2782,9 +2782,7 @@ internal void DoCommand(EventCommandEventArgs commandArgs)
                     }
 
                     this.OnEventCommand(commandArgs);
-                    var eventCommandCallback = this.m_eventCommandExecuted;
-                    if (eventCommandCallback != null)
-                        eventCommandCallback(this, commandArgs);
+                    this.m_eventCommandExecuted?.Invoke(this, commandArgs);
 
                     if (!commandArgs.enable)
                     {
@@ -2835,9 +2833,7 @@ internal void DoCommand(EventCommandEventArgs commandArgs)
                     // Debug.Assert(matchAnyKeyword == EventKeywords.None);
 
                     this.OnEventCommand(commandArgs);
-                    var eventCommandCallback = m_eventCommandExecuted;
-                    if (eventCommandCallback != null)
-                        eventCommandCallback(this, commandArgs);
+                    m_eventCommandExecuted?.Invoke(this, commandArgs);
                 }
             }
             catch (Exception e)
@@ -4255,11 +4251,7 @@ protected internal virtual void OnEventSourceCreated(EventSource eventSource)
         /// <param name="eventData"></param>
         protected internal virtual void OnEventWritten(EventWrittenEventArgs eventData)
         {
-            EventHandler<EventWrittenEventArgs>? callBack = this.EventWritten;
-            if (callBack != null)
-            {
-                callBack(this, eventData);
-            }
+            this.EventWritten?.Invoke(this, eventData);
         }
 
 

diff --git a/src/System.Private.CoreLib/shared/System/IO/Stream.cs b/src/System.Private.CoreLib/shared/System/IO/Stream.cs
@@ -829,10 +829,7 @@ internal IAsyncResult BlockingBeginRead(byte[] buffer, int offset, int count, As
                 asyncResult = new SynchronousAsyncResult(ex, state, isWrite: false);
             }
 
-            if (callback != null)
-            {
-                callback(asyncResult);
-            }
+            callback?.Invoke(asyncResult);
 
             return asyncResult;
         }
@@ -861,10 +858,7 @@ internal IAsyncResult BlockingBeginWrite(byte[] buffer, int offset, int count, A
                 asyncResult = new SynchronousAsyncResult(ex, state, isWrite: true);
             }
 
-            if (callback != null)
-            {
-                callback(asyncResult);
-            }
+            callback?.Invoke(asyncResult);
 
             return asyncResult;
         }

diff --git a/src/System.Private.CoreLib/shared/System/Progress.cs b/src/System.Private.CoreLib/shared/System/Progress.cs
@@ -88,8 +88,8 @@ private void InvokeHandlers(object? state)
             Action<T>? handler = _handler;
             EventHandler<T>? changedEvent = ProgressChanged;
 
-            if (handler != null) handler(value);
-            if (changedEvent != null) changedEvent(this, value);
+            handler?.Invoke(value);
+            changedEvent?.Invoke(this, value);
         }
     }