Reduce redundant highlighting-code by modifying if-conditions

Author: goran-w

src/Models/CommitGraph.cs

@@ -146,31 +146,23 @@ public static CommitGraph Generate(List<Commit> commits, bool firstParentOnlyEna
                     {
                         isHighlighted = true;
                     }
-                    else if (highlighting == CommitGraphHighlighting.CurrentBranchOnly)
+
+                    if (!isHighlighted &&
+                        (highlighting == CommitGraphHighlighting.CurrentBranchOnly ||
+                         highlighting == CommitGraphHighlighting.CurrentBranchAndSelectedCommits))
                     {
                         isHighlighted = commit.IsMerged;
                     }
-                    else if (highlighting == CommitGraphHighlighting.SelectedCommitsOnly)
+
+                    if (!isHighlighted &&
+                        (highlighting == CommitGraphHighlighting.SelectedCommitsOnly ||
+                         highlighting == CommitGraphHighlighting.CurrentBranchAndSelectedCommits))
                     {
                         isHighlighted = highlightExtraCommits.Remove(commit.SHA);
                         // Highlight first parent, other parents are dealt with later
                         if (isHighlighted && commit.Parents.Count > 0)
                             highlightExtraCommits.Add(commit.Parents[0]);
                     }
-                    else
-                    {
-                        if (commit.IsMerged)
-                        {
-                            isHighlighted = true;
-                        }
-                        else
-                        {
-                            isHighlighted = highlightExtraCommits.Remove(commit.SHA);
-                            // Highlight first parent, other parents are dealt with later
-                            if (isHighlighted && commit.Parents.Count > 0)
-                                highlightExtraCommits.Add(commit.Parents[0]);
-                        }
-                    }
                 }
                 commit.IsHighlightedInGraph = isHighlighted;