Merge pull request #1393 from ckeditor/t/1392

Fix: `model.Differ` should not throw when multiple, intersecting remove changes were buffered. Closes #1392.
ckeditor · Apr 4, 2018 · 3a348fd · 3a348fd
2 parents bfadb47 + 9c8a0c9
commit 3a348fd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/model/differ.js b/src/model/differ.js
@@ -645,13 +645,11 @@ export default class Differ {
  }
 
  if ( old.type == 'remove' ) {
- if ( inc.offset + inc.howMany <= old.offset ) {
+ if ( incEnd <= old.offset ) {
  old.offset -= inc.howMany;
  } else if ( inc.offset < old.offset ) {
- old.offset = inc.offset;
- old.howMany += inc.nodesToHandle;
-
- inc.nodesToHandle = 0;
+ inc.nodesToHandle += old.howMany;
+ old.howMany = 0;
  }
  }
 

diff --git a/tests/model/differ.js b/tests/model/differ.js
@@ -1321,6 +1321,23 @@ describe( 'Differ', () => {
  ] );
  } );
  } );
+
+ // #1392.
+ it( 'remove is correctly transformed by multiple affecting changes', () => {
+ root._appendChildren( new Element( 'paragraph', null, new Text( 'xyz' ) ) );
+
+ model.change( () => {
+ rename( root.getChild( 1 ), 'heading' );
+ rename( root.getChild( 2 ), 'heading' );
+ remove( Position.createAt( root, 0 ), 3 );
+
+ expectChanges( [
+ { type: 'remove', name: 'paragraph', length: 1, position: new Position( root, [ 0 ] ) },
+ { type: 'remove', name: 'paragraph', length: 1, position: new Position( root, [ 0 ] ) },
+ { type: 'remove', name: 'paragraph', length: 1, position: new Position( root, [ 0 ] ) }
+ ] );
+ } );
+ } );
  } );
 
  describe( 'getChanges()', () => {