commit bd277faf356b363e9aae6d571d6add5b6fbf030c
author Shawn O. Pearce <sop@google.com> Thu Mar 04 17:22:03 2010 -0800
committer Shawn O. Pearce <sop@google.com> Thu Mar 04 17:22:03 2010 -0800
tree e8fa07767acb754bc54dc2abfb33e2e2d29198fa
parent a6658ca2d4f59cf8cf2ecb12aa0083c85bfeea4d

Use hunk background colors on unified views with syntax highlighting

If syntax highlighting was turned on by the user in a unified view,
use the light-red/light-green backgrounds we use in the side-by-side
view to show where lines were added and removed.  This may be a bit
messy, but its useful to see what is going on.

Change-Id: I887ad901810c03906d61432a7b67ef0b813bd9b7
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
index b014436..b2be30a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
@@ -132,6 +132,8 @@
       nc.closeTr();
     }
 
+    final boolean syntaxHighlighting =
+        script.getSettings().getPrettySettings().isSyntaxHighlighting();
     final ArrayList<PatchLine> lines = new ArrayList<PatchLine>();
     for (final EditList.Hunk hunk : script.getHunks()) {
       appendHunkHeader(nc, hunk);
@@ -140,7 +142,7 @@
           openLine(nc);
           appendLineNumber(nc, hunk.getCurA());
           appendLineNumber(nc, hunk.getCurB());
-          appendLineText(nc, CONTEXT, a, hunk.getCurA());
+          appendLineText(nc, false, CONTEXT, a, hunk.getCurA());
           closeLine(nc);
           hunk.incBoth();
           lines.add(new PatchLine(CONTEXT, hunk.getCurA(), hunk.getCurB()));
@@ -149,7 +151,7 @@
           openLine(nc);
           appendLineNumber(nc, hunk.getCurA());
           padLineNumber(nc);
-          appendLineText(nc, DELETE, a, hunk.getCurA());
+          appendLineText(nc, syntaxHighlighting, DELETE, a, hunk.getCurA());
           closeLine(nc);
           hunk.incA();
           lines.add(new PatchLine(DELETE, hunk.getCurA(), 0));
@@ -162,7 +164,7 @@
           openLine(nc);
           padLineNumber(nc);
           appendLineNumber(nc, hunk.getCurB());
-          appendLineText(nc, INSERT, b, hunk.getCurB());
+          appendLineText(nc, syntaxHighlighting, INSERT, b, hunk.getCurB());
           closeLine(nc);
           hunk.incB();
           lines.add(new PatchLine(INSERT, 0, hunk.getCurB()));
@@ -308,7 +310,8 @@
   }
 
   private void appendLineText(final SafeHtmlBuilder m,
-      final PatchLine.Type type, final SparseHtmlFile src, final int i) {
+      boolean syntaxHighlighting, final PatchLine.Type type,
+      final SparseHtmlFile src, final int i) {
     final SafeHtml text = src.getSafeHtmlLine(i);
     m.openTd();
     m.addStyleName(Gerrit.RESOURCES.css().diffText());
@@ -320,11 +323,17 @@
         break;
       case DELETE:
         m.addStyleName(Gerrit.RESOURCES.css().diffTextDELETE());
+        if (syntaxHighlighting) {
+          m.addStyleName(Gerrit.RESOURCES.css().fileLineDELETE());
+        }
         m.append("-");
         m.append(text);
         break;
       case INSERT:
         m.addStyleName(Gerrit.RESOURCES.css().diffTextINSERT());
+        if (syntaxHighlighting) {
+          m.addStyleName(Gerrit.RESOURCES.css().fileLineINSERT());
+        }
         m.append("+");
         m.append(text);
         break;