Improve how multiline comments are handled

Author: chris-l

node_translators/doc.js

@@ -2,20 +2,28 @@
 'use strict';
 
 module.exports = function (node, indent) {
+ var self = this, union, body;
+
  if (node.alreadyParsed) {
  return '';
  }
- if (!node.isDoc && node.lines.length === 1 && node.lines[0].indexOf('\n') > -1) {
- node.isDoc = true;
- node.lines = ('\n' + node.lines[0] + '\n').split('\n');
- }
 
  if (node.isDoc) {
- var body = node.lines.join(this.nl + indent + ' * ');
+ body = node.lines.join(this.nl + indent + ' * ');
  if (body.substring(body.length - 3) === ' * ') {
  body = body.substring(0, body.length - 3);
  }
  return this.nl + indent + '/** ' + body + ' */';
  }
- return this.nl + indent + '// ' + node.lines.join(this.nl + indent + '// ');
+
+ union = self.nl + indent + self.ws + self.ws;
+ return node.lines.reduce(function (acc, line) {
+
+ if (line.indexOf('\n') > -1) {
+ return acc.concat('/*' + line.split("\n").join(union) + '*/');
+ }
+
+ return acc.concat('// ' + line);
+ }, []).join(self.nl + indent);
+
 };

test/spec/acid1-parsed.php

@@ -18,7 +18,6 @@
 
  use bar as nsBar;
 
- 
  // generic constant
  const FOOBAR = "foo & bar";
 
@@ -42,7 +41,6 @@ abstract class fooBar implements namespace\fooBaz
  */
  final public function doSomething()
  {
- 
  // do not wanna do
  foreach ($this->dwarf as $name => $greeting) {
  echo 'Hey ho {$name}, {$greeting} !';
@@ -86,7 +84,6 @@ private function shuut()
  }
  }
 
- 
  // this is SPARTA !
  function sparta() : ?int
  {
@@ -144,7 +141,6 @@ public function goatIt()
  $x %= ($i * 2) / ($i - 1);
  $what = $this->$x[++$i] ? "yes!" : "noo!";
  }
- 
  // @todo $this->a_$foo
  return $$foo ?? false;
  }
@@ -157,7 +153,6 @@ public function goatIt()
  echo `ls -larth`;
  endif;
 
- 
  // list version
  list($a, list($b, $c)) = [1, [2, 3]];
  print (<<<BAZ
@@ -169,7 +164,6 @@ public function goatIt()
  eval(<<<FOO
  return 'This is madness!';
 FOO);
- 
  // nested blocks
 
  {

test/tests.spec.js

@@ -15,7 +15,10 @@ describe('Array', function () {
 });
 describe('Comments', function () {
  it('must correcty convert multiline comments that start with only one *', function () {
- expect(parseUnparse('<?php /*\naa\naa\naa\ncc\n*/')).toBe(['<?php', '', '/** ', ' * aa', ' * aa', ' * aa', ' * cc', ' */', ''].join('\n'));
+ expect(parseUnparse('<?php /*\naa\naa\naa\ncc\n*/')).toBe(['<?php', '/*aa', ' aa', ' aa', ' cc*/', ''].join('\n'));
+ });
+ it('must correcty convert multiline comments that dont have an space', function () {
+ expect(parseUnparse('<?php { /******\nbbb\nccc\n*****/\n//echo $ee;\n}')).toBe(['<?php', '', '{', ' /******', ' bbb', ' ccc', ' *****/', ' // echo $ee;', '}', '', ''].join('\n'));
  });
 });
 describe('Comments', function () {
@@ -25,7 +28,7 @@ describe('Comments', function () {
 });
 describe('Blocks', function () {
  it('must correcty convert nested blocks', function () {
- expect(parseUnparse('<?php {{\n// Code generation for this\n}}')).toBe(['<?php', '', '{', ' ', ' {', ' ', ' // Code generation for this', ' }', '', '}', '', ''].join('\n'));
+ expect(parseUnparse('<?php {{\n// Code generation for this\n}}')).toBe(['<?php', '', '{', ' ', ' {', ' // Code generation for this', ' }', '', '}', '', ''].join('\n'));
  });
 });
 describe('Blocks', function () {