Merge 38b6f53 into 0821d90

src/dev-utils/enableenginedebug.js

@@ -25,8 +25,6 @@ import MoveOperation from '../model/operation/moveoperation';
 import NoOperation from '../model/operation/nooperation';
 import RenameOperation from '../model/operation/renameoperation';
 import RootAttributeOperation from '../model/operation/rootattributeoperation';
-import WrapOperation from '../model/operation/wrapoperation';
-import UnwrapOperation from '../model/operation/unwrapoperation';
 import SplitOperation from '../model/operation/splitoperation';
 import MergeOperation from '../model/operation/mergeoperation';
 import Model from '../model/model';
@@ -357,19 +355,8 @@ function enableLoggingTools() {
 	} );
 
 	sandbox.mock( SplitOperation.prototype, 'toString', function() {
-		return getClassName( this ) + `( ${ this.baseVersion } ): ` +
-			`${ this.position } ( ${ this.howMany } )${ this.graveyardPosition ? ', ' + this.graveyardPosition : '' }`;
-	} );
-
-	sandbox.mock( WrapOperation.prototype, 'toString', function() {
-		const range = ModelRange.createFromPositionAndShift( this.position, this.howMany );
-
-		return getClassName( this ) + `( ${ this.baseVersion } ): ` +
-			`${ range } with ${ this.element ? this.element : this.graveyardPosition }`;
-	} );
-
-	sandbox.mock( UnwrapOperation.prototype, 'toString', function() {
-		return getClassName( this ) + `( ${ this.baseVersion } ): ${ this.position } ( ${ this.howMany } ), ${ this.graveyardPosition }`;
+		return getClassName( this ) + `( ${ this.baseVersion } ): ${ this.splitPosition } ` +
+			`( ${ this.howMany } ) -> ${ this.insertionPosition }${ this.graveyardPosition ? ' with ' + this.graveyardPosition : '' }`;
 	} );
 
 	sandbox.mock( ViewText.prototype, 'toString', function() {

src/model/differ.js

@@ -181,23 +181,21 @@ export default class Differ {
 				break;
 			}
 			case 'split': {
-				const splitElement = operation.position.parent;
+				const splitElement = operation.splitPosition.parent;
 
 				// Mark that children of the split element were removed.
 				if ( !this._isInInsertedElement( splitElement ) ) {
-					this._markRemove( splitElement, operation.position.offset, operation.howMany );
+					this._markRemove( splitElement, operation.splitPosition.offset, operation.howMany );
 				}
 
 				// Mark that the new element (split copy) was inserted.
-				if ( !this._isInInsertedElement( splitElement.parent ) ) {
-					this._markInsert( splitElement.parent, operation.insertionPosition.offset, 1 );
+				if ( !this._isInInsertedElement( operation.insertionPosition.parent ) ) {
+					this._markInsert( operation.insertionPosition.parent, operation.insertionPosition.offset, 1 );
 				}
 
 				// If the split took the element from the graveyard, mark that the element from the graveyard was removed.
 				if ( operation.graveyardPosition ) {
-					const graveyardParent = operation.graveyardPosition.parent;
-
-					this._markRemove( graveyardParent, operation.graveyardPosition.offset, 1 );
+					this._markRemove( operation.graveyardPosition.parent, operation.graveyardPosition.offset, 1 );
 				}
 
 				break;
@@ -211,13 +209,9 @@ export default class Differ {
 				}
 
 				// Mark that the merged element was inserted into graveyard.
-				// The `isInsertedElement` check might not be needed but there is one case in OT where merged element
-				// is inserted into wrapping element.
 				const graveyardParent = operation.graveyardPosition.parent;
 
-				if ( !this._isInInsertedElement( graveyardParent ) ) {
-					this._markInsert( graveyardParent, operation.graveyardPosition.offset, 1 );
-				}
+				this._markInsert( graveyardParent, operation.graveyardPosition.offset, 1 );
 
 				// Mark that children of merged element were inserted at new parent.
 				const mergedIntoElement = operation.targetPosition.parent;
@@ -226,42 +220,6 @@ export default class Differ {
 					this._markInsert( mergedIntoElement, operation.targetPosition.offset, mergedElement.maxOffset );
 				}
 
-				break;
-			}
-			case 'wrap': {
-				// Mark that some elements were removed from their original parent and that a new (wrapper) element
-				// was added in that parent.
-				if ( !this._isInInsertedElement( operation.position.parent ) ) {
-					this._markRemove( operation.position.parent, operation.position.offset, operation.howMany );
-					this._markInsert( operation.position.parent, operation.position.offset, 1 );
-				}
-
-				// If the wrap took the element from the graveyard, mark that the element from the graveyard was removed.
-				if ( operation.graveyardPosition ) {
-					const graveyardParent = operation.graveyardPosition.parent;
-
-					this._markRemove( graveyardParent, operation.graveyardPosition.offset, 1 );
-				}
-
-				break;
-			}
-			case 'unwrap': {
-				// Mark that the unwrapped element was removed from its original parent and that new (unwrapped) nodes
-				// were inserted in that parent.
-				const elementToUnwrap = operation.position.parent;
-				const offset = elementToUnwrap.startOffset;
-				const parent = elementToUnwrap.parent;
-
-				if ( !this._isInInsertedElement( parent ) ) {
-					this._markRemove( parent, offset, 1 );
-					this._markInsert( parent, offset, elementToUnwrap.maxOffset );
-				}
-
-				// Mark that the unwrapped element was moved to the graveyard.
-				const graveyardParent = operation.graveyardPosition.parent;
-
-				this._markInsert( graveyardParent, operation.graveyardPosition.offset, 1 );
-
 				break;
 			}
 		}

src/model/liverange.js

@@ -170,9 +170,6 @@ function transform( operation ) {
 function doesOperationChangeRangeContent( range, operation ) {
 	switch ( operation.type ) {
 		case 'insert':
-		case 'split':
-		case 'wrap':
-		case 'unwrap':
 			return range.containsPosition( operation.position );
 		case 'move':
 		case 'remove':
@@ -181,6 +178,8 @@ function doesOperationChangeRangeContent( range, operation ) {
 			return range.containsPosition( operation.sourcePosition ) ||
 				range.start.isEqual( operation.sourcePosition ) ||
 				range.containsPosition( operation.targetPosition );
+		case 'split':
+			return range.containsPosition( operation.splitPosition ) || range.containsPosition( operation.insertionPosition );
 	}
 
 	return false;

src/model/operation/mergeoperation.js

@@ -119,7 +119,18 @@ export default class MergeOperation extends Operation {
 	 * @returns {module:engine/model/operation/splitoperation~SplitOperation}
 	 */
 	getReversed() {
-		return new SplitOperation( this.targetPosition, this.howMany, this.graveyardPosition, this.baseVersion + 1 );
+		// Positions in this method are transformed by this merge operation because the split operation bases on
+		// the context after this merge operation happened (because split operation reverses it).
+		// So we need to acknowledge that the merge operation happened and those positions changed a little.
+		const targetPosition = this.targetPosition._getTransformedByMergeOperation( this );
+
+		const path = this.sourcePosition.path.slice( 0, -1 );
+		const insertionPosition = new Position( this.sourcePosition.root, path )._getTransformedByMergeOperation( this );
+
+		const split = new SplitOperation( targetPosition, this.howMany, this.graveyardPosition, this.baseVersion + 1 );
+		split.insertionPosition = insertionPosition;
+
+		return split;
 	}
 
 	/**

src/model/operation/operationfactory.js

@@ -17,8 +17,6 @@ import RenameOperation from '../operation/renameoperation';
 import RootAttributeOperation from '../operation/rootattributeoperation';
 import SplitOperation from '../operation/splitoperation';
 import MergeOperation from '../operation/mergeoperation';
-import WrapOperation from '../operation/wrapoperation';
-import UnwrapOperation from '../operation/unwrapoperation';
 
 const operations = {};
 operations[ AttributeOperation.className ] = AttributeOperation;
@@ -31,8 +29,6 @@ operations[ RenameOperation.className ] = RenameOperation;
 operations[ RootAttributeOperation.className ] = RootAttributeOperation;
 operations[ SplitOperation.className ] = SplitOperation;
 operations[ MergeOperation.className ] = MergeOperation;
-operations[ WrapOperation.className ] = WrapOperation;
-operations[ UnwrapOperation.className ] = UnwrapOperation;
 
 /**
  * A factory class for creating operations.