Keep shared markers consistent when documents are linked/unlinked

Issue #2360

Conflicts:
	lib/codemirror.js
	test/doc_test.js

Author: marijnh

lib/codemirror.js

@@ -3906,6 +3906,7 @@ window.CodeMirror = (function() {
     }
     if (cm) signalLater(cm, "markerCleared", cm, this);
     if (withOp) endOperation(cm);
+    if (this.parent) this.parent.clear();
   };
 
   TextMarker.prototype.find = function(bothSides) {
@@ -3963,7 +3964,7 @@ window.CodeMirror = (function() {
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
     var marker = new TextMarker(doc, type);
-    if (options) copyObj(options, marker);
+    if (options) copyObj(options, marker, false);
     if (posLess(to, from) || posEq(from, to) && marker.clearWhenEmpty !== false)
       return marker;
     if (marker.replacedWith) {
@@ -4023,10 +4024,8 @@ window.CodeMirror = (function() {
   function SharedTextMarker(markers, primary) {
     this.markers = markers;
     this.primary = primary;
-    for (var i = 0, me = this; i < markers.length; ++i) {
+    for (var i = 0; i < markers.length; ++i)
       markers[i].parent = this;
-      on(markers[i], "clear", function(){me.clear();});
-    }
   }
   CodeMirror.SharedTextMarker = SharedTextMarker;
   eventMixin(SharedTextMarker);
@@ -4057,6 +4056,37 @@ window.CodeMirror = (function() {
     return new SharedTextMarker(markers, primary);
   }
 
+  function findSharedMarkers(doc) {
+    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
+                         function(m) { return m.parent; });
+  }
+
+  function copySharedMarkers(doc, markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], pos = marker.find();
+      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+      if (cmp(mFrom, mTo)) {
+        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+        marker.markers.push(subMark);
+        subMark.parent = marker;
+      }
+    }
+  }
+
+  function detachSharedMarkers(markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], linked = [marker.primary.doc];;
+      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
+      for (var j = 0; j < marker.markers.length; j++) {
+        var subMarker = marker.markers[j];
+        if (indexOf(linked, subMarker.doc) == -1) {
+          subMarker.parent = null;
+          marker.markers.splice(j--, 1);
+        }
+      }
+    }
+  }
+
   // TEXTMARKER SPANS
 
   function getMarkedSpanFor(spans, marker) {
@@ -5078,7 +5108,7 @@ window.CodeMirror = (function() {
       }
       return markers;
     },
-    findMarks: function(from, to) {
+    findMarks: function(from, to, filter) {
       from = clipPos(this, from); to = clipPos(this, to);
       var found = [], lineNo = from.line;
       this.iter(from.line, to.line + 1, function(line) {
@@ -5087,7 +5117,8 @@ window.CodeMirror = (function() {
           var span = spans[i];
           if (!(lineNo == from.line && from.ch > span.to ||
                 span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch))
+                lineNo == to.line && span.from > to.ch) &&
+              (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }
         ++lineNo;
@@ -5145,6 +5176,7 @@ window.CodeMirror = (function() {
       if (options.sharedHist) copy.history = this.history;
       (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
       copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+      copySharedMarkers(copy, findSharedMarkers(this));
       return copy;
     },
     unlinkDoc: function(other) {
@@ -5154,6 +5186,7 @@ window.CodeMirror = (function() {
         if (link.doc != other) continue;
         this.linked.splice(i, 1);
         other.unlinkDoc(this);
+        detachSharedMarkers(findSharedMarkers(this));
         break;
       }
       // If the histories were shared, split them again
@@ -5634,9 +5667,11 @@ window.CodeMirror = (function() {
     return inst;
   }
 
-  function copyObj(obj, target) {
+  function copyObj(obj, target, overwrite) {
     if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
+    for (var prop in obj)
+      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+        target[prop] = obj[prop];
     return target;
   }
 

test/doc_test.js

@@ -320,6 +320,51 @@
     eq(cleared, 1);
   });
 
+<<<<<<< HEAD
+=======
+  testDoc("sharedMarkerCopy", "A='abcde'", function(a) {
+    var shared = a.markText(Pos(0, 1), Pos(0, 3), {shared: true});
+    var b = a.linkedDoc();
+    var found = b.findMarksAt(Pos(0, 2));
+    eq(found.length, 1);
+    eq(found[0], shared);
+    shared.clear();
+    eq(b.findMarksAt(Pos(0, 2)), 0);
+  });
+
+  testDoc("sharedMarkerDetach", "A='abcde' B<A C<B", function(a, b, c) {
+    var shared = a.markText(Pos(0, 1), Pos(0, 3), {shared: true});
+    a.unlinkDoc(b);
+    var inB = b.findMarksAt(Pos(0, 2));
+    eq(inB.length, 1);
+    is(inB[0] != shared);
+    var inC = c.findMarksAt(Pos(0, 2));
+    eq(inC.length, 1);
+    is(inC[0] != shared);
+    inC[0].clear();
+    is(shared.find());
+  });
+
+  testDoc("sharedBookmark", "A='ab\ncd\nef\ngh' B<A C<~A/1-2", function(a, b, c) {
+    var mark = b.setBookmark(Pos(1, 1), {shared: true});
+    var found = a.findMarksAt(Pos(1, 1));
+    eq(found.length, 1);
+    eq(found[0], mark);
+    eq(c.findMarksAt(Pos(1, 1)).length, 1);
+    eqPos(mark.find(), Pos(1, 1));
+    b.replaceRange("x\ny\n", Pos(0, 0));
+    eqPos(mark.find(), Pos(3, 1));
+    var cleared = 0;
+    CodeMirror.on(mark, "clear", function() {++cleared;});
+    b.operation(function() {mark.clear();});
+    eq(a.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(b.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(c.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(mark.find(), null);
+    eq(cleared, 1);
+  });
+
+>>>>>>> bc75b8f... Keep shared markers consistent when documents are linked/unlinked
   testDoc("undoInSubview", "A='line 0\nline 1\nline 2\nline 3\nline 4' B<A/1-4", function(a, b) {
     b.replaceRange("x", Pos(2, 0));
     a.undo();