commit bab36d466150561348e0a67c6d7d3a39ebc9dbf0
author Edwin Kempin <edwin.kempin@gmail.com> Fri Jan 03 08:14:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 03 08:14:44 2014 +0000
tree 60c0802457338650abd03f5cfbc6464f79e9ec49
parent a01bb3d795ebb14d3541c189533827299cc2d806
parent a76c67a04c3c9f98dea92c9b4fd35dc76d9f5fd5

Merge "SideBySide2: Restore selection after discarding a new comment"

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentGroup.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentGroup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentGroup.java
index 5294cd0..23630ea 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentGroup.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentGroup.java
@@ -25,6 +25,7 @@
 import net.codemirror.lib.CodeMirror;
 import net.codemirror.lib.Configuration;
 import net.codemirror.lib.LineWidget;
+import net.codemirror.lib.TextMarker.FromTo;
 
 /**
  * LineWidget attached to a CodeMirror container.
@@ -145,6 +146,7 @@
     if (lineWidget != null) {
       lineWidget.clear();
       lineWidget = null;
+      updateSelection();
     }
     manager.clearLine(cm.side(), line);
     removeFromParent();
@@ -201,6 +203,15 @@
     }
   }
 
+  private void updateSelection() {
+    if (cm.somethingSelected()) {
+      FromTo r = cm.getSelectedRange();
+      if (r.getTo().getLine() >= line) {
+        cm.setSelection(r.getFrom(), r.getTo());
+      }
+    }
+  }
+
   private boolean canComputeHeight() {
     return !comments.isVisible() || comments.getOffsetHeight() > 0;
   }
@@ -221,5 +232,7 @@
     b.padding.getStyle().setHeight(Math.max(0, h - bpx), Unit.PX);
     a.lineWidget.changed();
     b.lineWidget.changed();
+    a.updateSelection();
+    b.updateSelection();
   }
 }