Fix: Removing highlight on text crashed when marker range was empty-ish.

ckeditor · Mar 12, 2018 · 1a6d529 · 1a6d529
1 parent 5d02afa
commit 1a6d529
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/conversion/downcast-converters.js b/src/conversion/downcast-converters.js
@@ -916,6 +916,11 @@ export function removeHighlight( highlightDescriptor ) {
 
 		// Get all elements bound with given marker name.
 		const elements = conversionApi.mapper.markerNameToElements( data.markerName );
+
+		if ( !elements ) {
+			return;
+		}
+
 		conversionApi.mapper.unbindElementsFromMarkerName( data.markerName );
 
 		for ( const element of elements ) {

diff --git a/tests/conversion/downcast-converters.js b/tests/conversion/downcast-converters.js
@@ -1392,6 +1392,28 @@ describe( 'downcast-converters', () => {
 
 				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
 			} );
+
+			it( 'should do nothing if marker is applied and removed on empty-ish range', () => {
+				dispatcher.on( 'addMarker:marker', highlightText( highlightDescriptor ) );
+				dispatcher.on( 'removeMarker:marker', removeHighlight( highlightDescriptor ) );
+
+				const p1 = modelRoot.getChild( 0 );
+				const p2 = modelRoot.getChild( 1 );
+
+				const markerRange = ModelRange.createFromParentsAndOffsets( p1, 3, p2, 0 );
+
+				model.change( writer => {
+					writer.setMarker( 'marker', markerRange );
+				} );
+
+				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
+
+				model.change( writer => {
+					writer.removeMarker( 'marker', markerRange );
+				} );
+
+				expect( viewToString( viewRoot ) ).to.equal( '<div><p>foo</p><p>bar</p></div>' );
+			} );
 		} );
 
 		describe( 'on element', () => {