Skip to content

Polishing to InteractiveDriver.classesFromZip #5586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2018
Merged

Polishing to InteractiveDriver.classesFromZip #5586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,8 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
// Like in `ZipArchiveFileLookup` we assume that zips are immutable
private val zipClassPathClasses: Seq[TypeName] = {
val names = new mutable.ListBuffer[TypeName]
zipClassPaths.foreach { zipCp =>
val zipFile = new ZipFile(zipCp.zipFile)
classesFromZip(zipFile, names)
}
for (cp <- zipClassPaths)
classesFromZip(cp.zipFile, names)
names
}

Expand Down Expand Up @@ -110,8 +108,7 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
if (output.isDirectory) {
classesFromDir(output.jpath, classNames)
} else {
val zipFile = new ZipFile(output.file)
classesFromZip(zipFile, classNames)
classesFromZip(output.file, classNames)
}
classNames.flatMap { cls =>
treesFromClassName(cls, id)
Expand Down Expand Up @@ -212,16 +209,22 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
names
}

/** Adds the names of the classes that are defined in `zipFile` to `buffer`. */
private def classesFromZip(zipFile: ZipFile, buffer: mutable.ListBuffer[TypeName]): Unit = {
/** Adds the names of the classes that are defined in `file` to `buffer`. */
private def classesFromZip(file: File, buffer: mutable.ListBuffer[TypeName]): Unit = {
val zipFile = new ZipFile(file)
try {
for {
entry <- zipFile.stream.toArray((size: Int) => new Array[ZipEntry](size))
name = entry.getName
tastySuffix <- tastySuffixes.find(name.endsWith)
} buffer += name.replace("/", ".").stripSuffix(tastySuffix).toTypeName
val entries = zipFile.entries()
while (entries.hasMoreElements) {
val entry = entries.nextElement()
val name = entry.getName
tastySuffixes.find(name.endsWith) match {
case Some(tastySuffix) =>
buffer += name.replace("/", ".").stripSuffix(tastySuffix).toTypeName
case _ =>
}
}
}
finally zipFile.close()
finally zipFile.close()
}

/** Adds the names of the classes that are defined in `dir` to `buffer`. */
Expand Down