Contains post review fixes.

wpopielarski · wpopielarski · commit af474be0e01c · 2017-08-16T13:30:19.000+02:00
diff --git a/src/main/scala/scala/tools/refactoring/implementations/OrganizeImports.scala b/src/main/scala/scala/tools/refactoring/implementations/OrganizeImports.scala
@@ -22,7 +22,7 @@ object OrganizeImports {
       val acc = distinctGroups.map(_ -> scala.collection.mutable.ListBuffer.empty[ImportT]).toMap
       val assigned = imports.foldLeft(acc) { (acc, imp) =>
         val expr = getImportExpression(imp)
-        val (inGroup, _) = distinctGroups.partition { group =>
+        val inGroup = distinctGroups.filter { group =>
           expr.startsWith(group + ".") || expr == group
         }
         if (inGroup.nonEmpty) {
@@ -33,8 +33,7 @@ object OrganizeImports {
       }
       val unassigned = {
         val a = assigned.values.toList.flatten.map(getImportExpression)
-        val (_, unassigned) = imports.partition { imp => a.contains(getImportExpression(imp)) }
-        unassigned
+        imports.filterNot { imp => a.contains(getImportExpression(imp)) }
       }
       if (assigned.keySet(DefaultGroup)) {
         assigned(DefaultGroup) ++= unassigned

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ object OrganizeImports {`
`22`	`22`	`val acc = distinctGroups.map(_ -> scala.collection.mutable.ListBuffer.empty[ImportT]).toMap`
`23`	`23`	`val assigned = imports.foldLeft(acc) { (acc, imp) =>`
`24`	`24`	`val expr = getImportExpression(imp)`
`25`		`- val (inGroup, _) = distinctGroups.partition { group =>`
	`25`	`+ val inGroup = distinctGroups.filter { group =>`
`26`	`26`	`expr.startsWith(group + ".") \|\| expr == group`
`27`	`27`	`}`
`28`	`28`	`if (inGroup.nonEmpty) {`
`@@ -33,8 +33,7 @@ object OrganizeImports {`
`33`	`33`	`}`
`34`	`34`	`val unassigned = {`
`35`	`35`	`val a = assigned.values.toList.flatten.map(getImportExpression)`
`36`		`- val (_, unassigned) = imports.partition { imp => a.contains(getImportExpression(imp)) }`
`37`		`- unassigned`
	`36`	`+ imports.filterNot { imp => a.contains(getImportExpression(imp)) }`
`38`	`37`	`}`
`39`	`38`	`if (assigned.keySet(DefaultGroup)) {`
`40`	`39`	`assigned(DefaultGroup) ++= unassigned`