|
|
@@ -16,7 +16,7 @@ import Range from '/ckeditor5/core/treemodel/range.js';
|
|
|
import CKEditorError from '/ckeditor5/core/ckeditorerror.js';
|
|
|
|
|
|
describe( 'range iterator', () => {
|
|
|
- let doc, expectedItems, expectedItemsMerged, root, img1, paragraph, b, a, r, img2, x;
|
|
|
+ let doc, expectedItemsSingle, expectedItemsMerged, root, img1, paragraph, b, a, r, img2, x;
|
|
|
|
|
|
before( () => {
|
|
|
doc = new Document();
|
|
|
@@ -44,7 +44,7 @@ describe( 'range iterator', () => {
|
|
|
|
|
|
root.insertChildren( 0, [ img1, paragraph ] );
|
|
|
|
|
|
- expectedItems = [
|
|
|
+ expectedItemsSingle = [
|
|
|
{ type: 'ELEMENT_START', item: img1 },
|
|
|
{ type: 'ELEMENT_END', item: img1 },
|
|
|
{ type: 'ELEMENT_START', item: paragraph },
|
|
|
@@ -121,120 +121,124 @@ describe( 'range iterator', () => {
|
|
|
expect( value.nextPosition ).to.deep.equal( Position.createAfter( value.item ) );
|
|
|
}
|
|
|
|
|
|
- it( 'should return next position', () => {
|
|
|
- let iterator = new TreeWalker( { position: new Position( root, [ 0 ] ) } ); // beginning of root
|
|
|
- let i, len;
|
|
|
+ describe( 'merged characters', () => {
|
|
|
+ it( 'should iterating over the range using next', () => {
|
|
|
+ let start = new Position( root, [ 1 ] );
|
|
|
+ let end = new Position( root, [ 1, 4 ] );
|
|
|
+ let range = new Range( start, end );
|
|
|
|
|
|
- for ( i = 0, len = expectedItems.length; i < len; i++ ) {
|
|
|
- expectItem( iterator.next(), expectedItems[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ let iterator = new TreeWalker( { boundaries: range, position: range.start } );
|
|
|
+ let i;
|
|
|
|
|
|
- it( 'should return previous position', () => {
|
|
|
- let iterator = new TreeWalker( { position: new Position( root, [ 2 ] ) } ); // ending of root
|
|
|
+ for ( i = 2; i <= 6; i++ ) {
|
|
|
+ expectItem( iterator.next(), expectedItemsMerged[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
|
|
|
- for ( let i = expectedItems.length - 1; i >= 0; i-- ) {
|
|
|
- expectItem( iterator.previous(), expectedItems[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ it( 'should iterating over the range using previous', () => {
|
|
|
+ let start = new Position( root, [ 1 ] );
|
|
|
+ let end = new Position( root, [ 1, 4 ] );
|
|
|
+ let range = new Range( start, end );
|
|
|
|
|
|
- it( 'should return next position in the boundaries', () => {
|
|
|
- let start = new Position( root, [ 1, 0 ] ); // p, 0
|
|
|
- let end = new Position( root, [ 1, 3, 0 ] ); // img, 0
|
|
|
+ let iterator = new TreeWalker( { boundaries: range, position: range.end } );
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: new Range( start, end ) } );
|
|
|
+ for ( let i = 6; i >= 2; i-- ) {
|
|
|
+ expectItem( iterator.previous(), expectedItemsMerged[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
|
|
|
- let i, len;
|
|
|
-
|
|
|
- for ( i = 3, len = expectedItems.length; i < 7; i++ ) {
|
|
|
- expectItem( iterator.next(), expectedItems[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ it( 'should respect boundaries when iterating using next', () => {
|
|
|
+ let start = new Position( root, [ 1, 0 ] );
|
|
|
+ let end = new Position( root, [ 1, 1 ] );
|
|
|
+ let range = new Range( start, end );
|
|
|
|
|
|
- it( 'should return previous position in the boundaries', () => {
|
|
|
- let start = new Position( root, [ 1, 0 ] ); // p, 0
|
|
|
- let end = new Position( root, [ 1, 3, 0 ] ); // img, 0
|
|
|
+ let iterator = new TreeWalker( { boundaries: range, position: range.start } );
|
|
|
+ let val = iterator.next();
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: new Range( start, end ), position: end } );
|
|
|
+ expect( val.done ).to.be.false;
|
|
|
+ expect( val.value.item.text ).to.equal( 'b' );
|
|
|
|
|
|
- let i, len;
|
|
|
+ val = iterator.next();
|
|
|
+ expect( val.done ).to.be.true;
|
|
|
+ } );
|
|
|
|
|
|
- for ( i = 6, len = expectedItems.length; i > 2; i-- ) {
|
|
|
- expectItem( iterator.previous(), expectedItems[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ it( 'should respect boundaries when iterating using previous', () => {
|
|
|
+ let start = new Position( root, [ 1, 1 ] );
|
|
|
+ let end = new Position( root, [ 1, 2 ] );
|
|
|
+ let range = new Range( start, end );
|
|
|
|
|
|
- it( 'should provide iterator interface', () => {
|
|
|
- let iterator = new TreeWalker( { position: new Position( root, [ 0 ] ) } );
|
|
|
- let i = 0;
|
|
|
+ let iterator = new TreeWalker( { boundaries: range, position: range.end } );
|
|
|
+ let val = iterator.previous();
|
|
|
|
|
|
- for ( let value of iterator ) {
|
|
|
- expectValue( value, expectedItems[ i ] );
|
|
|
- i++;
|
|
|
- }
|
|
|
+ expect( val.done ).to.be.false;
|
|
|
+ expect( val.value.item.text ).to.equal( 'a' );
|
|
|
|
|
|
- expect( i ).to.equal( 10 );
|
|
|
+ val = iterator.previous();
|
|
|
+ expect( val.done ).to.be.true;
|
|
|
+ } );
|
|
|
} );
|
|
|
|
|
|
- it( 'should merge characters when iterating over the range using next', () => {
|
|
|
- let start = new Position( root, [ 1 ] );
|
|
|
- let end = new Position( root, [ 1, 4 ] );
|
|
|
- let range = new Range( start, end );
|
|
|
+ describe( 'single characters', () => {
|
|
|
+ it( 'should iterating over the range using next', () => {
|
|
|
+ let iterator = new TreeWalker( { position: new Position( root, [ 0 ] ), singleCharacters: true } ); // beginning of root
|
|
|
+ let i, len;
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: range, position: range.start, mergeCharacters: true } );
|
|
|
- let i;
|
|
|
+ for ( i = 0, len = expectedItemsSingle.length; i < len; i++ ) {
|
|
|
+ expectItem( iterator.next(), expectedItemsSingle[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
|
|
|
- for ( i = 2; i <= 6; i++ ) {
|
|
|
- expectItem( iterator.next(), expectedItemsMerged[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ it( 'should iterating over the range using previous', () => {
|
|
|
+ let iterator = new TreeWalker( { position: new Position( root, [ 2 ] ), singleCharacters: true } ); // ending of root
|
|
|
|
|
|
- it( 'should merge characters when iterating over the range using previous', () => {
|
|
|
- let start = new Position( root, [ 1 ] );
|
|
|
- let end = new Position( root, [ 1, 4 ] );
|
|
|
- let range = new Range( start, end );
|
|
|
+ for ( let i = expectedItemsSingle.length - 1; i >= 0; i-- ) {
|
|
|
+ expectItem( iterator.previous(), expectedItemsSingle[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: range, position: range.end, mergeCharacters: true } );
|
|
|
+ it( 'should respect boundaries when iterating using next', () => {
|
|
|
+ let start = new Position( root, [ 1, 0 ] ); // p, 0
|
|
|
+ let end = new Position( root, [ 1, 3, 0 ] ); // img, 0
|
|
|
|
|
|
- for ( let i = 6; i >= 2; i-- ) {
|
|
|
- expectItem( iterator.previous(), expectedItemsMerged[ i ] );
|
|
|
- }
|
|
|
- expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
- } );
|
|
|
+ let iterator = new TreeWalker( { boundaries: new Range( start, end ), singleCharacters: true } );
|
|
|
|
|
|
- it( 'should respect boundaries when iterating using next and merging characters', () => {
|
|
|
- let start = new Position( root, [ 1, 0 ] );
|
|
|
- let end = new Position( root, [ 1, 1 ] );
|
|
|
- let range = new Range( start, end );
|
|
|
+ let i, len;
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: range, position: range.start, mergeCharacters: true } );
|
|
|
- let val = iterator.next();
|
|
|
+ for ( i = 3, len = expectedItemsSingle.length; i < 7; i++ ) {
|
|
|
+ expectItem( iterator.next(), expectedItemsSingle[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.next() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
|
|
|
- expect( val.done ).to.be.false;
|
|
|
- expect( val.value.item.text ).to.equal( 'b' );
|
|
|
+ it( 'should respect boundaries when iterating using previous', () => {
|
|
|
+ let start = new Position( root, [ 1, 0 ] ); // p, 0
|
|
|
+ let end = new Position( root, [ 1, 3, 0 ] ); // img, 0
|
|
|
|
|
|
- val = iterator.next();
|
|
|
- expect( val.done ).to.be.true;
|
|
|
- } );
|
|
|
+ let iterator = new TreeWalker( { boundaries: new Range( start, end ), position: end, singleCharacters: true } );
|
|
|
+
|
|
|
+ let i, len;
|
|
|
|
|
|
- it( 'should respect boundaries when iterating using previous and merging characters', () => {
|
|
|
- let start = new Position( root, [ 1, 1 ] );
|
|
|
- let end = new Position( root, [ 1, 2 ] );
|
|
|
- let range = new Range( start, end );
|
|
|
+ for ( i = 6, len = expectedItemsSingle.length; i > 2; i-- ) {
|
|
|
+ expectItem( iterator.previous(), expectedItemsSingle[ i ] );
|
|
|
+ }
|
|
|
+ expect( iterator.previous() ).to.have.property( 'done' ).that.is.true;
|
|
|
+ } );
|
|
|
+ } );
|
|
|
|
|
|
- let iterator = new TreeWalker( { boundaries: range, position: range.end, mergeCharacters: true } );
|
|
|
- let val = iterator.previous();
|
|
|
+ it( 'should provide iterator interface', () => {
|
|
|
+ let iterator = new TreeWalker( { position: new Position( root, [ 0 ] ) } );
|
|
|
+ let i = 0;
|
|
|
|
|
|
- expect( val.done ).to.be.false;
|
|
|
- expect( val.value.item.text ).to.equal( 'a' );
|
|
|
+ for ( let value of iterator ) {
|
|
|
+ expectValue( value, expectedItemsMerged[ i ] );
|
|
|
+ i++;
|
|
|
+ }
|
|
|
|
|
|
- val = iterator.previous();
|
|
|
- expect( val.done ).to.be.true;
|
|
|
+ expect( i ).to.equal( 9 );
|
|
|
} );
|
|
|
|
|
|
it( 'should throw if neither boundaries nor starting position is set', () => {
|