Make index-based operations consistent

Author: schlessera

features/post-block.feature

@@ -1311,6 +1311,76 @@ Feature: Manage blocks in post content
       0
       """
 
+  @require-wp-5.0
+  Scenario: Remove by index with whitespace between blocks
+    Given a WP install
+    And a spaced-blocks.txt file:
+      """
+      <!-- wp:paragraph --><p>First</p><!-- /wp:paragraph -->
+
+      <!-- wp:paragraph --><p>Second</p><!-- /wp:paragraph -->
+
+      <!-- wp:paragraph --><p>Third</p><!-- /wp:paragraph -->
+      """
+    When I run `wp post create --post_title='Spaced' --porcelain < spaced-blocks.txt`
+    Then save STDOUT as {POST_ID}
+
+    # Index 1 should be "Second", not the whitespace between blocks
+    When I run `wp post block remove {POST_ID} --index=1`
+    Then STDOUT should contain:
+      """
+      Success: Removed 1 block from post {POST_ID}.
+      """
+
+    When I run `wp post get {POST_ID} --field=post_content`
+    Then STDOUT should contain:
+      """
+      First
+      """
+    And STDOUT should contain:
+      """
+      Third
+      """
+    And STDOUT should not contain:
+      """
+      Second
+      """
+
+  @require-wp-5.0
+  Scenario: Remove multiple indices with whitespace between blocks
+    Given a WP install
+    And a spaced-blocks.txt file:
+      """
+      <!-- wp:paragraph --><p>First</p><!-- /wp:paragraph -->
+
+      <!-- wp:paragraph --><p>Second</p><!-- /wp:paragraph -->
+
+      <!-- wp:paragraph --><p>Third</p><!-- /wp:paragraph -->
+      """
+    When I run `wp post create --post_title='Spaced' --porcelain < spaced-blocks.txt`
+    Then save STDOUT as {POST_ID}
+
+    # Indices 0 and 2 should be "First" and "Third"
+    When I run `wp post block remove {POST_ID} --index=0,2`
+    Then STDOUT should contain:
+      """
+      Success: Removed 2 blocks from post {POST_ID}.
+      """
+
+    When I run `wp post get {POST_ID} --field=post_content`
+    Then STDOUT should contain:
+      """
+      Second
+      """
+    And STDOUT should not contain:
+      """
+      First
+      """
+    And STDOUT should not contain:
+      """
+      Third
+      """
+
   @require-wp-5.0
   Scenario: Replace block preserves content
     Given a WP install

src/Post_Block_Command.php

@@ -1462,19 +1462,43 @@ public function remove( $args, $assoc_args ) {
 			WP_CLI::error( 'You must specify either a block name or --index.' );
 		}
 
-		$blocks        = parse_blocks( $post->post_content );
+		$blocks = parse_blocks( $post->post_content );
+
+		// Filter out empty blocks but keep track of original indices.
+		$filtered_blocks = [];
+		$index_map       = [];
+		foreach ( $blocks as $original_idx => $block ) {
+			if ( ! empty( $block['blockName'] ) ) {
+				$index_map[ count( $filtered_blocks ) ] = $original_idx;
+				$filtered_blocks[]                      = $block;
+			}
+		}
+
 		$removed_count = 0;
 
 		if ( null !== $indices ) {
 			$index_array = array_map( 'intval', explode( ',', $indices ) );
-			rsort( $index_array );
 
+			// Validate all indices first.
 			foreach ( $index_array as $idx ) {
-				if ( isset( $blocks[ $idx ] ) ) {
-					array_splice( $blocks, $idx, 1 );
-					++$removed_count;
+				if ( $idx < 0 || $idx >= count( $filtered_blocks ) ) {
+					WP_CLI::error( "Invalid index: {$idx}. Post has " . count( $filtered_blocks ) . ' block(s) (0-indexed).' );
 				}
 			}
+
+			// Map to original indices and sort in reverse order to remove from end first.
+			$original_indices = array_map(
+				function ( $idx ) use ( $index_map ) {
+					return $index_map[ $idx ];
+				},
+				$index_array
+			);
+			rsort( $original_indices );
+
+			foreach ( $original_indices as $original_idx ) {
+				array_splice( $blocks, $original_idx, 1 );
+				++$removed_count;
+			}
 		} elseif ( $remove_all && null !== $block_name ) {
 			$new_blocks = [];
 			foreach ( $blocks as $block ) {