convert-docs.php: indentation fixes

diff --git a/php/commands/help.php b/php/commands/help.php
index 25048e6..0e074f0 100644 (file)
--- a/php/commands/help.php
+++ b/php/commands/help.php
@@ -48,9 +48,6 @@ class Help_Command extends WP_CLI_Command {
                // definition lists
                $out = preg_replace( '/\n([^\n]+)\n: (.+?)\n/s', "\n\t\\1\n\t\t\\2\n", $out );
 
-               // convert tabs to spaces
-               $out = preg_replace( '/^\t/m', "  ", $out );
-
                $out = str_replace( "\t", '  ', $out );
 
                echo WP_CLI::colorize( $out );

diff --git a/utils/convert-docs.php b/utils/convert-docs.php
index e898b0e..b3b9668 100644 (file)
--- a/utils/convert-docs.php
+++ b/utils/convert-docs.php
@@ -12,8 +12,12 @@ function convert_file( $path ) {
                return "\n$arg\n: ";
        }, $out );
 
+       // fix indentation
+       $out = preg_replace( '/^  ([^ ]+)/m', "\t\\1", $out );
+       $out = str_replace( "\t", '    ', $out );
+
        // prepend docblock notation
-       # $out = preg_replace( '/^(.*)/m', "\t* \\1", $out );
+       $out = preg_replace( '/^/m', "\t * ", $out );
 
        file_put_contents( $path, $out );
 }