Merge pull request #80 from ckeditor/t/ckeditor5-list/115

Other: Remove the `fixListIndentation()` filter in favor of improved list converters fix. See ckeditor/ckeditor5-list#115.

Author: Reinmar

src/filters/list.js

@@ -70,65 +70,6 @@ export function unwrapParagraphInListItem( documentFragment, writer ) {
 	}
 }
 
-/**
- * Fix structure of nested lists to follow HTML guidelines and normalize content in predictable way.
- *
- * 1. Move nested lists to have sure that list items are the only children of lists.
- *
- *		before:                           after:
- *		OL                                OL
- *		|-> LI                            |-> LI
- *		|-> OL                                |-> OL
- *		    |-> LI                                |-> LI
- *
- * 2. Remove additional indentation which cannot be recreated in HTML structure.
- *
- *		before:                           after:
- *		OL                                OL
- *		|-> LI                            |-> LI
- *		    |-> OL                            |-> OL
- *		        |-> OL                            |-> LI
- *		        |   |-> OL                        |-> LI
- *		        |       |-> OL
- *		        |           |-> LI
- *		        |-> LI
- *
- *		before:                           after:
- *		OL                                OL
- *		|-> OL                             |-> LI
- *		    |-> OL
- *		         |-> OL
- *		             |-> LI
- *
- * @param {module:engine/view/documentfragment~DocumentFragment} documentFragment
- * @param {module:engine/view/upcastwriter~UpcastWriter} writer
- */
-export function fixListIndentation( documentFragment, writer ) {
-	for ( const value of writer.createRangeIn( documentFragment ) ) {
-		const element = value.item;
-
-		// case 1: The previous sibling of a list is a list item.
-		if ( element.is( 'li' ) ) {
-			const next = element.nextSibling;
-
-			if ( next && isList( next ) ) {
-				writer.remove( next );
-				writer.insertChild( element.childCount, next, element );
-			}
-		}
-
-		// case 2: The list is the first child of another list.
-		if ( isList( element ) ) {
-			let firstChild = element.getChild( 0 );
-
-			while ( isList( firstChild ) ) {
-				writer.unwrapElement( firstChild );
-				firstChild = element.getChild( 0 );
-			}
-		}
-	}
-}
-
 // Finds all list-like elements in a given document fragment.
 //
 // @param {module:engine/view/documentfragment~DocumentFragment} documentFragment Document fragment

src/normalizers/googledocsnormalizer.js

@@ -33,7 +33,6 @@ export default class GoogleDocsNormalizer {
 		const writer = new UpcastWriter();
 
 		removeBoldWrapper( data.content, writer );
-		fixListIndentation( data.content, writer );
 		unwrapParagraphInListItem( data.content, writer );
 	}
 }

tests/_data/paste-from-google-docs/lists/index.js

@@ -4,19 +4,15 @@
  */
 
 import nestedOrderedList from './nested-ordered-lists/input.html';
-import nestedOrderedListNormalized from './nested-ordered-lists/normalized.html';
 import nestedOrderedListModel from './nested-ordered-lists/model.html';
 
 import mixedList from './mixed-list/input.html';
-import mixedListNormalized from './mixed-list/normalized.html';
 import mixedListModel from './mixed-list/model.html';
 
 import repeatedlyNestedList from './repeatedly-nested-list/input.html';
-import repeatedlyNestedListNormalized from './repeatedly-nested-list/normalized.html';
 import repeatedlyNestedListModel from './repeatedly-nested-list/model.html';
 
 import partiallySelected from './partially-selected/input.html';
-import partiallySelectedNormalized from './partially-selected/normalized.html';
 import partiallySelectedModel from './partially-selected/model.html';
 
 export const fixtures = {
@@ -26,12 +22,6 @@ export const fixtures = {
 		repeatedlyNestedList,
 		partiallySelected
 	},
-	normalized: {
-		nestedOrderedList: nestedOrderedListNormalized,
-		mixedList: mixedListNormalized,
-		repeatedlyNestedList: repeatedlyNestedListNormalized,
-		partiallySelected: partiallySelectedNormalized
-	},
 	model: {
 		nestedOrderedList: nestedOrderedListModel,
 		mixedList: mixedListModel,