WIP

src/conversion/downcast-converters.js

@@ -563,6 +563,10 @@ export function remove() {
  */
 export function insertUIElement( elementCreator ) {
 	return ( evt, data, conversionApi ) => {
+		if ( !data.markerRange ) {
+			return;
+		}
+
 		// Create two view elements. One will be inserted at the beginning of marker, one at the end.
 		// If marker is collapsed, only "opening" element will be inserted.
 		data.isOpening = true;
@@ -814,7 +818,7 @@ export function wrap( elementCreator ) {
  */
 export function highlightText( highlightDescriptor ) {
 	return ( evt, data, conversionApi ) => {
-		if ( data.markerRange.isCollapsed ) {
+		if ( !data.item ) {
 			return;
 		}
 
@@ -877,7 +881,7 @@ export function highlightText( highlightDescriptor ) {
  */
 export function highlightElement( highlightDescriptor ) {
 	return ( evt, data, conversionApi ) => {
-		if ( data.markerRange.isCollapsed ) {
+		if ( !data.item ) {
 			return;
 		}
 

src/conversion/downcastdispatcher.js

@@ -321,22 +321,21 @@ export default class DowncastDispatcher {
 		// In markers' case, event name == consumable name.
 		const eventName = 'addMarker:' + markerName;
 
-		// When range is collapsed - fire single event with collapsed range in consumable.
-		if ( markerRange.isCollapsed ) {
-			const consumable = new Consumable();
-			consumable.add( markerRange, eventName );
-
-			this.conversionApi.consumable = consumable;
+		//
+		// First, fire an event for the whole marker.
+		//
+		const consumable = new Consumable();
+		consumable.add( markerRange, eventName );
 
-			this.fire( eventName, { markerName, markerRange }, this.conversionApi );
+		this.conversionApi.consumable = consumable;
 
-			return;
-		}
+		this.fire( eventName, { markerName, markerRange }, this.conversionApi );
 
-		// Create consumable for each item in range.
+		//
+		// Then, fire an event for each item inside the marker range.
+		//
 		this.conversionApi.consumable = this._createConsumableForRange( markerRange, eventName );
 
-		// Create separate event for each node in the range.
 		for ( const item of markerRange.getItems() ) {
 			// Do not fire event for already consumed items.
 			if ( !this.conversionApi.consumable.test( item, eventName ) ) {

src/model/node.js

@@ -185,6 +185,10 @@ export default class Node {
 		return root;
 	}
 
+	get isRoot() {
+		return this == this.root;
+	}
+
 	/**
 	 * {@link module:engine/model/document~Document Document} that owns this node or `null` if the node has no parent or is inside
 	 * a {@link module:engine/model/documentfragment~DocumentFragment DocumentFragment}.