Преглед на файлове

Other: Rename writer.setMarker() to writer.addMarker().

Maciej Gołaszewski преди 7 години
родител
ревизия
b5a5b1647b

+ 2 - 2
packages/ckeditor5-engine/src/model/delta/markerdelta.js

@@ -11,8 +11,8 @@ import Delta from './delta';
 import DeltaFactory from './deltafactory';
 
 /**
- * To provide specific OT behavior and better collisions solving, the {@link module:engine/model/writer~Writer#setMarker Batch#setMarker}
- * and {@link module:engine/model/writer~Writer#removeMarker Batch#removeMarker} methods use the `MarkerDelta` class which inherits
+ * To provide specific OT behavior and better collisions solving, the {@link module:engine/model/writer~Writer#addMarker Writer#addMarker}
+ * and {@link module:engine/model/writer~Writer#removeMarker Writer#removeMarker} methods use the `MarkerDelta` class which inherits
  * from the `Delta` class and may overwrite some methods.
  *
  * @extends module:engine/model/delta/delta~Delta

+ 4 - 4
packages/ckeditor5-engine/src/model/markercollection.js

@@ -20,7 +20,7 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
  * {@link module:engine/model/markercollection~MarkerCollection#event:update} event.
  *
  * To create, change or remove makers use {@link module:engine/model/writer~Writer model writers'} methods:
- * {@link module:engine/model/writer~Writer#setMarker} or {@link module:engine/model/writer~Writer#removeMarker}. Since
+ * {@link module:engine/model/writer~Writer#addMarker} or {@link module:engine/model/writer~Writer#removeMarker}. Since
  * the writer is the only proper way to change the data model it is not possible to change markers directly using this
  * collection. All markers created by the writer will be automatically added to this collection.
  *
@@ -275,11 +275,11 @@ mix( MarkerCollection, EmitterMixin );
  * Therefore, they are handled in the undo stack and synchronized between clients if the collaboration plugin is enabled.
  * This type of markers is useful for solutions like spell checking or comments.
  *
- * Both type of them should be added / updated by {@link module:engine/model/writer~Writer#setMarker}
+ * Both type of them should be added / updated by {@link module:engine/model/writer~Writer#addMarker}
  * and removed by {@link module:engine/model/writer~Writer#removeMarker} methods.
  *
  *		model.change( ( writer ) => {
- * 			const marker = writer.setMarker( name, { range, usingOperation: true } );
+ * 			const marker = writer.addMarker( name, { range, usingOperation: true } );
  *
  * 			// ...
  *
@@ -343,7 +343,7 @@ class Marker {
 	/**
 	 * Returns value of flag indicates if the marker is managed using operations or not.
 	 * See {@link ~Marker marker class description} to learn more about marker types.
-	 * See {@link module:engine/model/writer~Writer#setMarker}.
+	 * See {@link module:engine/model/writer~Writer#addMarker}.
 	 *
 	 * @returns {Boolean}
 	 */

+ 10 - 10
packages/ckeditor5-engine/src/model/writer.js

@@ -205,7 +205,7 @@ export default class Writer {
 					markerRange.end._getCombined( rangeRootPosition, position )
 				);
 
-				this.setMarker( markerName, { range, usingOperation: true } );
+				this.addMarker( markerName, { range, usingOperation: true } );
 			}
 		}
 	}
@@ -792,11 +792,11 @@ export default class Writer {
 	 *
 	 * Create marker directly base on marker's name:
 	 *
-	 * 		setMarker( markerName, { range, usingOperation: false } );
+	 * 		addMarker( markerName, { range, usingOperation: false } );
 	 *
 	 * Create marker using operation:
 	 *
-	 * 		setMarker( markerName, { range, usingOperation: true } );
+	 * 		addMarker( markerName, { range, usingOperation: true } );
 	 *
 	 * Note: For efficiency reasons, it's best to create and keep as little markers as possible.
 	 *
@@ -808,17 +808,17 @@ export default class Writer {
 	 * @param {module:engine/model/range~Range} options.range Marker range.
 	 * @returns {module:engine/model/markercollection~Marker} Marker that was set.
 	 */
-	setMarker( name, options ) {
+	addMarker( name, options ) {
 		this._assertWriterUsedCorrectly();
 
 		if ( !options || typeof options.usingOperation != 'boolean' ) {
 			/**
 			 * The options.usingOperations parameter is required when adding a new marker.
 			 *
-			 * @error writer-setMarker-no-usingOperations
+			 * @error writer-addMarker-no-usingOperations
 			 */
 			throw new CKEditorError(
-				'writer-setMarker-no-usingOperations: The options.usingOperations parameter is required when adding a new marker.'
+				'writer-addMarker-no-usingOperations: The options.usingOperations parameter is required when adding a new marker.'
 			);
 		}
 
@@ -829,18 +829,18 @@ export default class Writer {
 			/**
 			 * Marker with provided name already exists.
 			 *
-			 * @error writer-setMarker-marker-exists
+			 * @error writer-addMarker-marker-exists
 			 */
-			throw new CKEditorError( 'writer-setMarker-marker-exists: Marker with provided name already exists.' );
+			throw new CKEditorError( 'writer-addMarker-marker-exists: Marker with provided name already exists.' );
 		}
 
 		if ( !range ) {
 			/**
 			 * Range parameter is required when adding a new marker.
 			 *
-			 * @error writer-setMarker-no-range
+			 * @error writer-addMarker-no-range
 			 */
-			throw new CKEditorError( 'writer-setMarker-no-range: Range parameter is required when adding a new marker.' );
+			throw new CKEditorError( 'writer-addMarker-no-range: Range parameter is required when adding a new marker.' );
 		}
 
 		if ( !usingOperation ) {

+ 3 - 3
packages/ckeditor5-engine/tests/controller/datacontroller.js

@@ -407,7 +407,7 @@ describe( 'DataController', () => {
 			model.change( writer => {
 				writer.insert( modelElement, modelRoot, 0 );
 				const range = Range.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 1 );
-				writer.setMarker( 'marker:a', { range, usingOperation: true } );
+				writer.addMarker( 'marker:a', { range, usingOperation: true } );
 			} );
 
 			const viewDocumentFragment = data.toView( modelElement );
@@ -432,8 +432,8 @@ describe( 'DataController', () => {
 				const rangeA = Range.createFromParentsAndOffsets( modelP1, 1, modelP1, 3 );
 				const rangeB = Range.createFromParentsAndOffsets( modelP2, 0, modelP2, 2 );
 
-				writer.setMarker( 'marker:a', { range: rangeA, usingOperation: true } );
-				writer.setMarker( 'marker:b', { range: rangeB, usingOperation: true } );
+				writer.addMarker( 'marker:a', { range: rangeA, usingOperation: true } );
+				writer.addMarker( 'marker:b', { range: rangeB, usingOperation: true } );
 			} );
 
 			const viewDocumentFragment = data.toView( modelP1 );

+ 7 - 7
packages/ckeditor5-engine/tests/controller/editingcontroller.js

@@ -235,7 +235,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			expect( getViewData( editing.view, { withoutSelection: true } ) )
@@ -246,7 +246,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			model.change( writer => {
@@ -261,7 +261,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			const range2 = new ModelRange( new ModelPosition( modelRoot, [ 0, 0 ] ), new ModelPosition( modelRoot, [ 0, 2 ] ) );
@@ -278,7 +278,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 				writer.insertText( 'xyz', new ModelPosition( modelRoot, [ 1, 0 ] ) );
 			} );
 
@@ -290,7 +290,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			model.change( writer => {
@@ -308,7 +308,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 2, 2 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			model.change( writer => {
@@ -326,7 +326,7 @@ describe( 'EditingController', () => {
 			const range = new ModelRange( new ModelPosition( modelRoot, [ 0, 1 ] ), new ModelPosition( modelRoot, [ 0, 3 ] ) );
 
 			model.change( writer => {
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			model.change( writer => {

+ 26 - 26
packages/ckeditor5-engine/tests/conversion/downcast-converters.js

@@ -451,7 +451,7 @@ describe( 'downcast-helpers', () => {
 				writer.insertText( 'foo', modelRoot, 0 );
 
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
-				writer.setMarker( 'search', { range, usingOperation: false } );
+				writer.addMarker( 'search', { range, usingOperation: false } );
 			} );
 
 			expectResult( 'f<marker-search></marker-search>o<marker-search></marker-search>o' );
@@ -466,7 +466,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
-				writer.setMarker( 'search', { range, usingOperation: false } );
+				writer.addMarker( 'search', { range, usingOperation: false } );
 			} );
 
 			expectResult( 'f<search></search>o<search></search>o' );
@@ -488,7 +488,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
-				writer.setMarker( 'search', { range, usingOperation: false } );
+				writer.addMarker( 'search', { range, usingOperation: false } );
 			} );
 
 			expectResult( 'f<span data-marker="search"></span>o<span data-marker="search"></span>o' );
@@ -507,7 +507,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 2 );
-				writer.setMarker( 'search', { range, usingOperation: false } );
+				writer.addMarker( 'search', { range, usingOperation: false } );
 			} );
 
 			expectResult( 'f<span data-marker="search" data-start="true"></span>o<span data-marker="search" data-start="false"></span>o' );
@@ -523,7 +523,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
-				writer.setMarker( 'comment', { range, usingOperation: false } );
+				writer.addMarker( 'comment', { range, usingOperation: false } );
 			} );
 
 			expectResult( '<span class="comment">foo</span>' );
@@ -538,7 +538,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
-				writer.setMarker( 'comment', { range, usingOperation: false } );
+				writer.addMarker( 'comment', { range, usingOperation: false } );
 			} );
 
 			expectResult( '<span class="new-comment">foo</span>' );
@@ -561,7 +561,7 @@ describe( 'downcast-helpers', () => {
 			model.change( writer => {
 				writer.insertText( 'foo', modelRoot, 0 );
 				const range = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 3 );
-				writer.setMarker( 'comment:abc', { range, usingOperation: false } );
+				writer.addMarker( 'comment:abc', { range, usingOperation: false } );
 			} );
 
 			expectResult( '<span class="comment comment-abc">foo</span>' );
@@ -932,7 +932,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo<span class="marker"></span>bar</p></div>' );
@@ -956,7 +956,7 @@ describe( 'downcast-converters', () => {
 				}, { priority: 'high' } );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
@@ -968,7 +968,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeUIElement( () => null ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
@@ -993,7 +993,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) )
@@ -1013,7 +1013,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) )
@@ -1039,7 +1039,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeUIElement( creator ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1064,7 +1064,7 @@ describe( 'downcast-converters', () => {
 				}, { priority: 'high' } );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range, usingOperation: false } );
+					writer.addMarker( 'marker', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foobar</p></div>' );
@@ -1276,7 +1276,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeHighlight( highlightDescriptor ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1309,7 +1309,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeHighlight( newDescriptor ), { priority: 'high' } );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1336,7 +1336,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeHighlight( () => null ), { priority: 'high' } );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
@@ -1358,7 +1358,7 @@ describe( 'downcast-converters', () => {
 				markerRange = ModelRange.createFromParentsAndOffsets( modelRoot, 0, modelRoot, 0 );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
@@ -1388,7 +1388,7 @@ describe( 'downcast-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( p1, 0, p1, 3 );
-					writer.setMarker( 'markerFoo', { range, usingOperation: false } );
+					writer.addMarker( 'markerFoo', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1402,7 +1402,7 @@ describe( 'downcast-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( p1, 1, p2, 2 );
-					writer.setMarker( 'markerBar', { range, usingOperation: false } );
+					writer.addMarker( 'markerBar', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1422,7 +1422,7 @@ describe( 'downcast-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( p1, 2, p2, 3 );
-					writer.setMarker( 'markerXyz', { range, usingOperation: false } );
+					writer.addMarker( 'markerXyz', { range, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1496,7 +1496,7 @@ describe( 'downcast-converters', () => {
 				const markerRange = ModelRange.createFromParentsAndOffsets( p1, 3, p2, 0 );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
@@ -1550,7 +1550,7 @@ describe( 'downcast-converters', () => {
 
 			it( 'should use addHighlight and removeHighlight on elements and not convert children nodes', () => {
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1576,7 +1576,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker', removeHighlight( newDescriptor ), { priority: 'high' } );
 
 				model.change( writer => {
-					writer.setMarker( 'marker', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal(
@@ -1611,7 +1611,7 @@ describe( 'downcast-converters', () => {
 				} );
 
 				model.change( writer => {
-					writer.setMarker( 'marker2', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker2', { range: markerRange, usingOperation: false } );
 				} );
 			} );
 
@@ -1621,7 +1621,7 @@ describe( 'downcast-converters', () => {
 				dispatcher.on( 'removeMarker:marker2', removeHighlight( () => null ) );
 
 				model.change( writer => {
-					writer.setMarker( 'marker2', { range: markerRange, usingOperation: false } );
+					writer.addMarker( 'marker2', { range: markerRange, usingOperation: false } );
 				} );
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><div>foo</div></div>' );

+ 4 - 4
packages/ckeditor5-engine/tests/conversion/downcast-selection-converters.js

@@ -198,7 +198,7 @@ describe( 'downcast-selection-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
-					marker = writer.setMarker( 'marker', { range, usingOperation: false } );
+					marker = writer.addMarker( 'marker', { range, usingOperation: false } );
 					writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
 				} );
 
@@ -223,7 +223,7 @@ describe( 'downcast-selection-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
-					marker = writer.setMarker( 'marker', { range, usingOperation: false } );
+					marker = writer.addMarker( 'marker', { range, usingOperation: false } );
 					writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
 					writer.removeSelectionAttribute( 'bold' );
 				} );
@@ -252,7 +252,7 @@ describe( 'downcast-selection-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
-					marker = writer.setMarker( 'marker2', { range, usingOperation: false } );
+					marker = writer.addMarker( 'marker2', { range, usingOperation: false } );
 					writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
 				} );
 
@@ -278,7 +278,7 @@ describe( 'downcast-selection-converters', () => {
 
 				model.change( writer => {
 					const range = ModelRange.createFromParentsAndOffsets( modelRoot, 1, modelRoot, 5 );
-					marker = writer.setMarker( 'marker3', { range, usingOperation: false } );
+					marker = writer.addMarker( 'marker3', { range, usingOperation: false } );
 					writer.setSelection( new ModelRange( ModelPosition.createAt( modelRoot, 3 ) ) );
 				} );
 

+ 5 - 5
packages/ckeditor5-engine/tests/conversion/downcastdispatcher.js

@@ -348,7 +348,7 @@ describe( 'DowncastDispatcher', () => {
 					new ModelRange( new ModelPosition( root, [ 1 ] ), new ModelPosition( root, [ 1 ] ) )
 				);
 				const range = ModelRange.createFromParentsAndOffsets( root, 0, root, 2 );
-				writer.setMarker( 'name', { range, usingOperation: false } );
+				writer.addMarker( 'name', { range, usingOperation: false } );
 			} );
 
 			sinon.spy( dispatcher, 'fire' );
@@ -362,7 +362,7 @@ describe( 'DowncastDispatcher', () => {
 		it( 'should not fire events for markers for non-collapsed selection', () => {
 			model.change( writer => {
 				const range = ModelRange.createFromParentsAndOffsets( root, 0, root, 2 );
-				writer.setMarker( 'name', { range, usingOperation: false } );
+				writer.addMarker( 'name', { range, usingOperation: false } );
 			} );
 
 			sinon.spy( dispatcher, 'fire' );
@@ -403,7 +403,7 @@ describe( 'DowncastDispatcher', () => {
 
 			model.change( writer => {
 				const range = ModelRange.createFromParentsAndOffsets( root, 0, root, 1 );
-				writer.setMarker( 'name', { range, usingOperation: false } );
+				writer.addMarker( 'name', { range, usingOperation: false } );
 				writer.setSelection( ModelRange.createFromParentsAndOffsets( caption, 1, caption, 1 ) );
 			} );
 			sinon.spy( dispatcher, 'fire' );
@@ -422,8 +422,8 @@ describe( 'DowncastDispatcher', () => {
 				);
 
 				const range = ModelRange.createFromParentsAndOffsets( root, 0, root, 2 );
-				writer.setMarker( 'foo', { range, usingOperation: false } );
-				writer.setMarker( 'bar', { range, usingOperation: false } );
+				writer.addMarker( 'foo', { range, usingOperation: false } );
+				writer.addMarker( 'bar', { range, usingOperation: false } );
 			} );
 
 			sinon.spy( dispatcher, 'fire' );

+ 1 - 1
packages/ckeditor5-engine/tests/manual/highlight.js

@@ -128,7 +128,7 @@ ClassicEditor.create( global.document.querySelector( '#editor' ), {
 function addMarker( editor, color ) {
 	editor.model.change( writer => {
 		const range = ModelRange.createFromRange( editor.model.document.selection.getFirstRange() );
-		writer.setMarker( 'marker:' + color, { range, usingOperation: false } );
+		writer.addMarker( 'marker:' + color, { range, usingOperation: false } );
 	} );
 }
 

+ 2 - 2
packages/ckeditor5-engine/tests/manual/markers.js

@@ -83,7 +83,7 @@ ClassicEditor
 			const name = 'highlight:yellow:' + uid();
 
 			markerNames.push( name );
-			writer.setMarker( name, { range, usingOperation: false } );
+			writer.addMarker( name, { range, usingOperation: false } );
 		} );
 	} )
 	.catch( err => {
@@ -100,7 +100,7 @@ function addHighlight( color ) {
 		const name = 'highlight:' + color + ':' + uid();
 
 		markerNames.push( name );
-		writer.setMarker( name, { range, usingOperation: false } );
+		writer.addMarker( name, { range, usingOperation: false } );
 	} );
 }
 

+ 1 - 1
packages/ckeditor5-engine/tests/model/document.js

@@ -235,7 +235,7 @@ describe( 'Document', () => {
 
 			model.change( writer => {
 				const range = Range.createCollapsedAt( doc.getRoot(), 0 );
-				writer.setMarker( 'marker', { range, usingOperation: false } );
+				writer.addMarker( 'marker', { range, usingOperation: false } );
 			} );
 
 			expect( doc.differ.bufferMarkerChange.called ).to.be.true;

+ 1 - 1
packages/ckeditor5-engine/tests/model/operation/markeroperation.js

@@ -87,7 +87,7 @@ describe( 'MarkerOperation', () => {
 
 	it( 'should not fire document markers set event if newRange is same as current marker range', () => {
 		model.change( writer => {
-			writer.setMarker( 'name', { range, usingOperation: true } );
+			writer.addMarker( 'name', { range, usingOperation: true } );
 		} );
 
 		sinon.spy( model.markers, 'fire' );

+ 32 - 32
packages/ckeditor5-engine/tests/model/writer.js

@@ -1943,7 +1943,7 @@ describe( 'Writer', () => {
 		} );
 	} );
 
-	describe( 'setMarker()', () => {
+	describe( 'addMarker()', () => {
 		let root, range;
 
 		beforeEach( () => {
@@ -1954,54 +1954,54 @@ describe( 'Writer', () => {
 
 		it( 'should throw if options.usingOperations is not defined', () => {
 			expect( () => {
-				setMarker( 'name' );
-			} ).to.throw( CKEditorError, /^writer-setMarker-no-usingOperations/ );
+				addMarker( 'name' );
+			} ).to.throw( CKEditorError, /^writer-addMarker-no-usingOperations/ );
 		} );
 
 		it( 'should throw if name and range is defined but options.usingOperations is not defined', () => {
 			expect( () => {
-				setMarker( 'name', { range } );
-			} ).to.throw( CKEditorError, /^writer-setMarker-no-usingOperations/ );
+				addMarker( 'name', { range } );
+			} ).to.throw( CKEditorError, /^writer-addMarker-no-usingOperations/ );
 		} );
 
 		it( 'should add marker to the document marker collection', () => {
-			setMarker( 'name', { range, usingOperation: false } );
+			addMarker( 'name', { range, usingOperation: false } );
 
 			expect( model.markers.get( 'name' ).getRange().isEqual( range ) ).to.be.true;
 		} );
 
 		it( 'should return marker if that was set directly', () => {
-			const marker = setMarker( 'name', { range, usingOperation: false } );
+			const marker = addMarker( 'name', { range, usingOperation: false } );
 
 			expect( model.markers.get( 'name' ) ).to.equal( marker );
 		} );
 
 		it( 'should return marker if that was set using operation API', () => {
-			const marker = setMarker( 'name', { range, usingOperation: true } );
+			const marker = addMarker( 'name', { range, usingOperation: true } );
 
 			expect( model.markers.get( 'name' ) ).to.equal( marker );
 		} );
 
 		it( 'should return marker with properly set managedUsingOperations (to true)', () => {
-			const marker = setMarker( 'name', { range, usingOperation: true } );
+			const marker = addMarker( 'name', { range, usingOperation: true } );
 
 			expect( marker.managedUsingOperations ).to.equal( true );
 		} );
 
 		it( 'should return marker with properly set managedUsingOperations (to false)', () => {
-			const marker = setMarker( 'name', { range, usingOperation: false } );
+			const marker = addMarker( 'name', { range, usingOperation: false } );
 
 			expect( marker.managedUsingOperations ).to.equal( false );
 		} );
 
 		it( 'should throw when trying to update existing marker in the document marker collection', () => {
-			setMarker( 'name', { range, usingOperation: false } );
+			addMarker( 'name', { range, usingOperation: false } );
 
 			const range2 = Range.createFromParentsAndOffsets( root, 0, root, 0 );
 
 			expect( () => {
-				setMarker( 'name', { range: range2, usingOperation: false } );
-			} ).to.throw( CKEditorError, /^writer-setMarker-marker-exists/ );
+				addMarker( 'name', { range: range2, usingOperation: false } );
+			} ).to.throw( CKEditorError, /^writer-addMarker-marker-exists/ );
 		} );
 
 		it( 'should use operations when having set usingOperation to true', () => {
@@ -2009,7 +2009,7 @@ describe( 'Writer', () => {
 
 			model.on( 'applyOperation', spy );
 
-			setMarker( 'name', { range, usingOperation: true } );
+			addMarker( 'name', { range, usingOperation: true } );
 			const op = batch.deltas[ 0 ].operations[ 0 ];
 
 			expect( spy.calledOnce ).to.be.true;
@@ -2020,22 +2020,22 @@ describe( 'Writer', () => {
 
 		it( 'should throw if marker with given name does not exist and range is not passed', () => {
 			expect( () => {
-				setMarker( 'name', { usingOperation: true } );
-			} ).to.throw( CKEditorError, /^writer-setMarker-no-range/ );
+				addMarker( 'name', { usingOperation: true } );
+			} ).to.throw( CKEditorError, /^writer-addMarker-no-range/ );
 		} );
 
 		it( 'should throw if marker is set directly and range is not passed', () => {
 			expect( () => {
-				setMarker( 'name', { usingOperation: false } );
-			} ).to.throw( CKEditorError, /^writer-setMarker-no-range/ );
+				addMarker( 'name', { usingOperation: false } );
+			} ).to.throw( CKEditorError, /^writer-addMarker-no-range/ );
 		} );
 
 		it( 'should throw when trying to use detached writer', () => {
-			const marker = setMarker( 'name', { range, usingOperation: false } );
+			const marker = addMarker( 'name', { range, usingOperation: false } );
 			const writer = new Writer( model, batch );
 
 			expect( () => {
-				writer.setMarker( marker, null, { usingOperation: true } );
+				writer.addMarker( marker, null, { usingOperation: true } );
 			} ).to.throw( CKEditorError, /^writer-incorrect-use/ );
 		} );
 	} );
@@ -2050,7 +2050,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should accept marker instance', () => {
-			const marker = setMarker( 'name', { range, usingOperation: true } );
+			const marker = addMarker( 'name', { range, usingOperation: true } );
 			const range2 = Range.createFromParentsAndOffsets( root, 0, root, 0 );
 
 			updateMarker( marker, { range: range2, usingOperation: true } );
@@ -2068,7 +2068,7 @@ describe( 'Writer', () => {
 			const spy = sinon.spy();
 			model.on( 'applyOperation', spy );
 
-			const marker = setMarker( 'name', { range, usingOperation: false } );
+			const marker = addMarker( 'name', { range, usingOperation: false } );
 			const range2 = Range.createFromParentsAndOffsets( root, 0, root, 0 );
 
 			updateMarker( marker, { range: range2, usingOperation: false } );
@@ -2077,7 +2077,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should accept empty range parameter if marker instance is passed and usingOperation is set to true', () => {
-			const marker = setMarker( 'name', { range, usingOperation: true } );
+			const marker = addMarker( 'name', { range, usingOperation: true } );
 			const spy = sinon.spy();
 
 			model.on( 'applyOperation', spy );
@@ -2096,7 +2096,7 @@ describe( 'Writer', () => {
 			const spy = sinon.spy();
 			model.on( 'applyOperation', spy );
 
-			setMarker( 'name', { range, usingOperation: true } );
+			addMarker( 'name', { range, usingOperation: true } );
 			updateMarker( 'name', { range } );
 
 			const marker = model.markers.get( 'name' );
@@ -2121,7 +2121,7 @@ describe( 'Writer', () => {
 			const spy = sinon.spy();
 			model.on( 'applyOperation', spy );
 
-			setMarker( 'name', { range, usingOperation: false } );
+			addMarker( 'name', { range, usingOperation: false } );
 			updateMarker( 'name', { range, usingOperation: true } );
 
 			const marker = model.markers.get( 'name' );
@@ -2136,7 +2136,7 @@ describe( 'Writer', () => {
 			const spy = sinon.spy();
 			model.on( 'applyOperation', spy );
 
-			setMarker( 'name', { range, usingOperation: true } );
+			addMarker( 'name', { range, usingOperation: true } );
 			updateMarker( 'name', { range, usingOperation: false } );
 
 			const marker = model.markers.get( 'name' );
@@ -2152,7 +2152,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should throw when trying to use detached writer', () => {
-			const marker = setMarker( 'name', { range, usingOperation: false } );
+			const marker = addMarker( 'name', { range, usingOperation: false } );
 			const writer = new Writer( model, batch );
 
 			expect( () => {
@@ -2171,7 +2171,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should remove marker from the document marker collection', () => {
-			setMarker( 'name', { range, usingOperation: false } );
+			addMarker( 'name', { range, usingOperation: false } );
 			removeMarker( 'name' );
 
 			expect( model.markers.get( 'name' ) ).to.be.null;
@@ -2192,7 +2192,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should accept marker instance', () => {
-			setMarker( 'name', { range, usingOperation: false } );
+			addMarker( 'name', { range, usingOperation: false } );
 			const marker = model.markers.get( 'name' );
 
 			removeMarker( marker );
@@ -2201,7 +2201,7 @@ describe( 'Writer', () => {
 		} );
 
 		it( 'should use MarkerOperation when marker was created using operation', () => {
-			setMarker( 'name', { range, usingOperation: true } );
+			addMarker( 'name', { range, usingOperation: true } );
 
 			const marker = model.markers.get( 'name' );
 			const spy = sinon.spy();
@@ -2596,11 +2596,11 @@ describe( 'Writer', () => {
 		} );
 	}
 
-	function setMarker( name, options ) {
+	function addMarker( name, options ) {
 		let marker;
 
 		model.enqueueChange( batch, writer => {
-			marker = writer.setMarker( name, options );
+			marker = writer.addMarker( name, options );
 		} );
 
 		return marker;