Merge diagnostic package into parent package reporting

It was not clear go me that `diagnostic` should be its own package.

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -10,7 +10,7 @@ import NameKinds.{UniqueName, EvidenceParamName, DefaultGetterName}
 import typer.{FrontEnd, Namer}
 import util.{Property, SourceFile, SourcePosition}
 import collection.mutable.ListBuffer
-import reporting.diagnostic.messages._
+import reporting.messages._
 import reporting.trace
 import annotation.constructorOnly
 import printing.Formatting.hl

compiler/src/dotty/tools/dotc/core/Comments.scala

@@ -9,7 +9,7 @@ import util.Spans._
 import util.CommentParsing._
 import util.Property.Key
 import parsing.Parsers.Parser
-import reporting.diagnostic.messages.ProperDefinitionNotFound
+import reporting.messages.ProperDefinitionNotFound
 
 object Comments {
   val ContextDoc: Key[ContextDocstrings] = new Key[ContextDocstrings]

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -21,7 +21,6 @@ import Implicits.ContextualImplicits
 import config.Settings._
 import config.Config
 import reporting._
-import reporting.diagnostic.Message
 import io.{AbstractFile, NoAbstractFile, PlainFile, Path}
 import scala.io.Codec
 import collection.mutable

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -20,9 +20,8 @@ import util.Stats
 import java.util.WeakHashMap
 import scala.util.control.NonFatal
 import config.Config
-import reporting.diagnostic.Message
-import reporting.diagnostic.messages.BadSymbolicReference
-import reporting.trace
+import reporting.{Message, trace}
+import reporting.messages.BadSymbolicReference
 import collection.mutable
 import transform.TypeUtils._
 

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -23,7 +23,7 @@ import tpd.{Tree, TreeProvider, TreeOps}
 import ast.TreeTypeMap
 import Constants.Constant
 import Variances.{Variance, varianceFromInt}
-import reporting.diagnostic.Message
+import reporting.Message
 import collection.mutable
 import io.AbstractFile
 import language.implicitConversions

compiler/src/dotty/tools/dotc/core/TypeErrors.scala

@@ -10,8 +10,8 @@ import Contexts._
 import SymDenotations._
 import Denotations._
 import Decorators._
-import reporting.diagnostic.{Message, NoExplanation}
-import reporting.diagnostic.messages._
+import reporting.{Message, NoExplanation}
+import reporting.messages._
 import ast.untpd
 import config.Printers.cyclicErrors
 

compiler/src/dotty/tools/dotc/core/TypeOps.scala

@@ -12,8 +12,7 @@ import Decorators._
 import StdNames._
 import collection.mutable
 import ast.tpd._
-import reporting.trace
-import reporting.diagnostic.Message
+import reporting.{trace, Message}
 import config.Printers.{gadts, typr}
 import typer.Applications._
 import typer.ProtoTypes._

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -21,7 +21,6 @@ import CheckRealizable._
 import Variances.{Variance, varianceFromInt, varianceToInt, setStructuralVariances, Invariant}
 import util.Stats._
 import util.SimpleIdentitySet
-import reporting.diagnostic.Message
 import ast.tpd._
 import ast.TreeTypeMap
 import printing.Texts._
@@ -34,7 +33,7 @@ import annotation.{tailrec, constructorOnly}
 import language.implicitConversions
 import scala.util.hashing.{ MurmurHash3 => hashing }
 import config.Printers.{core, typr}
-import reporting.trace
+import reporting.{trace, Message}
 import java.lang.ref.WeakReference
 
 import scala.annotation.internal.sharable

compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

@@ -28,7 +28,7 @@ import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import scala.annotation.switch
 import reporting.trace
-import dotty.tools.dotc.reporting.diagnostic.messages.FailureToEliminateExistential
+import dotty.tools.dotc.reporting.messages.FailureToEliminateExistential
 
 object Scala2Unpickler {
 

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

@@ -17,7 +17,7 @@ import ast.{Trees, tpd}
 import core._, core.Decorators._
 import Contexts._, Names._, NameOps._, Symbols._, SymDenotations._, Trees._, Types._
 import classpath._
-import reporting._, reporting.diagnostic.Diagnostic
+import reporting._
 import util._
 
 /** A Driver subclass designed to be used from IDEs */

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

@@ -19,7 +19,7 @@ import Symbols._
 import ast.Trees._
 import Decorators._
 import StdNames._
-import dotty.tools.dotc.reporting.diagnostic.messages.IdentifierExpected
+import dotty.tools.dotc.reporting.messages.IdentifierExpected
 import dotty.tools.dotc.util.SourceFile
 import util.Spans._
 import scala.collection.mutable.ListBuffer

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -30,8 +30,8 @@ import rewrites.Rewrites.{patch, overlapsPatch}
 object Parsers {
 
   import ast.untpd._
-  import reporting.diagnostic.Message
-  import reporting.diagnostic.messages._
+  import reporting.Message
+  import reporting.messages._
 
   case class OpInfo(operand: Tree, operator: Ident, offset: Offset)
 

compiler/src/dotty/tools/dotc/printing/Formatting.scala

@@ -6,7 +6,7 @@ import Texts._, Types._, Flags._, Symbols._, Contexts._
 import collection.mutable
 import Decorators._
 import scala.util.control.NonFatal
-import reporting.diagnostic.Diagnostic
+import reporting.Diagnostic
 import util.DiffUtil
 import Highlighting._
 

compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala

@@ -4,8 +4,7 @@ package reporting
 
 import core.Contexts._
 import java.io.{ BufferedReader, PrintWriter }
-import diagnostic.Diagnostic
-import diagnostic.Diagnostic.{ Error, ConditionalWarning }
+import Diagnostic.{ Error, ConditionalWarning }
 
 /**
   * This class implements a Reporter that displays messages on a text console

compiler/src/dotty/tools/dotc/reporting/diagnostic/Diagnostic.scala renamed to compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala

@@ -1,7 +1,6 @@
 package dotty.tools
 package dotc
 package reporting
-package diagnostic
 
 import util.SourcePosition
 import core.Contexts.Context

compiler/src/dotty/tools/dotc/reporting/diagnostic/ErrorMessageID.scala renamed to compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala

@@ -1,4 +1,4 @@
-package dotty.tools.dotc.reporting.diagnostic
+package dotty.tools.dotc.reporting
 
 /** Unique IDs identifying the messages */
 enum ErrorMessageID extends java.lang.Enum[ErrorMessageID] {

compiler/src/dotty/tools/dotc/reporting/HideNonSensicalMessages.scala

@@ -3,7 +3,6 @@ package dotc
 package reporting
 
 import core.Contexts.Context
-import diagnostic.Diagnostic
 
 /**
  * This trait implements `isHidden` so that we avoid reporting non-sensical messages.

compiler/src/dotty/tools/dotc/reporting/diagnostic/Message.scala renamed to compiler/src/dotty/tools/dotc/reporting/Message.scala

@@ -1,7 +1,6 @@
 package dotty.tools
 package dotc
 package reporting
-package diagnostic
 
 import util.SourcePosition
 

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -8,7 +8,6 @@ import core.Contexts.Context
 import core.Decorators._
 import printing.Highlighting.{Blue, Red, Yellow}
 import printing.SyntaxHighlighting
-import diagnostic.{Diagnostic, Message, ErrorMessageID}
 import Diagnostic._
 import util.SourcePosition
 import scala.internal.Chars.{ LF, CR, FF, SU }

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

@@ -11,8 +11,7 @@ import core.Decorators.PhaseListDecorator
 import collection.mutable
 import core.Mode
 import dotty.tools.dotc.core.Symbols.{Symbol, NoSymbol}
-import diagnostic.Diagnostic._
-import diagnostic._
+import Diagnostic._
 import ast.{tpd, Trees}
 import Message._
 import core.Decorators._

compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala

@@ -5,7 +5,6 @@ package reporting
 import core.Contexts.Context
 import collection.mutable
 import config.Printers.typr
-import diagnostic.Diagnostic
 import Diagnostic._
 
 /** This class implements a Reporter that stores all messages

compiler/src/dotty/tools/dotc/reporting/ThrowingReporter.scala

@@ -3,8 +3,7 @@ package dotc
 package reporting
 
 import core.Contexts.Context
-import diagnostic.Diagnostic
-import diagnostic.Diagnostic.Error
+import Diagnostic.Error
 
 /**
  * This class implements a Reporter that throws all errors and sends warnings and other

compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala

@@ -5,7 +5,6 @@ package reporting
 import scala.collection.mutable
 import util.SourceFile
 import core.Contexts.Context
-import diagnostic.Diagnostic
 
 /** This trait implements `isHidden` so that multiple messages per position
   * are suppressed, unless they are of increasing severity. */

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala renamed to compiler/src/dotty/tools/dotc/reporting/messages.scala

@@ -1,7 +1,6 @@
 package dotty.tools
 package dotc
 package reporting
-package diagnostic
 
 import core._
 import Contexts.Context

compiler/src/dotty/tools/dotc/transform/CheckStatic.scala

@@ -8,7 +8,7 @@ import Contexts.Context
 import Symbols._
 import dotty.tools.dotc.ast.tpd
 import Decorators._
-import reporting.diagnostic.messages._
+import reporting.messages._
 
 /** A transformer that check that requirements of Static fields\methods are implemented:
   *  1. Only objects can have members annotated with `@static`

compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala

@@ -7,7 +7,7 @@ import MegaPhase._
 import Types._, Contexts._, Flags._, DenotTransformers._
 import Symbols._, StdNames._, Trees._
 import TypeErasure.ErasedValueType, ValueClasses._
-import reporting.diagnostic.messages.DoubleDefinition
+import reporting.messages.DoubleDefinition
 import NameKinds.SuperAccessorName
 
 object ElimErasedValueType {

compiler/src/dotty/tools/dotc/transform/Erasure.scala

@@ -531,7 +531,7 @@ object Erasure {
       if (sym is Flags.Package)
          || (sym.isAllOf(Flags.JavaModule) && !ctx.compilationUnit.isJava)
       then
-        ctx.error(reporting.diagnostic.messages.JavaSymbolIsNotAValue(sym), tree.sourcePos)
+        ctx.error(reporting.messages.JavaSymbolIsNotAValue(sym), tree.sourcePos)
 
     private def checkNotErased(tree: Tree)(implicit ctx: Context): tree.type = {
       if (!ctx.mode.is(Mode.Type)) {

compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala

@@ -6,7 +6,7 @@ import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Consta
 import MegaPhase._
 import SymUtils._
 import ast.Trees._
-import dotty.tools.dotc.reporting.diagnostic.messages.TypeMismatch
+import dotty.tools.dotc.reporting.messages.TypeMismatch
 import dotty.tools.dotc.util.Spans.Span
 
 /** Expand SAM closures that cannot be represented by the JVM as lambdas to anonymous classes.

compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala

@@ -14,7 +14,7 @@ import Flags._, Constants._
 import Decorators._
 import NameKinds.{PatMatStdBinderName, PatMatAltsName, PatMatResultName}
 import config.Printers.patmatch
-import reporting.diagnostic.messages._
+import reporting.messages._
 import dotty.tools.dotc.ast._
 import util.Property._
 

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -13,7 +13,7 @@ import Decorators._
 import Symbols._, SymUtils._
 import ContextFunctionResults.annotateContextResults
 import config.Printers.typr
-import reporting.diagnostic.messages._
+import reporting.messages._
 
 object PostTyper {
   val name: String = "posttyper"
@@ -244,10 +244,10 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
                   else dropInlines.transform(arg)))
             else
               tree
-          def app1 = 
+          def app1 =
    		    	// reverse order of transforming args and fun. This way, we get a chance to see other
    			    // well-formedness errors before reporting errors in possible inferred type args of fun.
-            val args1 = transform(app.args) 
+            val args1 = transform(app.args)
             cpy.Apply(app)(transform(app.fun), args1)
           methPart(app) match
             case Select(nu: New, nme.CONSTRUCTOR) if isCheckable(nu) =>
@@ -258,7 +258,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
             case _ =>
               app1
         case UnApply(fun, implicits, patterns) =>
-          // Reverse transform order for the same reason as in `app1` above. 
+          // Reverse transform order for the same reason as in `app1` above.
           val patterns1 = transform(patterns)
           cpy.UnApply(tree)(transform(fun), transform(implicits), patterns1)
         case tree: TypeApply =>

compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala

@@ -12,7 +12,7 @@ import DenotTransformers._
 import NameOps._
 import NameKinds._
 import ResolveSuper._
-import reporting.diagnostic.messages.IllegalSuperAccessor
+import reporting.messages.IllegalSuperAccessor
 
 /** This phase implements super accessors in classes that need them.
  *

compiler/src/dotty/tools/dotc/transform/TailRec.scala

@@ -11,7 +11,7 @@ import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.NameKinds.{TailLabelName, TailLocalName, TailTempName}
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols._
-import dotty.tools.dotc.reporting.diagnostic.messages.TailrecNotApplicable
+import dotty.tools.dotc.reporting.messages.TailrecNotApplicable
 import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 
 import scala.collection.mutable

compiler/src/dotty/tools/dotc/transform/TreeChecker.scala

@@ -16,7 +16,7 @@ import core.Mode
 import typer._
 import typer.ErrorReporting._
 import reporting.ThrowingReporter
-import reporting.diagnostic.messages.TypeMismatch
+import reporting.messages.TypeMismatch
 import ast.Trees._
 import ast.{tpd, untpd}
 import scala.internal.Chars._

compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala

@@ -11,7 +11,7 @@ import ValueClasses._
 import SymUtils._
 import core.Flags._
 import util.Spans._
-import reporting.diagnostic.messages.TypeTestAlwaysSucceeds
+import reporting.messages.TypeTestAlwaysSucceeds
 import reporting.trace
 import config.Printers.{ transforms => debug }
 

compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

@@ -18,7 +18,7 @@ import Applications._
 import Inferencing._
 import ProtoTypes._
 import transform.SymUtils._
-import reporting.diagnostic.messages._
+import reporting.messages._
 import reporting.trace
 import config.Printers.{exhaustivity => debug}
 import util.SourcePosition

compiler/src/dotty/tools/dotc/typer/Applications.scala

@@ -28,11 +28,10 @@ import collection.mutable
 import config.Printers.{overload, typr, unapp}
 import TypeApplications._
 
-import reporting.diagnostic.Message
-import reporting.diagnostic.messages.{UnexpectedPatternForSummonFrom, NotAMember, MissingIdent, TypeMismatch}
-import reporting.trace
+import reporting.messages.{UnexpectedPatternForSummonFrom, NotAMember, MissingIdent, TypeMismatch}
+import reporting.{trace, Message}
 import Constants.{Constant, IntTag, LongTag}
-import dotty.tools.dotc.reporting.diagnostic.messages.{UnapplyInvalidReturnType, NotAnExtractor, UnapplyInvalidNumberOfArguments}
+import dotty.tools.dotc.reporting.messages.{UnapplyInvalidReturnType, NotAnExtractor, UnapplyInvalidNumberOfArguments}
 import Denotations.SingleDenotation
 import annotation.{constructorOnly, threadUnsafe}
 

compiler/src/dotty/tools/dotc/typer/Checking.scala

@@ -35,8 +35,8 @@ import transform.patmat.SpaceEngine.isIrrefutableUnapply
 
 
 import collection.mutable
-import reporting.diagnostic.Message
-import reporting.diagnostic.messages._
+import reporting.Message
+import reporting.messages._
 import scala.internal.Chars.isOperatorPart
 
 object Checking {

compiler/src/dotty/tools/dotc/typer/Dynamic.scala

@@ -15,7 +15,7 @@ import util.Spans._
 import core.Symbols._
 import core.Definitions
 import ErrorReporting._
-import dotty.tools.dotc.reporting.diagnostic.messages.ReassignmentToVal
+import dotty.tools.dotc.reporting.messages.ReassignmentToVal
 
 object Dynamic {
   def isDynamicMethod(name: Name): Boolean =

compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala

@@ -9,8 +9,8 @@ import Implicits._, Flags._
 import util.Spans._
 import util.SourcePosition
 import java.util.regex.Matcher.quoteReplacement
-import reporting.diagnostic.Message
-import reporting.diagnostic.messages._
+import reporting.Message
+import reporting.messages._
 
 object ErrorReporting {
 

compiler/src/dotty/tools/dotc/typer/Implicits.scala

@@ -24,7 +24,7 @@ import StdNames._
 import Constants._
 import ProtoTypes._
 import ErrorReporting._
-import reporting.diagnostic.Message
+import reporting.Message
 import Inferencing.{fullyDefinedType, isFullyDefined}
 import Trees._
 import transform.SymUtils._