@ckeditor/ckeditor5-engine 27.1.0 → 29.2.0

package/LICENSE.md

@@ -1,7 +1,7 @@
 Software License Agreement
 ==========================
 
-**CKEditor 5 Editing Engine** – https://github.com/ckeditor/ckeditor5-engine <br>
+**CKEditor 5 editing engine** – https://github.com/ckeditor/ckeditor5-engine <br>
 Copyright (c) 2003-2021, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).

package/README.md

@@ -2,8 +2,8 @@ CKEditor 5 editing engine
 ========================================
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-engine.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine)
-[![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-engine/status.svg)](https://david-dm.org/ckeditor/ckeditor5-engine)
-[![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-engine/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-engine?type=dev)
+[![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5?branch=master)
+[![Build Status](https://travis-ci.com/ckeditor/ckeditor5.svg?branch=master)](https://travis-ci.com/ckeditor/ckeditor5)
 
 The CKEditor 5 editing engine implements a flexible MVC-based architecture for creating rich text editing features.
 
@@ -21,7 +21,7 @@ The CKEditor 5 editing engine implements a flexible MVC-based architecture for c
 
 ## Documentation
 
-For a general introduction see the [Overview of CKEditor 5 Framework](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/overview.html) guide and then the [Editing engine architecture](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/architecture/editing-engine.html) guide.
+For a general introduction see the [Overview of CKEditor 5 Framework](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/overview.html) guide and then the [Editing engine architecture guide](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/architecture/editing-engine.html).
 
 Additionally, refer to the [`@ckeditor/ckeditor5-engine` package](https://ckeditor.com/docs/ckeditor5/latest/api/engine.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/) for even more information.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "27.1.0",
+  "version": "29.2.0",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -23,28 +23,28 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "^27.1.0",
+    "@ckeditor/ckeditor5-utils": "^29.2.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^27.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^27.1.0",
-    "@ckeditor/ckeditor5-clipboard": "^27.1.0",
-    "@ckeditor/ckeditor5-core": "^27.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^27.1.0",
-    "@ckeditor/ckeditor5-enter": "^27.1.0",
-    "@ckeditor/ckeditor5-essentials": "^27.1.0",
-    "@ckeditor/ckeditor5-heading": "^27.1.0",
-    "@ckeditor/ckeditor5-image": "^27.1.0",
-    "@ckeditor/ckeditor5-link": "^27.1.0",
-    "@ckeditor/ckeditor5-list": "^27.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^27.1.0",
-    "@ckeditor/ckeditor5-table": "^27.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^27.1.0",
-    "@ckeditor/ckeditor5-typing": "^27.1.0",
-    "@ckeditor/ckeditor5-ui": "^27.1.0",
-    "@ckeditor/ckeditor5-undo": "^27.1.0",
-    "@ckeditor/ckeditor5-widget": "^27.1.0",
+    "@ckeditor/ckeditor5-basic-styles": "^29.2.0",
+    "@ckeditor/ckeditor5-block-quote": "^29.2.0",
+    "@ckeditor/ckeditor5-clipboard": "^29.2.0",
+    "@ckeditor/ckeditor5-core": "^29.2.0",
+    "@ckeditor/ckeditor5-editor-classic": "^29.2.0",
+    "@ckeditor/ckeditor5-enter": "^29.2.0",
+    "@ckeditor/ckeditor5-essentials": "^29.2.0",
+    "@ckeditor/ckeditor5-heading": "^29.2.0",
+    "@ckeditor/ckeditor5-image": "^29.2.0",
+    "@ckeditor/ckeditor5-link": "^29.2.0",
+    "@ckeditor/ckeditor5-list": "^29.2.0",
+    "@ckeditor/ckeditor5-paragraph": "^29.2.0",
+    "@ckeditor/ckeditor5-table": "^29.2.0",
+    "@ckeditor/ckeditor5-theme-lark": "^29.2.0",
+    "@ckeditor/ckeditor5-typing": "^29.2.0",
+    "@ckeditor/ckeditor5-ui": "^29.2.0",
+    "@ckeditor/ckeditor5-undo": "^29.2.0",
+    "@ckeditor/ckeditor5-widget": "^29.2.0",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },
@@ -64,6 +64,7 @@
   "files": [
     "lang",
     "src",
-    "theme"
+    "theme",
+    "ckeditor5-metadata.json"
   ]
 }

package/src/controller/datacontroller.js

@@ -251,6 +251,7 @@ export default class DataController {
 		// For document fragment, simply take the markers assigned to this document fragment.
 		// For model root, all markers in that root will be taken.
 		// For model element, we need to check which markers are intersecting with this element and relatively modify the markers' ranges.
+		// Collapsed markers at element boundary, although considered as not intersecting with the element, will also be returned.
 		const markers = modelElementOrFragment.is( 'documentFragment' ) ?
 			Array.from( modelElementOrFragment.markers ) :
 			_getMarkersRelativeToElement( modelElementOrFragment );
@@ -347,11 +348,19 @@ export default class DataController {
 	 *
 	 *		dataController.set( { main: '<p>Foo</p>', title: '<h1>Bar</h1>' } ); // Sets data on the `main` and `title` roots.
 	 *
+	 * To set the data with preserved undo stacks and set the current change to this stack, use the `{ batchType: 'default' }` option.
+	 *
+	 *		dataController.set( '<p>Foo</p>', { batchType: 'default' } ); // Sets data as a new change.
+	 *
 	 * @fires set
 	 * @param {String|Object.<String,String>} data Input data as a string or an object containing `rootName` - `data`
 	 * pairs to set data on multiple roots at once.
+	 * @param {Object} [options={}] Options for setting data.
+	 * @param {'default'|'transparent'} [options.batchType='default'] The batch type that will be used to create a batch for the changes.
+	 * When set to `default`, the undo and redo stacks will be preserved. Note that when not set, the undo feature (when present) will
+	 * override it to `transparent` and all undo steps will be lost.
 	 */
-	set( data ) {
+	set( data, options = {} ) {
 		let newData = {};
 
 		if ( typeof data === 'string' ) {
@@ -375,7 +384,9 @@ export default class DataController {
 			throw new CKEditorError( 'datacontroller-set-non-existent-root', this );
 		}
 
-		this.model.enqueueChange( 'transparent', writer => {
+		const batchType = options.batchType || 'default';
+
+		this.model.enqueueChange( batchType, writer => {
 			writer.setSelection( null );
 			writer.removeSelectionAttribute( this.model.document.selection.getAttributeKeys() );
 
@@ -518,8 +529,9 @@ mix( DataController, ObservableMixin );
 
 // Helper function for downcast conversion.
 //
-// Takes a document element (element that is added to a model document) and checks which markers are inside it
-// and which markers are containing it. If the marker is intersecting with element, the intersection is returned.
+// Takes a document element (element that is added to a model document) and checks which markers are inside it. If the marker is collapsed
+// at element boundary, it is considered as contained inside the element and marker range is returned. Otherwise, if the marker is
+// intersecting with the element, the intersection is returned.
 function _getMarkersRelativeToElement( element ) {
 	const result = [];
 	const doc = element.root.document;
@@ -531,10 +543,19 @@ function _getMarkersRelativeToElement( element ) {
 	const elementRange = ModelRange._createIn( element );
 
 	for ( const marker of doc.model.markers ) {
-		const intersection = elementRange.getIntersection( marker.getRange() );
+		const markerRange = marker.getRange();
 
-		if ( intersection ) {
-			result.push( [ marker.name, intersection ] );
+		const isMarkerCollapsed = markerRange.isCollapsed;
+		const isMarkerAtElementBoundary = markerRange.start.isEqual( elementRange.start ) || markerRange.end.isEqual( elementRange.end );
+
+		if ( isMarkerCollapsed && isMarkerAtElementBoundary ) {
+			result.push( [ marker.name, markerRange ] );
+		} else {
+			const updatedMarkerRange = elementRange.getIntersection( markerRange );
+
+			if ( updatedMarkerRange ) {
+				result.push( [ marker.name, updatedMarkerRange ] );
+			}
 		}
 	}
 

package/src/controller/editingcontroller.js

@@ -104,7 +104,7 @@ export default class EditingController {
 		this.downcastDispatcher.on( 'remove', remove(), { priority: 'low' } );
 
 		// Attach default model selection converters.
-		this.downcastDispatcher.on( 'selection', clearAttributes(), { priority: 'low' } );
+		this.downcastDispatcher.on( 'selection', clearAttributes(), { priority: 'high' } );
 		this.downcastDispatcher.on( 'selection', convertRangeSelection(), { priority: 'low' } );
 		this.downcastDispatcher.on( 'selection', convertCollapsedSelection(), { priority: 'low' } );
 

package/src/conversion/conversion.js

@@ -448,8 +448,8 @@ export default class Conversion {
 	}
 
 	/**
-	 * Sets up converters between the model and the view that convert a model attribute to a view attribute (and vice versa).
-	 * For example, `<image src='foo.jpg'></image>` is converted to `<img src='foo.jpg'></img>` (the same attribute key and value).
+	 * Sets up converters between the model and the view that convert a model attribute to a view attribute (and vice versa). For example,
+	 * `<imageBlock src='foo.jpg'></imageBlock>` is converted to `<img src='foo.jpg'></img>` (the same attribute key and value).
 	 * This type of converters is intended to be used with {@link module:engine/model/element~Element model element} nodes.
 	 * To convert text attributes {@link module:engine/conversion/conversion~Conversion#attributeToElement `attributeToElement converter`}
 	 * should be set up.
@@ -460,7 +460,7 @@ export default class Conversion {
 	 *		// Attribute values are strictly specified.
 	 *		editor.conversion.attributeToAttribute( {
 	 *			model: {
-	 *				name: 'image',
+	 *				name: 'imageInline',
 	 *				key: 'aside',
 	 *				values: [ 'aside' ]
 	 *			},
@@ -476,7 +476,7 @@ export default class Conversion {
 	 *		// Set the style attribute.
 	 *		editor.conversion.attributeToAttribute( {
 	 *			model: {
-	 *				name: 'image',
+	 *				name: 'imageInline',
 	 *				key: 'aside',
 	 *				values: [ 'aside' ]
 	 *			},

package/src/conversion/downcastdispatcher.js

@@ -88,7 +88,7 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
  *		// You will convert inserting a "paragraph" model element into the model.
  *		downcastDispatcher.on( 'insert:paragraph', ( evt, data, conversionApi ) => {
  *			// Remember to check whether the change has not been consumed yet and consume it.
- *			if ( conversionApi.consumable.consume( data.item, 'insert' ) ) {
+ *			if ( !conversionApi.consumable.consume( data.item, 'insert' ) ) {
  *				return;
  *			}
  *
@@ -341,6 +341,8 @@ export default class DowncastDispatcher {
 		this.fire( 'selection', { selection }, this.conversionApi );
 
 		if ( !selection.isCollapsed ) {
+			this._clearConversionApi();
+
 			return;
 		}
 
@@ -414,6 +416,8 @@ export default class DowncastDispatcher {
 		// Do not fire events for each item inside the range if the range got consumed.
 		//
 		if ( !consumable.test( markerRange, eventName ) ) {
+			this._clearConversionApi();
+
 			return;
 		}
 
@@ -736,7 +740,7 @@ export default class DowncastDispatcher {
 	 * `name` is either `'$text'` if change was on {@link module:engine/model/text~Text a text node},
 	 * or the {@link module:engine/model/element~Element#name name} of element which attribute has changed.
 	 *
-	 * This way listeners can either listen to a general `attribute:bold` event or specific event (for example `attribute:src:image`).
+	 * This way listeners can either listen to a general `attribute:bold` event or specific event (for example `attribute:src:imageBlock`).
 	 *
 	 * @event attribute
 	 * @param {Object} data Additional information about the change.

package/src/conversion/downcasthelpers.js

@@ -190,7 +190,7 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 * Model attribute to view attribute conversion helper.
 	 *
 	 * This conversion results in adding an attribute to a view node, basing on an attribute from a model node. For example,
-	 * `<image src='foo.jpg'></image>` is converted to `<img src='foo.jpg'></img>`.
+	 * `<imageInline src='foo.jpg'></imageInline>` is converted to `<img src='foo.jpg'></img>`.
 	 *
 	 *		editor.conversion.for( 'downcast' ).attributeToAttribute( {
 	 *			model: 'source',
@@ -205,7 +205,7 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 *		editor.conversion.for( 'downcast' ).attributeToAttribute( {
 	 *			model: {
-	 *				name: 'image',
+	 *				name: 'imageInline',
 	 *				key: 'source'
 	 *			},
 	 *			view: 'src'
@@ -272,8 +272,11 @@ export default class DowncastHelpers extends ConversionHelpers {
 	/**
 	 * Model marker to view element conversion helper.
 	 *
-	 * **Note**: This method should be used only for editing downcast. For data downcast, use
-	 * {@link #markerToData `#markerToData()`} that produces valid HTML data.
+	 * **Note**: This method should be used mainly for editing downcast and it is recommended
+	 * to use {@link #markerToData `#markerToData()`} helper instead.
+	 *
+	 * This helper may produce invalid HTML code (e.g. a span between table cells).
+	 * It should be used only when you are sure that the produced HTML will be semantically correct.
 	 *
 	 * This conversion results in creating a view element on the boundaries of the converted marker. If the converted marker
 	 * is collapsed, only one element is created. For example, model marker set like this: `<paragraph>F[oo b]ar</paragraph>`
@@ -349,8 +352,8 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 * {@link module:engine/view/containerelement~ContainerElement} may provide a custom way of handling highlight. Most often,
 	 * the element itself is given classes and attributes described in the highlight descriptor (instead of being wrapped in `<span>`).
-	 * For example, a model marker set like this: `[<image src="foo.jpg"></image>]` becomes `<img src="foo.jpg" class="comment"></img>`
-	 * in the view.
+	 * For example, a model marker set like this:
+	 * `[<imageInline src="foo.jpg"></imageInline>]` becomes `<img src="foo.jpg" class="comment"></img>` in the view.
 	 *
 	 * For container elements, the conversion is two-step. While the converter processes the highlight descriptor and passes it
 	 * to a container element, it is the container element instance itself that applies values from the highlight descriptor.
@@ -405,34 +408,33 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 * This conversion creates a representation for model marker boundaries in the view:
 	 *
-	 * * If the marker boundary is at a position where text nodes are allowed, then a view element with the specified tag name
-	 * and `name` attribute is added at this position.
-	 * * In other cases, a specified attribute is set on a view element that is before or after the marker boundary.
+	 * * If the marker boundary is before or after a model element, a view attribute is set on a corresponding view element.
+	 * * In other cases, a view element with the specified tag name is inserted at the corresponding view position.
 	 *
-	 * Typically, marker names use the `group:uniqueId:otherData` convention. For example: `comment:e34zfk9k2n459df53sjl34:zx32c`.
+	 * Typically, the marker names use the `group:uniqueId:otherData` convention. For example: `comment:e34zfk9k2n459df53sjl34:zx32c`.
 	 * The default configuration for this conversion is that the first part is the `group` part and the rest of
 	 * the marker name becomes the `name` part.
 	 *
 	 * Tag and attribute names and values are generated from the marker name:
 	 *
-	 * * Templates for attributes are `data-[group]-start-before="[name]"`, `data-[group]-start-after="[name]"`,
+	 * * The templates for attributes are `data-[group]-start-before="[name]"`, `data-[group]-start-after="[name]"`,
 	 * `data-[group]-end-before="[name]"` and `data-[group]-end-after="[name]"`.
-	 * * Templates for view elements are `<[group]-start name="[name]">` and `<[group]-end name="[name]">`.
+	 * * The templates for view elements are `<[group]-start name="[name]">` and `<[group]-end name="[name]">`.
 	 *
 	 * Attributes mark whether the given marker's start or end boundary is before or after the given element.
-	 * Attributes `data-[group]-start-before` and `data-[group]-end-after` are favored.
+	 * The `data-[group]-start-before` and `data-[group]-end-after` attributes are favored.
 	 * The other two are used when the former two cannot be used.
 	 *
 	 * The conversion configuration can take a function that will generate different group and name parts.
-	 * If such function is set as the `config.view` parameter, it is passed a marker name and it is expected to return an object with two
+	 * If such a function is set as the `config.view` parameter, it is passed a marker name and it is expected to return an object with two
 	 * properties: `group` and `name`. If the function returns a falsy value, the conversion will not take place.
 	 *
 	 * Basic usage:
 	 *
 	 *		// Using the default conversion.
-	 *		// In this case, all markers whose name starts with 'comment:' will be converted.
+	 *		// In this case, all markers with names starting with 'comment:' will be converted.
 	 *		// The `group` parameter will be set to `comment`.
-	 *		// The `name` parameter will be the rest of the marker name (without `:`).
+	 *		// The `name` parameter will be the rest of the marker name (without the `:`).
 	 *		editor.conversion.for( 'dataDowncast' ).markerToData( {
 	 *			model: 'comment'
 	 *		} );
@@ -442,7 +444,7 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 *		// Model:
 	 *		<paragraph>Foo[bar</paragraph>
-	 *		<image src="abc.jpg"></image>]
+	 *		<imageBlock src="abc.jpg"></imageBlock>]
 	 *
 	 *		// View:
 	 *		<p>Foo<comment-start name="commentId:uid"></comment-start>bar</p>
@@ -455,7 +457,7 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *		<p>Foo <myMarker-start></myMarker-start>bar</p>
 	 *		<figure data-myMarker-end-after="" class="image"><img src="abc.jpg" /></figure>
 	 *
-	 * **Note:** A situation where some markers have the `name` part and some do not have it is incorrect and should be avoided.
+	 * **Note:** A situation where some markers have the `name` part and some do not, is incorrect and should be avoided.
 	 *
 	 * Examples where `data-group-start-after` and `data-group-end-before` are used:
 	 *
@@ -499,14 +501,14 @@ export default class DowncastHelpers extends ConversionHelpers {
 	 *
 	 * This kind of conversion is useful for saving data into the database, so it should be used in the data conversion pipeline.
 	 *
-	 * See {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} to learn how to add a converter
-	 * to the conversion process.
+	 * See the {@link module:engine/conversion/conversion~Conversion#for `conversion.for()`} API guide to learn how to
+	 * add a converter to the conversion process.
 	 *
 	 * @method #markerToData
 	 * @param {Object} config Conversion configuration.
-	 * @param {String} config.model The name of the model marker (or model marker group) to convert.
+	 * @param {String} config.model The name of the model marker (or the model marker group) to convert.
 	 * @param {Function} [config.view] A function that takes the model marker name and
-	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as a parameters
+	 * {@link module:engine/conversion/downcastdispatcher~DowncastConversionApi downcast conversion API} as the parameters
 	 * and returns an object with the `group` and `name` properties.
 	 * @param {module:utils/priorities~PriorityString} [config.converterPriority='normal'] Converter priority.
 	 * @returns {module:engine/conversion/downcasthelpers~DowncastHelpers}
@@ -549,7 +551,7 @@ export function insertText() {
  */
 export function remove() {
 	return ( evt, data, conversionApi ) => {
-		// Find view range start position by mapping model position at which the remove happened.
+		// Find the view range start position by mapping the model position at which the remove happened.
 		const viewStart = conversionApi.mapper.toViewPosition( data.position );
 
 		const modelEnd = data.position.getShiftedBy( data.length );
@@ -570,7 +572,7 @@ export function remove() {
 
 /**
  * Creates a `<span>` {@link module:engine/view/attributeelement~AttributeElement view attribute element} from the information
- * provided by the {@link module:engine/conversion/downcasthelpers~HighlightDescriptor highlight descriptor} object. If a priority
+ * provided by the {@link module:engine/conversion/downcasthelpers~HighlightDescriptor highlight descriptor} object. If the priority
  * is not provided in the descriptor, the default priority will be used.
  *
  * @param {module:engine/view/downcastwriter~DowncastWriter} writer
@@ -584,7 +586,7 @@ export function createViewElementFromHighlightDescriptor( writer, descriptor ) {
 		viewElement._addClass( descriptor.classes );
 	}
 
-	if ( descriptor.priority ) {
+	if ( typeof descriptor.priority === 'number' ) {
 		viewElement._priority = descriptor.priority;
 	}
 
@@ -945,33 +947,40 @@ function insertMarkerData( viewCreator ) {
 // Helper function for `insertMarkerData()` that marks a marker boundary at the beginning or end of given `range`.
 function handleMarkerBoundary( range, isStart, conversionApi, data, viewMarkerData ) {
 	const modelPosition = isStart ? range.start : range.end;
-	const canInsertElement = conversionApi.schema.checkChild( modelPosition, '$text' );
-
-	if ( canInsertElement ) {
-		const viewPosition = conversionApi.mapper.toViewPosition( modelPosition );
+	const elementAfter = modelPosition.nodeAfter && modelPosition.nodeAfter.is( 'element' ) ? modelPosition.nodeAfter : null;
+	const elementBefore = modelPosition.nodeBefore && modelPosition.nodeBefore.is( 'element' ) ? modelPosition.nodeBefore : null;
 
-		insertMarkerAsElement( viewPosition, isStart, conversionApi, data, viewMarkerData );
-	} else {
+	if ( elementAfter || elementBefore ) {
 		let modelElement;
 		let isBefore;
 
 		// If possible, we want to add `data-group-start-before` and `data-group-end-after` attributes.
-		// Below `if` is constructed in a way that will favor adding these attributes.
-		//
-		// Also, I assume that there will be always an element either after or before the position.
-		// If not, then it is a case when we are not in a position where text is allowed and also there are no elements around...
-		if ( isStart && modelPosition.nodeAfter || !isStart && !modelPosition.nodeBefore ) {
-			modelElement = modelPosition.nodeAfter;
+		if ( isStart && elementAfter || !isStart && !elementBefore ) {
+			// [<elementAfter>...</elementAfter> -> <elementAfter data-group-start-before="...">...</elementAfter>
+			// <parent>]<elementAfter> -> <parent><elementAfter data-group-end-before="...">
+			modelElement = elementAfter;
 			isBefore = true;
 		} else {
-			modelElement = modelPosition.nodeBefore;
+			// <elementBefore>...</elementBefore>] -> <elementBefore data-group-end-after="...">...</elementBefore>
+			// </elementBefore>[</parent> -> </elementBefore data-group-start-after="..."></parent>
+			modelElement = elementBefore;
 			isBefore = false;
 		}
 
 		const viewElement = conversionApi.mapper.toViewElement( modelElement );
 
-		insertMarkerAsAttribute( viewElement, isStart, isBefore, conversionApi, data, viewMarkerData );
+		// In rare circumstances, the model element may be not mapped to any view element and that would cause an error.
+		// One of those situations is a soft break inside code block.
+		if ( viewElement ) {
+			insertMarkerAsAttribute( viewElement, isStart, isBefore, conversionApi, data, viewMarkerData );
+
+			return;
+		}
 	}
+
+	const viewPosition = conversionApi.mapper.toViewPosition( modelPosition );
+
+	insertMarkerAsElement( viewPosition, isStart, conversionApi, data, viewMarkerData );
 }
 
 // Helper function for `insertMarkerData()` that marks a marker boundary in the view as an attribute on a view element.

package/src/conversion/mapper.js

@@ -35,6 +35,7 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
  * and {@link module:engine/conversion/mapper~Mapper#toModelPosition toModelPosition} methods. `Mapper` adds it's own default callbacks
  * with `'lowest'` priority. To override default `Mapper` mapping, add custom callback with higher priority and
  * stop the event.
+ * @mixes module:utils/emittermixin~EmitterMixin
  */
 export default class Mapper {
 	/**

package/src/conversion/modelconsumable.js

@@ -38,12 +38,12 @@ import TextProxy from '../model/textproxy';
  *
  * Consuming multiple values in a single callback:
  *
- *		// Converter for custom `image` element that might have a `caption` element inside which changes
+ *		// Converter for custom `imageBlock` element that might have a `caption` element inside which changes
  *		// how the image is displayed in the view:
  *		//
  *		// Model:
  *		//
- *		// [image]
+ *		// [imageBlock]
  *		//   └─ [caption]
  *		//       └─ foo
  *		//
@@ -53,8 +53,8 @@ import TextProxy from '../model/textproxy';
  *		//   ├─ <img />
  *		//   └─ <caption>
  *		//       └─ foo
- *		modelConversionDispatcher.on( 'insert:image', ( evt, data, conversionApi ) => {
- *			// First, consume the `image` element.
+ *		modelConversionDispatcher.on( 'insert:imageBlock', ( evt, data, conversionApi ) => {
+ *			// First, consume the `imageBlock` element.
  *			conversionApi.consumable.consume( data.item, 'insert' );
  *
  *			// Just create normal image element for the view.
@@ -63,7 +63,7 @@ import TextProxy from '../model/textproxy';
  *			const insertPosition = conversionApi.mapper.toViewPosition( data.range.start );
  *			const viewWriter = conversionApi.writer;
  *
- *			// Check if the `image` element has children.
+ *			// Check if the `imageBlock` element has children.
  *			if ( data.item.childCount > 0 ) {
  *				const modelCaption = data.item.getChild( 0 );
  *
@@ -320,5 +320,10 @@ export default class ModelConsumable {
 function _normalizeConsumableType( type ) {
 	const parts = type.split( ':' );
 
+	// Markers are identified by the whole name (otherwise we would consume the whole markers group).
+	if ( parts[ 0 ] == 'addMarker' || parts[ 0 ] == 'removeMarker' ) {
+		return type;
+	}
+
 	return parts.length > 1 ? parts[ 0 ] + ':' + parts[ 1 ] : parts[ 0 ];
 }

package/src/conversion/upcastdispatcher.js

@@ -635,11 +635,11 @@ function createContextTree( contextDefinition, writer ) {
  *
  * Otherwise, ancestors are split.
  *
- * For instance, if `<image>` is not allowed in `<paragraph>` but is allowed in `$root`:
+ * For instance, if `<imageBlock>` is not allowed in `<paragraph>` but is allowed in `$root`:
  *
  *		<paragraph>foo[]bar</paragraph>
  *
- *		-> safe insert for `<image>` will split ->
+ *		-> safe insert for `<imageBlock>` will split ->
  *
  *		<paragraph>foo</paragraph>[]<paragraph>bar</paragraph>
  *
@@ -696,11 +696,11 @@ function createContextTree( contextDefinition, writer ) {
  *
  * Otherwise, ancestors are split and an object with a position and the copy of the split element is returned.
  *
- * For instance, if `<image>` is not allowed in `<paragraph>` but is allowed in `$root`:
+ * For instance, if `<imageBlock>` is not allowed in `<paragraph>` but is allowed in `$root`:
  *
  *		<paragraph>foo[]bar</paragraph>
  *
- *		-> split for `<image>` ->
+ *		-> split for `<imageBlock>` ->
  *
  *		<paragraph>foo</paragraph>[]<paragraph>bar</paragraph>
  *
@@ -722,8 +722,8 @@ function createContextTree( contextDefinition, writer ) {
  * Returns all the split parts of the given `element` that were created during upcasting through using {@link #splitToAllowedParent}.
  * It enables you to easily track these elements and continue processing them after they are split during the conversion of their children.
  *
- *		<paragraph>Foo<image />bar<image />baz</paragraph> ->
- *		<paragraph>Foo</paragraph><image /><paragraph>bar</paragraph><image /><paragraph>baz</paragraph>
+ *		<paragraph>Foo<imageBlock />bar<imageBlock />baz</paragraph> ->
+ *		<paragraph>Foo</paragraph><imageBlock /><paragraph>bar</paragraph><imageBlock /><paragraph>baz</paragraph>
  *
  * For a reference to any of above paragraphs, the function will return all three paragraphs (the original element included),
  * sorted in the order of their creation (the original element is the first one).