Merge pull request #922 from NicolasRouquette/master

Failed test demonstrates the problem of #921

Author: olafurpg

scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala

@@ -187,7 +187,7 @@ case class Args(
   def configuredSymtab: Configured[SymbolTable] = {
     Try(
       ClasspathOps.newSymbolTable(
-        classpath = classpath,
+        classpath = validatedClasspath,
         out = out
       )
     ) match {

scalafix-reflect/src/main/scala/scalafix/internal/reflect/ClasspathOps.scala

@@ -55,6 +55,10 @@ object ClasspathOps {
     path.resolve(META_INF).resolve(SEMANTICDB).toFile.isDirectory
   }
 
+  private def isJar(path: AbsolutePath): Boolean =
+    path.isFile &&
+      path.toFile.getName.endsWith(".jar")
+
   def autoClasspath(roots: List[AbsolutePath]): Classpath = {
     val buffer = List.newBuilder[AbsolutePath]
     val visitor = new SimpleFileVisitor[Path] {
@@ -71,6 +75,7 @@ object ClasspathOps {
       }
     }
     roots.foreach(x => Files.walkFileTree(x.toNIO, visitor))
+    roots.filter(isJar).foreach(buffer += _)
     Classpath(buffer.result())
   }
 

scalafix-tests/unit/src/test/scala/scalafix/tests/cli/CliSemanticSuite.scala

@@ -2,10 +2,12 @@ package scalafix.tests.cli
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
+
 import scala.meta.internal.io.PathIO
 import scala.meta.internal.io.FileIO
 import scala.meta.io.Classpath
 import scalafix.cli._
+import scalafix.tests.core.Classpaths
 
 class CliSemanticSuite extends BaseCliSuite {
 
@@ -125,6 +127,24 @@ class CliSemanticSuite extends BaseCliSuite {
     files = explicitResultTypesPath.toString()
   )
 
+  checkSemantic(
+    name = "explicit result types OK (auto-classpath)",
+    args = Array(
+      "--auto-classpath",
+      "--auto-classpath-roots",
+      PathIO.workingDirectory.toString
+    ) ++ Classpaths.scalaLibrary.entries.to[Array].flatMap { path =>
+      Array(
+        "--auto-classpath-roots",
+        path.toString
+      )
+    },
+    expectedExit = ExitStatus.Ok,
+    rule = "ExplicitResultTypes",
+    path = explicitResultTypesPath,
+    files = explicitResultTypesPath.toString()
+  )
+
   checkSemantic(
     name = "incomplete classpath does not result in error exit code",
     args = Array(