Setup slugs in TreeModifier

divec · divec · commit 3a64969b9a3e · 2017-09-19T10:17:06.000+08:00
Bug: T175852
Bug: T175943
Change-Id: I9cea81cfe71d97a38e3fdf30015d8389eedde756
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
@@ -243,7 +243,9 @@ ve.ce.BranchNode.prototype.onSplice = function ( index ) {
 		}
 	}
 
+	// TODO: restructure to clarify the logic (exactly one of these is a no-op)
 	this.setupBlockSlugs();
+	this.setupInlineSlugs();
 };
 
 /**
diff --git a/src/dm/ve.dm.BranchNode.js b/src/dm/ve.dm.BranchNode.js
@@ -155,6 +155,8 @@ ve.dm.BranchNode.prototype.splice = function () {
 
 /**
  * Setup a sparse array of booleans indicating where to place slugs
+ *
+ * TODO: The function name is misleading: in ContentBranchNodes it sets up inline slugs
  */
 ve.dm.BranchNode.prototype.setupBlockSlugs = function () {
 	var i, len,
diff --git a/src/dm/ve.dm.TreeModifier.js b/src/dm/ve.dm.TreeModifier.js
@@ -649,6 +649,9 @@ ve.dm.TreeModifier.prototype.insertText = function ( data ) {
  */
 ve.dm.TreeModifier.prototype.create = function ( data ) {
 	var node = ve.dm.nodeFactory.createFromElement( data[ 0 ] );
+	if ( node instanceof ve.dm.BranchNode ) {
+		node.setupBlockSlugs();
+	}
 	this.ensureNotTextNode();
 	this.insertNode( node, data );
 };
diff --git a/tests/dm/ve.dm.TreeModifier.test.js b/tests/dm/ve.dm.TreeModifier.test.js
@@ -114,3 +114,25 @@ QUnit.test( 'modify', function ( assert ) {
 		'Modified tree matches rebuilt tree, reversed'
 	);
 } );
+
+QUnit.test( 'setupBlockSlugs', function ( assert ) {
+	var doc = new ve.dm.Surface(
+		ve.dm.example.createExampleDocumentFromData( [] )
+	).documentModel;
+
+	assert.expect( 1 );
+
+	doc.commit( new ve.dm.Transaction( [ {
+		type: 'replace',
+		remove: [],
+		insert: [ { type: 'paragraph' }, { type: '/paragraph' } ],
+		insertedDataOffset: 0,
+		insertedDataLength: 2
+	} ] ) );
+
+	assert.deepEqual(
+		doc.getDocumentNode().getChildren()[ 0 ].slugPositions,
+		{ 0: true },
+		'Modified paragraph node contains a slug'
+	);
+} );

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,9 @@ ve.ce.BranchNode.prototype.onSplice = function ( index ) {`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
	`246`	`+ // TODO: restructure to clarify the logic (exactly one of these is a no-op)`
`246`	`247`	`this.setupBlockSlugs();`
	`248`	`+ this.setupInlineSlugs();`
`247`	`249`	`};`
`248`	`250`
`249`	`251`	`/**`