Convert to ?: operator

laurentkempe · Aug 25, 2018 · 1e6cea5 · sharwell · Aug 25, 2018 · sharwell
1 parent ec22983
commit 1e6cea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/GitDiffMargin/EditorDiffMargin.cs b/GitDiffMargin/EditorDiffMargin.cs
@@ -33,11 +33,7 @@ private void UpdateDiffDimensions(DiffViewModel diffViewModel, HunkRangeInfo hun
             if (TextView.IsClosed)
                 return;
 
-            bool? visible;
-            if (diffViewModel.IsDeletion)
-                visible = UpdateDeletedDiffDimensions(diffViewModel, hunkRangeInfo);
-            else
-                visible = UpdateNormalDiffDimensions(diffViewModel, hunkRangeInfo);
+            var visible = diffViewModel.IsDeletion ? UpdateDeletedDiffDimensions(diffViewModel, hunkRangeInfo) : UpdateNormalDiffDimensions(diffViewModel, hunkRangeInfo);
 
             if (visible.HasValue)
                 diffViewModel.IsVisible = visible.Value;

diff --git a/GitDiffMargin/Git/GitCommands.cs b/GitDiffMargin/Git/GitCommands.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
@@ -162,12 +162,8 @@ public void StartExternalDiff(ITextDocument textDocument, string originalPath)
                 if (indexEntry != null)
                 {
                     // determine if the file has been staged
-                    string revision;
                     var stagedMask = FileStatus.NewInIndex | FileStatus.ModifiedInIndex;
-                    if ((repo.RetrieveStatus(relativePath) & stagedMask) != 0)
-                        revision = "index";
-                    else
-                        revision = repo.Head.Tip.Sha.Substring(0, 7);
+                    var revision = (repo.RetrieveStatus(relativePath) & stagedMask) != 0 ? "index" : repo.Head.Tip.Sha.Substring(0, 7);
 
                     leftLabel = string.Format("{0}@{1}", objectName, revision);
                 }