diffMap: minor current line background layout fixes, fix NPE in LineDiff

SuduIDE · Dec 17, 2024 · ff2dc90 · ff2dc90
1 parent a48f61c
commit ff2dc90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/demo-edit/src/main/java/org/sudu/experiments/editor/EditorComponent.java b/demo-edit/src/main/java/org/sudu/experiments/editor/EditorComponent.java
@@ -557,7 +557,8 @@ else if (diffModel != null && i < diffModel.length && diffModel[i] != null && !d
 
     drawVerticalLine();
 
-    if (drawGap) drawGap(firstLine, lastLine, docLen);
+    if (!mirrored)
+      drawGap(firstLine, lastLine, docLen);
 
     if (hasFocus && caretX >= -caret.width() / 2 && caret.needsPaint(size)) {
       caret.paint(g, pos);

diff --git a/diff-model/src/main/java/org/sudu/experiments/diff/LineDiff.java b/diff-model/src/main/java/org/sudu/experiments/diff/LineDiff.java
@@ -24,6 +24,6 @@ public String toString() {
   }
 
   public static boolean notEmpty(LineDiff[] diff) {
-    return diff != null && (diff.length > 1 || diff[0].type != 0);
+    return diff != null && (diff.length > 1 || (diff[0] != null && diff[0].type != 0));
   }
 }