diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-03-22 21:25:35 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-03-22 21:28:27 +0100 |
commit | 6cb50acfb5ee4df342e83d8505116d4607f45d1c (patch) | |
tree | bd37410452b625a74c5337f9a5509ae8451b5189 /src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala | |
parent | ad48e5918081c679546f50b6f52dd8e0813754e7 (diff) | |
download | scala-6cb50acfb5ee4df342e83d8505116d4607f45d1c.tar.gz scala-6cb50acfb5ee4df342e83d8505116d4607f45d1c.tar.bz2 scala-6cb50acfb5ee4df342e83d8505116d4607f45d1c.zip |
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.
Diffstat (limited to 'src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/classpath/ZipArchiveFileLookup.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |