Join null check with assignement

laurentkempe · Aug 25, 2018 · 5ad37e2 · 5ad37e2
1 parent 81598c5
commit 5ad37e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/GitDiffMargin/Core/BackgroundParser.cs b/GitDiffMargin/Core/BackgroundParser.cs
@@ -46,14 +46,10 @@ protected BackgroundParser(ITextBuffer textBuffer, TaskScheduler taskScheduler,
         {
             if (textBuffer == null)
                 throw new ArgumentNullException(nameof(textBuffer));
-            if (taskScheduler == null)
-                throw new ArgumentNullException(nameof(taskScheduler));
-            if (textDocumentFactoryService == null)
-                throw new ArgumentNullException(nameof(textDocumentFactoryService));
-
             _textBuffer = new WeakReference<ITextBuffer>(textBuffer);
-            _taskScheduler = taskScheduler;
-            TextDocumentFactoryService = textDocumentFactoryService;
+
+            _taskScheduler = taskScheduler ?? throw new ArgumentNullException(nameof(taskScheduler));
+            TextDocumentFactoryService = textDocumentFactoryService ?? throw new ArgumentNullException(nameof(textDocumentFactoryService));
 
             textBuffer.PostChanged += TextBufferPostChanged;
 

diff --git a/GitDiffMargin/GitDiffMarginCommandHandler.cs b/GitDiffMargin/GitDiffMarginCommandHandler.cs
@@ -21,13 +21,8 @@ public GitDiffMarginCommandHandler(IVsTextView textViewAdapter,
             IVsEditorAdaptersFactoryService editorAdaptersFactoryService, ITextView textView)
             : base(textViewAdapter)
         {
-            if (editorAdaptersFactoryService == null)
-                throw new ArgumentNullException(nameof(editorAdaptersFactoryService));
-            if (textView == null)
-                throw new ArgumentNullException(nameof(textView));
-
-            _editorAdaptersFactoryService = editorAdaptersFactoryService;
-            _textView = textView;
+            _editorAdaptersFactoryService = editorAdaptersFactoryService ?? throw new ArgumentNullException(nameof(editorAdaptersFactoryService));
+            _textView = textView ?? throw new ArgumentNullException(nameof(textView));
         }
 
         protected override OLECMDF QueryCommandStatus(ref Guid commandGroup, uint commandId,

diff --git a/GitDiffMargin/ViewModel/DiffMarginViewModelBase.cs b/GitDiffMargin/ViewModel/DiffMarginViewModelBase.cs
@@ -13,10 +13,7 @@ internal abstract class DiffMarginViewModelBase : ViewModelBase
 
         protected DiffMarginViewModelBase(IMarginCore marginCore)
         {
-            if (marginCore == null)
-                throw new ArgumentNullException(nameof(marginCore));
-
-            MarginCore = marginCore;
+            MarginCore = marginCore ?? throw new ArgumentNullException(nameof(marginCore));
 
             DiffViewModels = new ObservableCollection<DiffViewModel>();
 

diff --git a/GitDiffMargin/ViewModel/EditorDiffMarginViewModel.cs b/GitDiffMargin/ViewModel/EditorDiffMarginViewModel.cs
@@ -20,10 +20,7 @@ internal EditorDiffMarginViewModel(IMarginCore marginCore,
             Action<DiffViewModel, HunkRangeInfo> updateDiffDimensions) :
             base(marginCore)
         {
-            if (updateDiffDimensions == null)
-                throw new ArgumentNullException(nameof(updateDiffDimensions));
-
-            _updateDiffDimensions = updateDiffDimensions;
+            _updateDiffDimensions = updateDiffDimensions ?? throw new ArgumentNullException(nameof(updateDiffDimensions));
         }
 
         public RelayCommand<DiffViewModel> PreviousChangeCommand =>

diff --git a/GitDiffMargin/ViewModel/ScrollDiffMarginViewModel.cs b/GitDiffMargin/ViewModel/ScrollDiffMarginViewModel.cs
@@ -12,10 +12,7 @@ internal ScrollDiffMarginViewModel(IMarginCore marginCore,
             Action<DiffViewModel, HunkRangeInfo> updateDiffDimensions) :
             base(marginCore)
         {
-            if (updateDiffDimensions == null)
-                throw new ArgumentNullException(nameof(updateDiffDimensions));
-
-            _updateDiffDimensions = updateDiffDimensions;
+            _updateDiffDimensions = updateDiffDimensions ?? throw new ArgumentNullException(nameof(updateDiffDimensions));
         }
 
         protected override DiffViewModel CreateDiffViewModel(HunkRangeInfo hunkRangeInfo)