Merge pull request scala#10503 from som-snytt/tweak/bridge-warnings

Obey messaging in sbt-bridge

Author: lrytz

build.sbt

@@ -627,6 +627,11 @@ lazy val sbtBridge = configureAsSubproject(project, srcdir = Some("sbt-bridge"))
     name := "scala2-sbt-bridge",
     description := "sbt compiler bridge for Scala 2",
     libraryDependencies += compilerInterfaceDep % Provided,
+    Compile / scalacOptions ++= Seq(
+      "-Xlint",
+      "-feature",
+      "-Wconf:cat=deprecation&msg=early initializers:s", // compiler heavily relies upon early initializers
+    ),
     generateServiceProviderResources("xsbti.compile.CompilerInterface2" -> "scala.tools.xsbt.CompilerBridge"),
     generateServiceProviderResources("xsbti.compile.ConsoleInterface1"  -> "scala.tools.xsbt.ConsoleBridge"),
     generateServiceProviderResources("xsbti.compile.ScaladocInterface2" -> "scala.tools.xsbt.ScaladocBridge"),

src/reflect/scala/reflect/internal/Names.scala

@@ -546,6 +546,8 @@ trait Names extends api.Names {
     override final def toString: String = if (cachedString == null) new String(_chrs, index, len) else cachedString
     final def appendTo(buffer: java.lang.StringBuffer, start: Int, length: Int): Unit =
       buffer.append(_chrs, this.start + start, length)
+    final def appendTo(sb: StringBuilder, start: Int, length: Int): sb.type =
+      sb.appendAll(_chrs, this.start + start, length)
   }
 
   implicit val NameTag: ClassTag[Name] = ClassTag[Name](classOf[Name])

src/sbt-bridge/scala/tools/xsbt/API.scala

@@ -63,7 +63,7 @@ final class API(val global: CallbackGlobal) extends Compat with GlobalHelpers wi
     }
 
     private def processScalaUnit(unit: CompilationUnit): Unit = {
-      val sourceFile: VirtualFile = unit.source.file match { case AbstractZincFile(vf) => vf }
+      val sourceFile: VirtualFile = unit.source.file match { case AbstractZincFile(vf) => vf case x => throw new MatchError(x) }
       debuglog("Traversing " + sourceFile)
       callback.startSource(sourceFile)
       val extractApi = new ExtractAPI[global.type](global, sourceFile)
@@ -213,7 +213,6 @@ final class API(val global: CallbackGlobal) extends Compat with GlobalHelpers wi
     def isTopLevel(sym: Symbol): Boolean = {
       !ignoredSymbol(sym) &&
       sym.isStatic &&
-      !sym.isImplClass &&
       (!sym.hasFlag(Flags.JAVA) || global.callback.isPickleJava) &&
       !sym.isNestedClass
     }

src/sbt-bridge/scala/tools/xsbt/Analyzer.scala

@@ -19,7 +19,7 @@ import java.nio.file.Path
 import java.io.File
 import xsbti.VirtualFile
 import scala.tools.nsc.Phase
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object Analyzer {
   def name = "xsbt-analyzer"
@@ -54,7 +54,7 @@ final class Analyzer(val global: CallbackGlobal) extends LocateClassFile {
 
     def apply(unit: CompilationUnit): Unit = {
       if (!unit.isJava) {
-        val sourceFile0: AbstractZincFile = unit.source.file match { case v: AbstractZincFile => v }
+        val sourceFile0: AbstractZincFile = unit.source.file match { case v: AbstractZincFile => v case x => throw new MatchError(x) }
         val sourceFile: VirtualFile = sourceFile0.underlying
         lazy val outputDir = settings.outputDirs.outputDirFor(sourceFile0).file
         for (iclass <- unit.icode) {
@@ -77,7 +77,7 @@ final class Analyzer(val global: CallbackGlobal) extends LocateClassFile {
             }
           }
 
-          if (sym.isModuleClass && !sym.isImplClass) {
+          if (sym.isModuleClass) {
             if (isTopLevelModule(sym) && sym.companionClass == NoSymbol)
               addGenerated(false)
             addGenerated(true)

src/sbt-bridge/scala/tools/xsbt/CallbackGlobal.scala

@@ -46,7 +46,8 @@ sealed abstract class CallbackGlobal(
       case single: SingleOutput => List(single.getOutputDirectoryAsPath)
       // Use Stream instead of List because Analyzer maps intensively over the directories
       case multi: MultipleOutput =>
-        multi.getOutputGroups.toIterator.map(_.getOutputDirectoryAsPath).toSeq
+        multi.getOutputGroups.iterator.map(_.getOutputDirectoryAsPath).toSeq
+      case x => throw new MatchError(x)
     }
   }
 
@@ -227,28 +228,27 @@ sealed class ZincCompiler(settings: Settings, dreporter: DelegatingReporter, out
       suffix: CharSequence,
       includePackageObjectClassNames: Boolean
   ): String = {
-    var b: java.lang.StringBuffer = null
-    def loop(size: Int, sym: Symbol): Unit = {
+    def loop(sb: StringBuilder, size: Int, sym: Symbol): StringBuilder = {
       val symName = sym.name
       // Use of encoded to produce correct paths for names that have symbols
       val encodedName = symName.encode
       val nSize = encodedName.length - (if (symName.endsWith(nme.LOCAL_SUFFIX_STRING)) 1 else 0)
-      if (sym.isRoot || sym.isRootPackage || sym == NoSymbol || sym.owner.isEffectiveRoot) {
-        val capacity = size + nSize
-        b = new java.lang.StringBuffer(capacity)
-        b.append(chrs, encodedName.start, nSize)
-      } else {
-        val next = if (sym.owner.isPackageObjectClass) sym.owner else sym.effectiveOwner.enclClass
-        loop(size + nSize + 1, next)
-        // Addition to normal `fullName` to produce correct names for nested non-local classes
-        if (sym.isNestedClass) b.append(nme.MODULE_SUFFIX_STRING) else b.append(separator)
-        b.append(chrs, encodedName.start, nSize)
-      }
-      ()
+      val sb1 =
+        if (sym.isRoot || sym.isRootPackage || sym == NoSymbol || sym.owner.isEffectiveRoot) {
+          val capacity = size + nSize
+          new StringBuilder(capacity)
+        } else {
+          val next = if (sym.owner.isPackageObjectClass) sym.owner else sym.effectiveOwner.enclClass
+          // Addition to normal `fullName` to produce correct names for nested non-local classes
+          val sep = if (sym.isNestedClass) nme.MODULE_SUFFIX_STRING else separator
+          loop(sb, size + nSize + 1, next)
+            .append(sep)
+        }
+      encodedName.appendTo(sb1, 0, nSize)
     }
-    loop(suffix.length(), symbol)
-    b.append(suffix)
-    b.toString
+    loop(sb = null, suffix.length(), symbol)
+      .append(suffix)
+      .toString
   }
 
   private[this] var callback0: AnalysisCallback = null

src/sbt-bridge/scala/tools/xsbt/ClassName.scala

@@ -99,7 +99,7 @@ trait ClassName extends Compat {
 
   protected def isTopLevelModule(sym: Symbol): Boolean =
     enteringPhase(currentRun.picklerPhase.next) {
-      sym.isModuleClass && !sym.isImplClass && !sym.isNestedClass
+      sym.isModuleClass && !sym.isNestedClass
     }
 
   protected def flatclassName(s: Symbol, sep: Char, dollarRequired: Boolean): String =

src/sbt-bridge/scala/tools/xsbt/CompilerBridge.scala

@@ -18,13 +18,11 @@ package xsbt
 import xsbti.{AnalysisCallback, AnalysisCallback2, Logger, Problem, Reporter, VirtualFile}
 import xsbti.compile._
 
-import scala.tools.nsc.Settings
-import scala.collection.mutable
 import scala.reflect.io.AbstractFile
-import scala.tools.nsc.CompilerCommand
+import scala.tools.nsc.{CompilerCommand, Settings}
 import Log.debug
+
 import java.io.File
-import java.util.{Collections, Optional}
 
 /**
  * This is the entry point for the compiler bridge (implementation of CompilerInterface)
@@ -94,6 +92,7 @@ private final class CachedCompiler0(
     case single: SingleOutput =>
       val outputFilepath = single.getOutputDirectoryAsPath.toAbsolutePath
       settings.outputDirs.setSingleOutput(outputFilepath.toString)
+    case x => throw new MatchError(x)
   }
 
   val command = new CompilerCommand(args.toList, settings)
@@ -165,7 +164,7 @@ private final class CachedCompiler0(
       else callback.problem(p.category, p.position, p.message, p.severity, true)
 
     if (command.shouldStopWithInfo) {
-      underlyingReporter.info(null, command.getInfoMessage(compiler), true)
+      underlyingReporter.echo(command.getInfoMessage(compiler))
       throw new InterfaceCompileFailed(args, Array(), StopInfoError)
     }
 

src/sbt-bridge/scala/tools/xsbt/ConsoleBridge.scala

@@ -55,7 +55,6 @@ class ConsoleBridge extends xsbti.compile.ConsoleInterface1 {
               if (loader eq null) super.parentClassLoader
               else loader
           }
-          intp.setContextClassLoader()
         } else
           super.createInterpreter(interpreterSettings)
 
@@ -106,9 +105,5 @@ object MakeSettings {
     compilerSettings
   }
 
-  def sync(options: List[String], log: Logger): Settings = {
-    val settings = apply(options, log)
-    settings.Yreplsync.value = true
-    settings
-  }
+  def sync(options: List[String], log: Logger): Settings = apply(options, log)
 }

src/sbt-bridge/scala/tools/xsbt/DelegatingReporter.scala

@@ -19,9 +19,11 @@ import java.io.File
 import java.{ util => ju }
 import ju.Optional
 
+import scala.jdk.CollectionConverters._
 import scala.reflect.internal.util.{ CodeAction, FakePos, NoPosition, Position }
-import scala.collection.JavaConverters._
 import scala.reflect.io.AbstractFile
+import scala.tools.nsc.Settings
+import scala.tools.nsc.reporters.FilteringReporter
 import xsbti.{
   Action,
   DiagnosticCode => XDiagnosticCode,
@@ -42,8 +44,8 @@ import xsbti.{
  * Zinc in the Scala version Zinc uses.
  */
 private object DelegatingReporter {
-  def apply(settings: scala.tools.nsc.Settings, delegate: xsbti.Reporter): DelegatingReporter =
-    new DelegatingReporter(settings.fatalWarnings.value, settings.nowarn.value, delegate)
+  def apply(settings: Settings, delegate: xsbti.Reporter): DelegatingReporter =
+    new DelegatingReporter(settings, delegate)
 
   class PositionImpl(
       sourcePath0: Option[String],
@@ -194,12 +196,14 @@ private object DelegatingReporter {
 // Original author: Martin Odersky
 // Based on scala.tools.nsc.reporters.{AbstractReporter, ConsoleReporter}
 private final class DelegatingReporter(
-    warnFatal: Boolean,
-    noWarn: Boolean,
+    val settings: Settings,
     private[this] var delegate: xsbti.Reporter
-) extends scala.tools.nsc.reporters.Reporter {
+) extends FilteringReporter {
   import DelegatingReporter._
 
+  private val Werror: Boolean = settings.fatalWarnings.value
+  private val noWarn: Boolean = settings.nowarn.value
+
   def dropDelegate(): Unit = { delegate = ReporterSink }
   def error(msg: String): Unit = error(FakePos("scalac"), msg)
   def printSummary(): Unit = delegate.printSummary()
@@ -217,7 +221,7 @@ private final class DelegatingReporter(
   override def doReport(pos: Position, msg: String, rawSeverity: Severity, actions: List[CodeAction]): Unit = {
     val skip = rawSeverity == WARNING && noWarn
     if (!skip) {
-      val severity = if (warnFatal && rawSeverity == WARNING) ERROR else rawSeverity
+      val severity = if (Werror && rawSeverity == WARNING) ERROR else rawSeverity
       val pos1 = DelegatingReporter.convert(pos)
       delegate.log(new CompileProblem(
         pos = pos1,
@@ -231,8 +235,7 @@ private final class DelegatingReporter(
     }
   }
 
-  protected def info0(pos: Position, msg: String, rawSeverity: Severity, force: Boolean): Unit =
-    doReport(pos, msg, rawSeverity, Nil)
+  //protected def info0(pos: Position, msg: String, rawSeverity: Severity, force: Boolean): Unit = doReport(pos, msg, rawSeverity, Nil)
 
   import xsbti.Severity.{ Info, Warn, Error }
   private[this] def convert(sev: Severity): xsbti.Severity = sev match {

src/sbt-bridge/scala/tools/xsbt/Dependency.scala

@@ -86,7 +86,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
       }
     }
 
-    private val sourceFile: VirtualFile = unit.source.file match { case AbstractZincFile(vf) => vf }
+    private val sourceFile: VirtualFile = unit.source.file match { case AbstractZincFile(vf) => vf case x => throw new MatchError(x) }
     private val responsibleOfImports = firstClassOrModuleClass(unit.body)
     private var orphanImportsReported = false
 

src/sbt-bridge/scala/tools/xsbt/ExtractUsedNames.scala

@@ -20,8 +20,6 @@ import java.util.{ HashSet => JavaSet }
 import java.util.EnumSet
 
 import xsbti.UseScope
-// Left for compatibility
-import Compat._
 
 /**
  * Extracts simple names used in given compilation unit.

src/sbt-bridge/scala/tools/xsbt/GlobalHelpers.scala

@@ -113,7 +113,7 @@ trait GlobalHelpers { self: Compat =>
 
           case RefinedType(parents, decls) =>
             parents.foreach(traverse)
-            decls.toIterator.foreach { decl =>
+            decls.iterator.foreach { decl =>
               if (decl.isType) addTypeSymbolDependency(decl)
               else addDependency(decl)
             }

src/sbt-bridge/scala/tools/xsbt/InteractiveConsoleBridge.scala

@@ -99,9 +99,5 @@ object InteractiveMakeSettings {
     compilerSettings
   }
 
-  def sync(options: List[String], onError: String => Unit): Settings = {
-    val settings = apply(options, onError)
-    settings.Yreplsync.value = true
-    settings
-  }
+  def sync(options: List[String], onError: String => Unit): Settings = apply(options, onError)
 }

src/sbt-bridge/scala/tools/xsbt/InteractiveConsoleHelper.scala

@@ -15,6 +15,7 @@
 package scala.tools
 package xsbt
 
+import scala.language.implicitConversions
 import Compat._
 import xsbti.InteractiveConsoleResult
 

src/sbt-bridge/scala/tools/xsbt/ScaladocBridge.scala

@@ -63,8 +63,8 @@ private class Runner(
 
         // 2.8 source compatibility
         class DefaultDocDriver {
-          assert(false)
-          def process(units: Iterator[CompilationUnit]) = error("for 2.8 compatibility only")
+          assert(false, "2.8 compatibility")
+          def process(units: Iterator[CompilationUnit]) = globalError("for 2.8 compatibility only")
         }
       }
       def document(ignore: Seq[String]): Unit = {