From ff2dc907d362ce9afc21180cc6fc056f7961e582 Mon Sep 17 00:00:00 2001 From: Prazdnikov Kirill Date: Tue, 17 Dec 2024 15:46:06 +0300 Subject: [PATCH] diffMap: minor current line background layout fixes, fix NPE in LineDiff --- .../main/java/org/sudu/experiments/editor/EditorComponent.java | 3 ++- .../src/main/java/org/sudu/experiments/diff/LineDiff.java | 2 +- 2 files changed, 3 insertions(+), 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 index 363fb87b4..71e07d748 100644 --- 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 index b033f43db..006da6927 100644 --- 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)); } }