post-rebase fixes

Author: jchyb

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -285,7 +285,7 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[BinaryFil
   protected def createFileEntry(file: AbstractFile): BinaryFileEntry = BinaryFileEntry(file)
 
   protected def isMatchingFile(f: JFile): Boolean =
-    f.isTasty || f.isBestEffortTasty || (f.isClass && f.hasSiblingTasty)
+    f.isTasty || f.isBestEffortTasty || (f.isClass && !f.hasSiblingTasty)
 
   private[dotty] def classes(inPackage: PackageName): Seq[BinaryFileEntry] = files(inPackage)
 }

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -418,7 +418,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
 }
 
 class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
-  val isBestEffortTasty = tastyFile.extension == "betasty"
+  val isBestEffortTasty = tastyFile.hasBetastyExtension
   private val unpickler: tasty.DottyUnpickler =
     handleUnpicklingExceptions:
       val tastyBytes = tastyFile.toByteArray

compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala

@@ -61,7 +61,7 @@ object TastyPrinter:
         val jar = JarArchive.open(Path(arg), create = false)
         try
           for file <- jar.iterator() if file.hasTastyExtension do
-            printTasty(s"$arg ${file.path}", file.toByteArray)
+            printTasty(s"$arg ${file.path}", file.toByteArray, isBestEffortTasty = false)
         finally jar.close()
       else
         println(s"Not a '.tasty' or '.jar' file: $arg")

compiler/src/dotty/tools/dotc/transform/Pickler.scala

@@ -61,7 +61,7 @@ class Pickler extends Phase {
   override def isRunnable(using Context): Boolean =
     (super.isRunnable || ctx.isBestEffort)
     && !ctx.settings.fromTasty.value
-    && (!ctx.usesBestEffortTasty || ctx.isBestEffort)
+    && (!ctx.usedBestEffortTasty || ctx.isBestEffort)
     // we do not want to pickle `.betasty` if will not create the file either way
 
   // when `-Yjava-tasty` is set we actually want to run this phase on Java sources

compiler/src/dotty/tools/io/FileExtension.scala

@@ -63,6 +63,7 @@ object FileExtension:
     case "java" => Java
     case "zip" => Zip
     case "inc" => Inc
+    case "betasty" => Betasty
     case _ => slowLookup(s)
 
   // slower than initialLookup, keep in sync with initialLookup
@@ -75,6 +76,7 @@ object FileExtension:
     else if s.equalsIgnoreCase("java") then Java
     else if s.equalsIgnoreCase("zip") then Zip
     else if s.equalsIgnoreCase("inc") then Inc
+    else if s.equalsIgnoreCase("betasty") then Betasty
     else External(s)
 
   def from(s: String): FileExtension =

compiler/test/dotc/neg-best-effort-unpickling.blacklist

@@ -14,4 +14,4 @@ i4653.scala
 overrideClass.scala
 
 # repeating <error> on a top level type definition
-# i18750.scala 
+i18750.scala