Changed: fixed Range#_getTransformedByDocument change where transform…

…ed range contains wrapped range/unwrapped element.

src/model/range.js

@@ -463,6 +463,8 @@ export default class Range {
 			// * {} is ranges[ 1 ],
 			// * () is ranges[ 2 ].
 			if ( type == 'move' ) {
+				const sourceRange = Range.createFromPositionAndShift( sourcePosition, howMany );
+
 				if ( deltaType == 'split' && this.containsPosition( sourcePosition ) ) {
 					// Range contains a position where an element is split.
 					// <p>f[ooba]r</p> -> <p>f[ooba]r</p><p></p> -> <p>f[oo]</p><p>{ba}r</p> -> <p>f[oo</p><p>ba]r</p>
@@ -475,25 +477,25 @@ export default class Range {
 				} else if ( deltaType == 'wrap' ) {
 					// Range intersects (at the start) with wrapped element (<p>ab</p>).
 					// <p>a[b</p><p>c]d</p> -> <p>a[b</p><w></w><p>c]d</p> -> [<w>]<p>a(b</p>){</w><p>c}d</p> -> <w><p>a[b</p></w><p>c]d</p>
-					if ( this.containsPosition( targetPosition ) ) {
+					if ( sourceRange.containsPosition( this.start ) && !sourceRange.containsPosition( this.end ) ) {
 						return [ new Range( ranges[ 2 ].start, ranges[ 1 ].end ) ];
 					}
 					// Range intersects (at the end) with wrapped element (<p>cd</p>).
 					// <p>a[b</p><p>c]d</p> -> <p>a[b</p><p>c]d</p><w></w> -> <p>a[b</p>]<w>{<p>c}d</p></w> -> <p>a[b</p><w><p>c]d</p></w>
-					else if ( this.containsPosition( sourcePosition ) ) {
+					else if ( sourceRange.containsPosition( this.end ) && !sourceRange.containsPosition( this.start ) ) {
 						return [ new Range( ranges[ 0 ].start, ranges[ 1 ].end ) ];
 					}
 				} else if ( deltaType == 'unwrap' ) {
 					// Range intersects (at the beginning) with unwrapped element (<w></w>).
 					// <w><p>a[b</p></w><p>c]d</p> -> <p>a{b</p>}<w>[</w><p>c]d</p> -> <p>a[b</p><w></w><p>c]d</p>
 					// <w></w> is removed in next operation, but the remove does not mess up ranges.
-					if ( this.containsPosition( sourcePosition.getShiftedBy( howMany ) ) ) {
+					if ( sourceRange.containsPosition( this.start ) && !sourceRange.containsPosition( this.end ) ) {
 						return [ new Range( ranges[ 1 ].start, ranges[ 0 ].end ) ];
 					}
 					// Range intersects (at the end) with unwrapped element (<w></w>).
 					// <p>a[b</p><w><p>c]d</p></w> -> <p>a[b</p>](<p>c)d</p>{<w>}</w> -> <p>a[b</p><p>c]d</p><w></w>
 					// <w></w> is removed in next operation, but the remove does not mess up ranges.
-					else if ( this.containsPosition( sourcePosition ) ) {
+					else if ( sourceRange.containsPosition( this.end ) && !sourceRange.containsPosition( this.start ) ) {
 						return [ new Range( ranges[ 0 ].start, ranges[ 2 ].end ) ];
 					}
 				}

tests/model/liverange.js

@@ -434,6 +434,17 @@ describe( 'LiveRange', () => {
 
 				expect( stringify( root, live ) ).to.equal( '<p>a[b</p><w><p>x</p><p>c]d</p></w>' );
 			} );
+
+			it( 'contains element to wrap', () => {
+				setData( doc, '<p>a[b</p><p>x</p><p>c]d</p>' );
+
+				live = new LiveRange( doc.selection.getFirstPosition(), doc.selection.getLastPosition() );
+
+				// [<p>x</p>]
+				doc.batch().wrap( new Range( new Position( root, [ 1 ] ), new Position( root, [ 2 ] ) ), 'w' );
+
+				expect( stringify( root, live ) ).to.equal( '<p>a[b</p><w><p>x</p></w><p>c]d</p>' );
+			} );
 		} );
 
 		describe( 'unwrap', () => {
@@ -493,7 +504,7 @@ describe( 'LiveRange', () => {
 				expect( stringify( root, live ) ).to.equal( '<p>a[b</p><p>x</p><p>c]d</p>' );
 			} );
 
-			it( 'its end is intersecting with the wrapper to remove', () => {
+			it( 'its end is intersecting with the wrapper to remove (multiple elements)', () => {
 				setData( doc, '<p>a[b</p><w><p>x</p><p>c]d</p></w>' );
 
 				live = new LiveRange( doc.selection.getFirstPosition(), doc.selection.getLastPosition() );
@@ -502,6 +513,16 @@ describe( 'LiveRange', () => {
 
 				expect( stringify( root, live ) ).to.equal( '<p>a[b</p><p>x</p><p>c]d</p>' );
 			} );
+
+			it( 'contains wrapped element', () => {
+				setData( doc, '<p>a[b</p><w><p>x</p></w><p>c]d</p>' );
+
+				live = new LiveRange( doc.selection.getFirstPosition(), doc.selection.getLastPosition() );
+
+				doc.batch().unwrap( root.getChild( 1 ) );
+
+				expect( stringify( root, live ) ).to.equal( '<p>a[b</p><p>x</p><p>c]d</p>' );
+			} );
 		} );
 	} );