Use pattern matching

laurentkempe · Aug 25, 2018 · 0a5b293 · sharwell · Aug 25, 2018 · 0a5b293
1 parent 5980b7a
commit 0a5b293
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/GitDiffMargin/Core/MarginCore.cs b/GitDiffMargin/Core/MarginCore.cs
@@ -248,10 +248,7 @@ private static Brush GetBrush(ResourceDictionary properties)
 
         private void HandleParseComplete(object sender, ParseResultEventArgs e)
         {
-            var diffResult = e as DiffParseResultEventArgs;
-            if (diffResult == null) return;
-
-            CheckBeginInvokeOnUi(() => OnHunksChanged(diffResult.Diff));
+            if (e is DiffParseResultEventArgs diffResult) CheckBeginInvokeOnUi(() => OnHunksChanged(diffResult.Diff));
         }
 
         private void OnHunksChanged(IEnumerable<HunkRangeInfo> hunkRangeInfos)

diff --git a/GitDiffMargin/Git/GitCommands.cs b/GitDiffMargin/Git/GitCommands.cs
@@ -318,8 +318,7 @@ private string AdjustPath(string fullPath)
                 StringComparison.OrdinalIgnoreCase))
                 return fullPath;
 
-            var solution = _serviceProvider.GetService(typeof(SVsSolution)) as IVsSolution;
-            if (solution == null)
+            if (!(_serviceProvider.GetService(typeof(SVsSolution)) is IVsSolution solution))
                 return fullPath;
 
             if (!ErrorHandler.Succeeded(solution.GetProjectEnum((uint) __VSENUMPROJFLAGS.EPF_LOADEDINSOLUTION,

diff --git a/GitDiffMargin/GitDiffMarginCommandHandler.cs b/GitDiffMargin/GitDiffMarginCommandHandler.cs
@@ -216,8 +216,7 @@ private bool TryGetMarginViewModel(out EditorDiffMarginViewModel viewModel)
 
             var textViewHost = _editorAdaptersFactoryService.GetWpfTextViewHost(TextViewAdapter);
 
-            var margin = textViewHost?.GetTextViewMargin(EditorDiffMargin.MarginNameConst) as EditorDiffMargin;
-            if (margin == null)
+            if (!(textViewHost?.GetTextViewMargin(EditorDiffMargin.MarginNameConst) is EditorDiffMargin margin))
                 return false;
 
             viewModel = margin.VisualElement.DataContext as EditorDiffMarginViewModel;

diff --git a/GitDiffMargin/View/EditorDiffMarginControl.xaml.cs b/GitDiffMargin/View/EditorDiffMarginControl.xaml.cs
@@ -62,8 +62,7 @@ private static void DoubleClick(object sender, EventArgs e)
 
             var button = ClickWaitTimer.Tag as Button;
 
-            var editorDiffMarginViewModel = button?.Tag as EditorDiffMarginViewModel;
-            if (editorDiffMarginViewModel == null) return;
+            if (!(button?.Tag is EditorDiffMarginViewModel editorDiffMarginViewModel)) return;
 
             var editorDiffViewModel = button.DataContext as EditorDiffViewModel;
             editorDiffViewModel?.ShowPopUpCommand.Execute(editorDiffMarginViewModel);

diff --git a/GitDiffMargin/ViewModel/EditorDiffViewModel.cs b/GitDiffMargin/ViewModel/EditorDiffViewModel.cs
@@ -107,8 +107,7 @@ public bool ShowPopup
                 _showPopup = value;
                 if (value)
                 {
-                    var uiShell = Package.GetGlobalService(typeof(SVsUIShell)) as IVsUIShell4;
-                    if (uiShell != null)
+                    if (Package.GetGlobalService(typeof(SVsUIShell)) is IVsUIShell4 uiShell)
                     {
                         IOleCommandTarget commandTarget =
                             MarginCore.TextView.Properties.GetProperty<GitDiffMarginCommandHandler>(