Skip to content

Commit 165872d

Browse files
committed
Join null check with assignement
1 parent 712fa20 commit 165872d

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

GitDiffMargin/Core/BackgroundParser.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,10 @@ protected BackgroundParser(ITextBuffer textBuffer, TaskScheduler taskScheduler,
4646
{
4747
if (textBuffer == null)
4848
throw new ArgumentNullException(nameof(textBuffer));
49-
if (taskScheduler == null)
50-
throw new ArgumentNullException(nameof(taskScheduler));
51-
if (textDocumentFactoryService == null)
52-
throw new ArgumentNullException(nameof(textDocumentFactoryService));
53-
5449
_textBuffer = new WeakReference<ITextBuffer>(textBuffer);
55-
_taskScheduler = taskScheduler;
56-
TextDocumentFactoryService = textDocumentFactoryService;
50+
51+
_taskScheduler = taskScheduler ?? throw new ArgumentNullException(nameof(taskScheduler));
52+
TextDocumentFactoryService = textDocumentFactoryService ?? throw new ArgumentNullException(nameof(textDocumentFactoryService));
5753

5854
textBuffer.PostChanged += TextBufferPostChanged;
5955

GitDiffMargin/GitDiffMarginCommandHandler.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,8 @@ public GitDiffMarginCommandHandler(IVsTextView textViewAdapter,
2121
IVsEditorAdaptersFactoryService editorAdaptersFactoryService, ITextView textView)
2222
: base(textViewAdapter)
2323
{
24-
if (editorAdaptersFactoryService == null)
25-
throw new ArgumentNullException(nameof(editorAdaptersFactoryService));
26-
if (textView == null)
27-
throw new ArgumentNullException(nameof(textView));
28-
29-
_editorAdaptersFactoryService = editorAdaptersFactoryService;
30-
_textView = textView;
24+
_editorAdaptersFactoryService = editorAdaptersFactoryService ?? throw new ArgumentNullException(nameof(editorAdaptersFactoryService));
25+
_textView = textView ?? throw new ArgumentNullException(nameof(textView));
3126
}
3227

3328
protected override OLECMDF QueryCommandStatus(ref Guid commandGroup, uint commandId,

GitDiffMargin/ViewModel/DiffMarginViewModelBase.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ internal abstract class DiffMarginViewModelBase : ViewModelBase
1313

1414
protected DiffMarginViewModelBase(IMarginCore marginCore)
1515
{
16-
if (marginCore == null)
17-
throw new ArgumentNullException(nameof(marginCore));
18-
19-
MarginCore = marginCore;
16+
MarginCore = marginCore ?? throw new ArgumentNullException(nameof(marginCore));
2017

2118
DiffViewModels = new ObservableCollection<DiffViewModel>();
2219

GitDiffMargin/ViewModel/EditorDiffMarginViewModel.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ internal EditorDiffMarginViewModel(IMarginCore marginCore,
2020
Action<DiffViewModel, HunkRangeInfo> updateDiffDimensions) :
2121
base(marginCore)
2222
{
23-
if (updateDiffDimensions == null)
24-
throw new ArgumentNullException(nameof(updateDiffDimensions));
25-
26-
_updateDiffDimensions = updateDiffDimensions;
23+
_updateDiffDimensions = updateDiffDimensions ?? throw new ArgumentNullException(nameof(updateDiffDimensions));
2724
}
2825

2926
public RelayCommand<DiffViewModel> PreviousChangeCommand =>

GitDiffMargin/ViewModel/ScrollDiffMarginViewModel.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ internal ScrollDiffMarginViewModel(IMarginCore marginCore,
1212
Action<DiffViewModel, HunkRangeInfo> updateDiffDimensions) :
1313
base(marginCore)
1414
{
15-
if (updateDiffDimensions == null)
16-
throw new ArgumentNullException(nameof(updateDiffDimensions));
17-
18-
_updateDiffDimensions = updateDiffDimensions;
15+
_updateDiffDimensions = updateDiffDimensions ?? throw new ArgumentNullException(nameof(updateDiffDimensions));
1916
}
2017

2118
protected override DiffViewModel CreateDiffViewModel(HunkRangeInfo hunkRangeInfo)

0 commit comments

Comments
 (0)