fix - remove extra line after use clauses - kokororin/vscode-phpfmt#169

Author: driade

fmt.stub.php

@@ -10653,11 +10653,22 @@ protected function sortUseClauses($source, $splitComma, $removeUnused, $stripBla
 			}
 
 			$return = '';
+            $i = count(array_filter($newTokens, function($token) {
+                return $token instanceof SurrogateToken;
+            }));
+
 			foreach ($newTokens as $idx => $token) {
 				if ($token instanceof SurrogateToken) {
 					$return .= array_shift($useStack);
 					if ($blanklineAfterUseBlock && !isset($useStack[0])) {
-						$return .= $this->newLine;
+                        $i--;
+                        if ($i > 0) {
+                            $return .= $this->newLine;
+                        } else { // last subrogate token. we need one an just one return after it
+                            if (isset($newTokens[$idx + 1]) && substr_count($newTokens[$idx + 1][1], $this->newLine) === 1) {
+                                $return .= $this->newLine;
+                            }
+                        }
 					}
 					continue;
 				} elseif (T_WHITESPACE == $token[0] && isset($newTokens[$idx - 1], $newTokens[$idx + 1]) && $newTokens[$idx - 1] instanceof SurrogateToken && $newTokens[$idx + 1] instanceof SurrogateToken) {

tests/Original/509-added-unneded-line.in

@@ -0,0 +1,14 @@
+<?php
+//passes:OrderAndRemoveUseClauses
+//excludes:EliminateDuplicatedEmptyLines
+declare (strict_types = 1);
+
+use App\Class1;
+
+class MyClass
+{
+    public function a()
+    {
+        $c = new Class1();
+    }
+}

tests/Original/509-added-unneded-line.out

@@ -0,0 +1,12 @@
+<?php
+//passes:OrderAndRemoveUseClauses
+//excludes:EliminateDuplicatedEmptyLines
+declare (strict_types = 1);
+
+use App\Class1;
+
+class MyClass {
+	public function a() {
+		$c = new Class1();
+	}
+}