Replace "\t" with "\0" for the linebreak-or-whitespace placeholder

fredemmott · fredemmott · commit 8668381da1ed · 2018-10-09T09:22:10.000-07:00
fixes hhvm#102
diff --git a/docs/_docs/overview/hack-builder.md b/docs/_docs/overview/hack-builder.md
@@ -39,7 +39,7 @@ As readable code is a goal of Hack Codegen, several whitespace helpers are provi
  - `->indent()`: increase the number of spaces added to the start of any new non-empty lines
    (by default, this increases by 2 spaces - see `IHackCodegenConfig` to change this)
  - `->unindent()`: do the opposite
- - `->addLineWithSuggestedLineBreaks()`: any `\t` in the input string is replaced with a
+ - `->addLineWithSuggestedLineBreaks()`: any `\0` in the input string is replaced with a
    space if it will still fit in the desired maximum line length, otherwise a newline is
    added (and indented if needed)
  - `->addMultilineCall($call, $args)`: either renders the call all on one line, or with
diff --git a/examples/dorm/CodegenDorm.php b/examples/dorm/CodegenDorm.php
@@ -150,7 +150,7 @@ private function getGetters(): Vector<CodegenMethod> {
             HackBuilderValues::literal(),
           )
           ->addWithSuggestedLineBreaksf(
-            "return %s === null\t? null\t: %s;",
+            "return %s === null\0? null\0: %s;",
             '$value',
             $return_data,
           );
diff --git a/src/BaseCodeBuilder.php b/src/BaseCodeBuilder.php
@@ -21,7 +21,7 @@
  */
 abstract class BaseCodeBuilder {
 
-  const string DELIMITER = "\t";
+  const string DELIMITER = "\0";
 
   private _Private\StrBuffer $code;
   private bool $isNewLine = true;
diff --git a/src/CodegenClassish.php b/src/CodegenClassish.php
@@ -393,7 +393,7 @@ protected function buildConsts(HackBuilder $builder): void {
         $builder->addWithSuggestedLineBreaksf('abstract const %s;', $name);
       } else {
         $builder->addWithSuggestedLineBreaksf(
-          "const %s =\t%s;",
+          "const %s =\0%s;",
           $name,
           (string)$value,
         );
diff --git a/src/CodegenEnum.php b/src/CodegenEnum.php
@@ -82,7 +82,7 @@ protected function buildConsts(HackBuilder $builder): void {
         $builder->addDocBlock($comment);
       }
       $builder
-        ->addWithSuggestedLineBreaksf("%s =\t%s;", $name, (string)$value)
+        ->addWithSuggestedLineBreaksf("%s =\0%s;", $name, (string)$value)
         ->newLine();
     }
   }
diff --git a/src/HackBuilder.php b/src/HackBuilder.php
@@ -184,7 +184,7 @@ public function addAssignment<T>(
   ): this {
     $this->assertIsVariable($var_name);
     return $this->addWithSuggestedLineBreaksf(
-      "%s =\t%s;\n",
+      "%s =\0%s;\n",
       $var_name,
       $renderer->render($this->config, $value),
     );
diff --git a/src/key-value-render/HackBuilderNativeKeyValueCollectionRenderer.php b/src/key-value-render/HackBuilderNativeKeyValueCollectionRenderer.php
@@ -37,7 +37,7 @@ final public function render(IHackCodegenConfig $config, T $values): string {
     $builder = (new HackBuilder($config))->openContainer($this->container);
     foreach ($values as $key => $value) {
       $builder->addWithSuggestedLineBreaksf(
-        "%s =>\t%s,\n",
+        "%s =>\0%s,\n",
         $key_renderer->render($config, $key),
         $value_renderer->render($config, $value),
       );
diff --git a/src/key-value-render/HackBuilderShapeRenderer.php b/src/key-value-render/HackBuilderShapeRenderer.php
@@ -50,7 +50,7 @@ final public function render(
         IHackBuilderValueRenderer::class,
       );
       $builder->addWithSuggestedLineBreaksf(
-        "%s =>\t%s,\n",
+        "%s =>\0%s,\n",
         $key_renderer->render($config, $key),
         $value_renderer->render($config, $value),
       );

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private function getGetters(): Vector<CodegenMethod> {`
`150`	`150`	`HackBuilderValues::literal(),`
`151`	`151`	`)`
`152`	`152`	`->addWithSuggestedLineBreaksf(`
`153`		`- "return %s === null\t? null\t: %s;",`
	`153`	`+ "return %s === null\0? null\0: %s;",`
`154`	`154`	`'$value',`
`155`	`155`	`$return_data,`
`156`	`156`	`);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected function buildConsts(HackBuilder $builder): void {`
`82`	`82`	`$builder->addDocBlock($comment);`
`83`	`83`	`}`
`84`	`84`	`$builder`
`85`		`- ->addWithSuggestedLineBreaksf("%s =\t%s;", $name, (string)$value)`
	`85`	`+ ->addWithSuggestedLineBreaksf("%s =\0%s;", $name, (string)$value)`
`86`	`86`	`->newLine();`
`87`	`87`	`}`
`88`	`88`	`}`