spatch: remove trailing comment when everything else in the line was …

…removed

Summary: Just added unit tests, the previous diff already handled this case.

Test Plan:
unit test included
$ ./spatch -test

Reviewers: pieter, ptarjan, julienv, zoel

Reviewed By: pieter

CC: rmcelroy, ahupp

Differential Revision: https://phabricator.fb.com/D651188

lang_php/parsing/unparse_php.ml

@@ -243,6 +243,9 @@ let drop_esthet_between_removed xs =
   in
   outside_remove xs
 
+(* note that it will also remove comments in the line if everthing else
+ * was removed, which is what we want most of the time
+ *)
 let drop_whole_line_if_only_removed xs =
   let (before_first_newline, xxs) = xs +> Common.group_by_pre (function
     | Esthet Newline -> true | _ -> false)
@@ -251,13 +254,13 @@ let drop_whole_line_if_only_removed xs =
     let has_a_remove = 
       elts_after_newline +> List.exists (function 
       | Removed _ -> true | _ -> false) in
-    let only_remove_or_space = 
+    let only_remove_or_esthet = 
       elts_after_newline +> List.for_all (function
       | Esthet _ | Removed _ -> true
       | Added _ | OrigElt _ -> false
       )
     in
-    has_a_remove && only_remove_or_space
+    has_a_remove && only_remove_or_esthet
   )
   in
   before_first_newline ++ 

tests/php/spatch/remove_trailing_comment.exp

@@ -0,0 +1,8 @@
+<?php
+
+1;
+2;
+3;
+4;
+// this should be kept
+// this should be kept too

tests/php/spatch/remove_trailing_comment.php

@@ -0,0 +1,14 @@
+<?php
+
+1;
+foo(1); // I'm a clown
+2;
+foo(
+  1);
+3;
+foo(1); /* I'm a 
+really bad clown */
+4;
+// this should be kept
+foo(1); // this should be removed
+// this should be kept too

tests/php/spatch/remove_trailing_comment.spatch

@@ -0,0 +1 @@
+- foo(X);