Merge "Fix a bug in marking edits."

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

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java
index 9fd858e..c53d2b5 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java
@@ -150,7 +150,7 @@
       contents = "";
     }
     Configuration cfg = Configuration.create()
-      .set("readOnly", "nocursor")
+      .set("readOnly", true)
       .set("lineNumbers", true)
       .set("tabSize", 2)
       .set("mode", getContentType(meta))
@@ -284,10 +284,13 @@
           }
           return at;
         }
+        if (numOfChar == lengthWithNewline) {
+          return LineCharacter.create(startLine + currLineIndex + 1, 0);
+        }
         numOfChar -= lengthWithNewline;
         advanceLine();
       }
-      throw new IllegalStateException("LineIterator index out of bound");
+      throw new IllegalStateException("EditIterator index out of bound");
     }
 
     private void advanceLine() {