Small Cleanup

Author: allanrenucci

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -11,9 +11,7 @@ import Phases._
 import Trees._
 import Types._
 import Symbols._
-import Names._
 import NameOps._
-import StdNames._
 import NameKinds.DefaultGetterName
 import typer.Inliner
 import typer.ErrorReporting.cyclicErrorMsg
@@ -22,7 +20,6 @@ import transform.SymUtils._
 import dotty.tools.io.File
 import java.io.PrintWriter
 
-import dotty.tools.dotc.config.JavaPlatform
 import xsbti.api.DefinitionType
 
 import scala.collection.mutable
@@ -358,10 +355,10 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
                 sym.owner.companionModule // default getters for class constructors are found in the companion object
               else
                 sym.owner
-            (0 until pnames.length).map(i =>
+            pnames.indices.map(i =>
               qual.info.member(DefaultGetterName(sym.name, start + i)).exists)
           } else
-            (0 until pnames.length).map(Function.const(false))
+            pnames.indices.map(Function.const(false))
         val params = (pnames, ptypes, defaults).zipped.map((pname, ptype, isDefault) =>
           api.MethodParameter.of(pname.toString, apiType(ptype),
             isDefault, api.ParameterModifier.Plain))

compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala

@@ -1,25 +1,28 @@
 package dotty.tools.dotc
 package sbt
 
-import ast.{Trees, tpd}
-import core._, core.Decorators._
-import util.NoSource.{file => NoSourceFile}
-import Contexts._, Flags._, Phases._, Trees._, Types._, Symbols._
-import Names._, NameOps._, StdNames._
-import transform.SymUtils._
-
-import scala.collection.{Set, mutable}
-
-import dotty.tools.io
-import dotty.tools.io.{AbstractFile, ZipArchive, PlainFile}
-
 import java.io.File
-
-import java.util.{Arrays, Comparator, EnumSet}
-
+import java.util.{Arrays, EnumSet}
+
+import dotty.tools.dotc.ast.Trees._
+import dotty.tools.dotc.ast.tpd
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.NameOps._
+import dotty.tools.dotc.core.Names._
+import dotty.tools.dotc.core.Phases._
+import dotty.tools.dotc.core.StdNames._
+import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.transform.SymUtils._
+import dotty.tools.io
+import dotty.tools.io.{AbstractFile, PlainFile, ZipArchive}
+import xsbti.UseScope
 import xsbti.api.DependencyContext
 import xsbti.api.DependencyContext._
-import xsbti.UseScope
+
+import scala.collection.{Set, mutable}
 
 
 /** This phase sends information on classes' dependencies to sbt via callbacks.
@@ -191,7 +194,6 @@ private final class UsedNamesInClass {
  */
 private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeTraverser =>
   import tpd._
-  import ExtractDependencies._
 
   private[this] val _usedNames = new mutable.HashMap[Symbol, UsedNamesInClass]
   private[this] val _dependencies = new mutable.HashSet[ClassDependency]
@@ -243,20 +245,24 @@ private class ExtractDependenciesCollector extends tpd.TreeTraverser { thisTreeT
    * class from a given `ctx.owner`
    */
   private def resolveDependencySource(implicit ctx: Context): Symbol = {
-    def resolveDepSource: Symbol = {
-      val owners = ctx.owner.ownersIterator
-      while (owners.hasNext) {
-        val source = owners.next()
-        def isLocal = !owners.exists(_.isTerm) // side-effectful: consume iterator elements
-        if (source.isClass && isLocal) return source
+    def nonLocalEnclosingClass = {
+      var clazz = ctx.owner.enclosingClass
+      var owner = clazz
+
+      while (!owner.is(PackageClass)) {
+        if (owner.isTerm) {
+          clazz = owner.enclosingClass
+          owner = clazz
+        } else {
+          owner = owner.owner
+        }
       }
-      assert(false, "unreachable")
-      NoSymbol
+      clazz
     }
 
     if (lastOwner != ctx.owner) {
       lastOwner = ctx.owner
-      val source = resolveDepSource
+      val source = nonLocalEnclosingClass
       lastDepSource = if (source.is(PackageClass)) responsibleForImports else source
     }
 

project/Build.scala

@@ -135,7 +135,7 @@ object Build {
         val path = Paths.get(submodule)
         Files.exists(path) && {
           val fileStream = Files.list(path)
-          try fileStream.iterator().hasNext()
+          try fileStream.iterator().hasNext
           finally fileStream.close()
         }
       }
@@ -727,7 +727,7 @@ object Build {
     cleanSbtBridge := {
       val home = System.getProperty("user.home")
       val sbtOrg = "org.scala-sbt"
-      val bridgeDirectoryPattern = s"*${dottyVersion}*"
+      val bridgeDirectoryPattern = s"*$dottyVersion*"
 
       val log = streams.value.log
       log.info("Cleaning the dotty-sbt-bridge cache")
@@ -899,7 +899,7 @@ object Build {
         val inputArgs = spaceDelimited("<arg>").parsed
         val codeArgs = if (inputArgs.isEmpty) List((baseDirectory.value / "..").getAbsolutePath) else inputArgs
         val extensionPath = baseDirectory.value.getAbsolutePath
-        val processArgs = List(s"--extensionDevelopmentPath=${extensionPath}") ++ codeArgs
+        val processArgs = List(s"--extensionDevelopmentPath=$extensionPath") ++ codeArgs
 
         runProcess(codeCommand.value ++ processArgs, wait = true)
       }.dependsOn(compile in Compile).evaluated
@@ -1054,7 +1054,7 @@ object Build {
           def doCompile(sourcesArgs: List[String]): Unit = {
             run.run("dotty.tools.dotc.Main", compilerCp,
                 "-classpath" :: cpStr ::
-                "-d" :: classesDirectory.getAbsolutePath() ::
+                "-d" :: classesDirectory.getAbsolutePath ::
                 scalacOptions ++:
                 sourcesArgs,
                 patchedLogger)
@@ -1067,7 +1067,7 @@ object Build {
               (sourcesArgs.map(_.length).sum > 1536)) {
             IO.withTemporaryFile("sourcesargs", ".txt") { sourceListFile =>
               IO.writeLines(sourceListFile, sourcesArgs)
-              doCompile(List("@"+sourceListFile.getAbsolutePath()))
+              doCompile(List("@"+sourceListFile.getAbsolutePath))
             }
           } else {
             doCompile(sourcesArgs)