This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git

commit cc3907ba239514f49fcad9163abd539bd6c2aee6
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Sep 12 10:58:19 2024 -0400

    Merge if clauses
---
 .../java/org/apache/commons/text/diff/StringsComparator.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/text/diff/StringsComparator.java 
b/src/main/java/org/apache/commons/text/diff/StringsComparator.java
index 3c5b0470..14b2a733 100644
--- a/src/main/java/org/apache/commons/text/diff/StringsComparator.java
+++ b/src/main/java/org/apache/commons/text/diff/StringsComparator.java
@@ -265,10 +265,8 @@ public class StringsComparator {
                     ++y;
                 }
                 // Second step
-                if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
-                    if (vUp[i - delta] <= vDown[i]) { // NOPMD
-                        return buildSnake(vUp[i - delta], k + start1 - start2, 
end1, end2);
-                    }
+                if (delta % 2 != 0 && delta - d <= k && k <= delta + d && 
vUp[i - delta] <= vDown[i]) { // NOPMD
+                    return buildSnake(vUp[i - delta], k + start1 - start2, 
end1, end2);
                 }
             }
 
@@ -291,10 +289,8 @@ public class StringsComparator {
                     y--;
                 }
                 // Second step
-                if (delta % 2 == 0 && -d <= k && k <= d) {
-                    if (vUp[i] <= vDown[i + delta]) { // NOPMD
-                        return buildSnake(vUp[i], k + start1 - start2, end1, 
end2);
-                    }
+                if (delta % 2 == 0 && -d <= k && k <= d && vUp[i] <= vDown[i + 
delta]) { // NOPMD
+                    return buildSnake(vUp[i], k + start1 - start2, end1, end2);
                 }
             }
         }

Reply via email to