From 6cb50acfb5ee4df342e83d8505116d4607f45d1c Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Tue, 22 Mar 2016 21:25:35 +0100
Subject: Enable flat classpath by default

Implements VirtualDirectoryFlatClassPath, which is required for the
presentation compiler created for the repl's tab-completion.

Various minor cleanups in the flat classpath implementation.
---
 src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala')

diff --git a/src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala b/src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala
index 1d0de57779..a24d989306 100644
--- a/src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala
+++ b/src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala
@@ -57,7 +57,7 @@ trait ZipArchiveFileLookup[FileEntryType <: ClassRepClassPathEntry] extends Flat
     } getOrElse FlatClassPathEntries(Seq.empty, Seq.empty)
   }
 
-  private def findDirEntry(pkg: String) = {
+  private def findDirEntry(pkg: String): Option[archive.DirEntry] = {
     val dirName = s"${FileUtils.dirPath(pkg)}/"
     archive.allDirs.get(dirName)
   }
-- 
cgit v1.2.3