Polishing

Author: allanrenucci

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

@@ -122,11 +122,17 @@ class InteractiveDriver(settings: List[String]) extends Driver {
 
   // Like in `ZipArchiveFileLookup` we assume that zips are immutable
   private val zipClassPathClasses: Seq[String] = zipClassPaths.flatMap { zipCp =>
-    new ZipFile(zipCp.zipFile)
-      .stream
-      .toArray((size: Int) => new Array[ZipEntry](size))
-      .map((e: ZipEntry) => e.getName)
-      .flatMap((name: String) => tastySuffixes.find(name.endsWith).map(name.replace("/", ".").stripSuffix))
+    val zipFile = new ZipFile(zipCp.zipFile)
+
+    try {
+      for {
+        entry <- zipFile.stream.iterator().asScala
+        name = entry.getName
+        tastySuffix <- tastySuffixes
+        if name.endsWith(tastySuffix)
+      } yield name.replace("/", ".").stripSuffix(tastySuffix)
+    }
+    finally zipFile.close()
   }
 
   // FIXME: classfiles in directories may change at any point, so we retraverse

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -134,11 +134,9 @@ class DottyLanguageServer extends LanguageServer
     // Do most of the initialization asynchronously so that we can return early
     // from this method and thus let the client know our capabilities.
     CompletableFuture.supplyAsync(() => drivers)
-      .exceptionally {
-        (ex: Throwable) => {
-            ex.printStackTrace
-            sys.exit(1)
-          }
+      .exceptionally { (ex: Throwable) =>
+        ex.printStackTrace
+        sys.exit(1)
       }
 
     new InitializeResult(c)