From 7be37d4acdf75c2520e45ef12991e2ce256fdbb2 Mon Sep 17 00:00:00 2001
From: Alexander Tsybulsky <atsybulsky@sbcg.com.ua>
Date: Tue, 9 Oct 2018 22:25:12 +0200
Subject: [PATCH] Fix diff colors for MM state #1991

---
 src/ui/zcl_abapgit_gui_page_diff.clas.abap | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/zcl_abapgit_gui_page_diff.clas.abap
index e16485758..5d839c75e 100644
--- a/src/ui/zcl_abapgit_gui_page_diff.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_diff.clas.abap
@@ -739,12 +739,14 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION.
 
     " New line
     lv_mark = ` `.
-    IF iv_fstate = c_fstate-both OR is_diff_line-result = zif_abapgit_definitions=>c_diff-update.
-      lv_bg = ' diff_upd'.
-      lv_mark = `~`.
-    ELSEIF is_diff_line-result = zif_abapgit_definitions=>c_diff-insert.
-      lv_bg = ' diff_ins'.
-      lv_mark = `+`.
+    IF is_diff_line-result IS NOT INITIAL.
+      IF iv_fstate = c_fstate-both OR is_diff_line-result = zif_abapgit_definitions=>c_diff-update.
+        lv_bg = ' diff_upd'.
+        lv_mark = `~`.
+      ELSEIF is_diff_line-result = zif_abapgit_definitions=>c_diff-insert.
+        lv_bg = ' diff_ins'.
+        lv_mark = `+`.
+      ENDIF.
     ENDIF.
     lv_new = |<td class="num" line-num="{ is_diff_line-new_num }"></td>|
           && |<td class="code{ lv_bg }">{ lv_mark }{ is_diff_line-new }</td>|.
@@ -756,12 +758,14 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION.
     " Old line
     CLEAR lv_bg.
     lv_mark = ` `.
-    IF iv_fstate = c_fstate-both OR is_diff_line-result = zif_abapgit_definitions=>c_diff-update.
-      lv_bg = ' diff_upd'.
-      lv_mark = `~`.
-    ELSEIF is_diff_line-result = zif_abapgit_definitions=>c_diff-delete.
-      lv_bg = ' diff_del'.
-      lv_mark = `-`.
+    IF is_diff_line-result IS NOT INITIAL.
+      IF iv_fstate = c_fstate-both OR is_diff_line-result = zif_abapgit_definitions=>c_diff-update.
+        lv_bg = ' diff_upd'.
+        lv_mark = `~`.
+      ELSEIF is_diff_line-result = zif_abapgit_definitions=>c_diff-delete.
+        lv_bg = ' diff_del'.
+        lv_mark = `-`.
+      ENDIF.
     ENDIF.
     lv_old = |<td class="num" line-num="{ is_diff_line-old_num }"></td>|
           && |<td class="code{ lv_bg }">{ lv_mark }{ is_diff_line-old }</td>|.