Skip to content

Commit a59a2f5

Browse files
oderskyodersky
committed
Simplify context handling
 - Use only wildcard imports from Contexts - Use `(using Context)` throughout
1 parent 68ed6bf commit a59a2f5

File tree

110 files changed

+554
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+554
-553
lines changed

‎compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import dotty.tools.dotc.core.Symbols._
1919
import dotty.tools.dotc.transform.Erasure
2020
import dotty.tools.dotc.transform.SymUtils._
2121
import dotty.tools.dotc.util.Spans._
22-
import dotty.tools.dotc.core.Contexts.{inContext, atPhase}
22+
import dotty.tools.dotc.core.Contexts._
2323
import dotty.tools.dotc.core.Phases._
2424
import dotty.tools.dotc.report
2525

‎compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import dotty.tools.dotc.ast.tpd
1313
import dotty.tools.dotc.ast.Trees
1414
import dotty.tools.dotc.core.Annotations._
1515
import dotty.tools.dotc.core.Constants._
16-
import dotty.tools.dotc.core.Contexts.{Context, atPhase}
16+
import dotty.tools.dotc.core.Contexts._
1717
import dotty.tools.dotc.core.Phases._
1818
import dotty.tools.dotc.core.Decorators._
1919
import dotty.tools.dotc.core.Flags._
@@ -927,7 +927,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
927927
throw new RuntimeException(msg)
928928
}
929929

930-
private def compilingArray(using ctx: Context) =
930+
private def compilingArray(using Context) =
931931
ctx.compilationUnit.source.file.name == "Array.scala"
932932
}
933933

‎compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.collection.mutable
88
import scala.collection.generic.Clearable
99

1010
import dotty.tools.dotc.core.Flags._
11-
import dotty.tools.dotc.core.Contexts.{inContext, atPhase}
11+
import dotty.tools.dotc.core.Contexts._
1212
import dotty.tools.dotc.core.Phases._
1313
import dotty.tools.dotc.core.Symbols._
1414
import dotty.tools.dotc.core.Phases.Phase

‎compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.backend.jvm
22

33
import dotty.tools.dotc.ast.tpd
4-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
4+
import dotty.tools.dotc.core.Contexts._
55
import dotty.tools.dotc.core.Phases._
66
import dotty.tools.dotc.core.Symbols._
77
import dotty.tools.dotc.core.Flags.Trait

‎compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ object DottyBackendInterface {
193193
* True if the current compilation unit is of a primitive class (scala.Boolean et al).
194194
* Used only in assertions.
195195
*/
196-
def isCompilingPrimitive(using ctx: Context) = {
196+
def isCompilingPrimitive(using Context) = {
197197
primitiveCompilationUnits(ctx.compilationUnit.source.file.name)
198198
}
199199

‎compiler/src/dotty/tools/backend/jvm/GenBCode.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object GenBCode {
7575
val name: String = "genBCode"
7676
}
7777

78-
class GenBCodePipeline(val int: DottyBackendInterface)(using ctx: Context) extends BCodeSyncAndTry {
78+
class GenBCodePipeline(val int: DottyBackendInterface)(using Context) extends BCodeSyncAndTry {
7979
import DottyBackendInterface.symExtensions
8080

8181
private var tree: Tree = _

‎compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package backend.jvm
44
import dotc.ast.Trees.Select
55
import dotc.ast.tpd._
66
import dotc.core._
7-
import Contexts.{Context, ctx}
7+
import Contexts._
88
import Names.TermName, StdNames._
99
import Types.{JavaArrayType, UnspecifiedErrorType, Type}
1010
import Symbols.{Symbol, NoSymbol}

‎compiler/src/dotty/tools/dotc/Bench.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools
22
package dotc
33

4-
import core.Contexts.{Context, ctx}
4+
import core.Contexts._
55
import reporting.Reporter
66

77
import scala.annotation.internal.sharable

‎compiler/src/dotty/tools/dotc/CompilationUnit.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33

44
import core._
5-
import Contexts.{Context, ctx}
5+
import Contexts._
66
import SymDenotations.ClassDenotation
77
import Symbols._
88
import util.{FreshNameCreator, SourceFile, NoSource}

‎compiler/src/dotty/tools/dotc/Driver.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.file.{Files, Paths}
55
import dotty.tools.FatalError
66
import config.CompilerCommand
77
import core.Comments.{ContextDoc, ContextDocstrings}
8-
import core.Contexts.{Context, ContextBase, inContext, ctx}
8+
import core.Contexts._
99
import core.{MacroClassLoader, Mode, TypeError}
1010
import core.StdNames.nme
1111
import dotty.tools.dotc.ast.Positioned

‎compiler/src/dotty/tools/dotc/Resident.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools
22
package dotc
33

4-
import core.Contexts.{Context, ctx, inContext}
4+
import core.Contexts._
55
import reporting.Reporter
66
import java.io.EOFException
77
import scala.annotation.tailrec

‎compiler/src/dotty/tools/dotc/ast/NavigateAST.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.dotc
22
package ast
33

4-
import core.Contexts.{Context, ctx}
4+
import core.Contexts._
55
import core.Decorators._
66
import util.Spans._
77
import Trees.{MemberDef, DefTree, WithLazyField}

‎compiler/src/dotty/tools/dotc/ast/Positioned.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package ast
44

55
import util.Spans._
66
import util.{SourceFile, NoSource, SourcePosition}
7-
import core.Contexts.{Context, ctx}
7+
import core.Contexts._
88
import core.Decorators._
99
import core.Flags.{JavaDefined, Extension}
1010
import core.StdNames.nme

‎compiler/src/dotty/tools/dotc/classpath/ClassPathFactory.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package dotty.tools.dotc.classpath
66
import dotty.tools.io.{AbstractFile, VirtualDirectory}
77
import FileUtils.AbstractFileOps
88
import dotty.tools.io.ClassPath
9-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
9+
import dotty.tools.dotc.core.Contexts._
1010

1111
/**
1212
* Provides factory methods for classpath. When creating classpath instances for a given path,

‎compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.nio.file.attribute.{BasicFileAttributes, FileTime}
1010

1111
import scala.annotation.tailrec
1212
import dotty.tools.io.{AbstractFile, ClassPath, ClassRepresentation, FileZipArchive, ManifestResources}
13-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
13+
import dotty.tools.dotc.core.Contexts._
1414
import FileUtils._
1515

1616
/**

‎compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.dotc
22
package config
33

4-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
4+
import dotty.tools.dotc.core.Contexts._
55
import dotty.tools.io.{ Directory, PlainDirectory, AbstractFile }
66
import PathResolver.Defaults
77
import rewrites.Rewrites

‎compiler/src/dotty/tools/dotc/config/SourceVersion.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33
package config
44

5-
import core.Contexts.{Context, ctx}
5+
import core.Contexts._
66
import core.Names.TermName
77
import core.StdNames.nme
88
import core.Decorators.{given _}

‎compiler/src/dotty/tools/dotc/core/GadtConstraint.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ final class ProperGadtConstraint private(
217217

218218
// ---- Protected/internal -----------------------------------------------
219219

220-
override def comparerCtx(using ctx: Context): Context = ctx
220+
override def comparerCtx(using Context): Context = ctx
221221

222222
override protected def constraint = myConstraint
223223
override protected def constraint_=(c: Constraint) = myConstraint = c

‎compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dotty.tools.dotc.core
22

3-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
3+
import dotty.tools.dotc.core.Contexts._
44
import dotty.tools.dotc.core.Flags.JavaDefined
55
import dotty.tools.dotc.core.StdNames.{jnme, nme}
66
import dotty.tools.dotc.core.Symbols._

‎compiler/src/dotty/tools/dotc/core/NameKinds.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Names._
66
import NameOps._
77
import StdNames._
88
import NameTags._
9-
import Contexts.{Context, ctx}
9+
import Contexts._
1010
import collection.mutable
1111

1212
import scala.annotation.internal.sharable

‎compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dotty.tools.dotc.core
22

3-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
3+
import dotty.tools.dotc.core.Contexts._
44
import dotty.tools.dotc.core.Symbols.defn
55
import dotty.tools.dotc.core.Types._
66

‎compiler/src/dotty/tools/dotc/core/ParamInfo.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.dotc.core
22

33
import Names.Name
4-
import Contexts.{Context, ctx}
4+
import Contexts._
55
import Types.Type
66
import Variances.{Variance, varianceToInt}
77

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ object SymDenotations {
300300
* Makes use of `rawParamss` when present, or constructs fresh parameter symbols otherwise.
301301
* This method can be allocation-heavy.
302302
*/
303-
final def paramSymss(using ctx: Context): List[List[Symbol]] =
303+
final def paramSymss(using Context): List[List[Symbol]] =
304304

305305
def recurWithParamss(info: Type, paramss: List[List[Symbol]]): List[List[Symbol]] =
306306
info match
@@ -1446,7 +1446,7 @@ object SymDenotations {
14461446
privateWithin: Symbol = null,
14471447
annotations: List[Annotation] = null,
14481448
rawParamss: List[List[Symbol]] = null)(
1449-
using ctx: Context): SymDenotation = {
1449+
using Context): SymDenotation = {
14501450
// simulate default parameters, while also passing implicit context ctx to the default values
14511451
val initFlags1 = (if (initFlags != UndefinedFlags) initFlags else this.flags)
14521452
val info1 = if (info != null) info else this.info

‎compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc.core.tasty
22

33
import dotty.tools.dotc.ast.tpd
44
import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings}
5-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
5+
import dotty.tools.dotc.core.Contexts._
66

77
import dotty.tools.tasty.TastyBuffer
88
import TastyBuffer.{Addr, NoAddr}

‎compiler/src/dotty/tools/dotc/fromtasty/TastyFileUtil.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package fromtasty
44
import java.nio.file.{Files, Path, Paths}
55
import java.io
66

7-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
7+
import dotty.tools.dotc.core.Contexts._
88
import dotty.tools.dotc.core.NameKinds
99
import dotty.tools.dotc.core.Names.SimpleName
1010
import dotty.tools.dotc.core.StdNames.nme

‎compiler/src/dotty/tools/dotc/interactive/Completion.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.charset.Charset
55
import dotty.tools.dotc.ast.Trees._
66
import dotty.tools.dotc.ast.untpd
77
import dotty.tools.dotc.config.Printers.interactiv
8-
import dotty.tools.dotc.core.Contexts.{Context, NoContext, ctx}
8+
import dotty.tools.dotc.core.Contexts._
99
import dotty.tools.dotc.core.CheckRealizable
1010
import dotty.tools.dotc.core.Decorators.StringInterpolators
1111
import dotty.tools.dotc.core.Denotations.SingleDenotation

‎compiler/src/dotty/tools/dotc/printing/Highlighting.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotc
33
package printing
44

55
import scala.collection.mutable
6-
import core.Contexts.{Context, ctx}
6+
import core.Contexts._
77

88
object Highlighting {
99

‎compiler/src/dotty/tools/dotc/printing/MessageLimiter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotc
33
package printing
44

55
import core._
6-
import Contexts.{Context, ctx}
6+
import Contexts._
77
import util.Property
88
import Texts.Text
99

‎compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Names._
99
import Symbols._
1010
import NameOps._
1111
import TypeErasure.ErasedValueType
12-
import Contexts.{Context, ctx}
12+
import Contexts._
1313
import Annotations.Annotation
1414
import Denotations._
1515
import SymDenotations._

‎compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc
22
package printing
33

44
import dotty.tools.dotc.ast.untpd
5-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
5+
import dotty.tools.dotc.core.Contexts._
66
import dotty.tools.dotc.core.StdNames._
77
import dotty.tools.dotc.parsing.Parsers.Parser
88
import dotty.tools.dotc.parsing.Scanners.Scanner

‎compiler/src/dotty/tools/dotc/profile/AsyncHelper.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.util.concurrent._
55
import java.util.concurrent.atomic.AtomicInteger
66

77
import dotty.tools.dotc.core.Phases.Phase
8-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
8+
import dotty.tools.dotc.core.Contexts._
99

1010
sealed trait AsyncHelper {
1111

‎compiler/src/dotty/tools/dotc/profile/Profiler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import javax.management.openmbean.CompositeData
88
import javax.management.{Notification, NotificationEmitter, NotificationListener}
99

1010
import dotty.tools.dotc.core.Phases.Phase
11-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
11+
import dotty.tools.dotc.core.Contexts._
1212
import dotty.tools.io.AbstractFile
1313

1414
object Profiler {

‎compiler/src/dotty/tools/dotc/quoted/QuoteContext.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dotty.tools.dotc.quoted
22

3-
import dotty.tools.dotc.core.Contexts.{Context, ctx}
3+
import dotty.tools.dotc.core.Contexts._
44
import dotty.tools.dotc.tastyreflect.ReflectionImpl
55

66
object QuoteContext {

‎compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotc
33
package reporting
44

55
import util.SourcePosition
6-
import core.Contexts.{Context, ctx}
6+
import core.Contexts._
77
import config.Settings.Setting
88
import interfaces.Diagnostic.{ERROR, INFO, WARNING}
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33
package reporting
44

5-
import core.Contexts.{Context, ctx}
5+
import core.Contexts._
66

77
/**
88
* This trait implements `isHidden` so that we avoid reporting non-sensical messages.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package reporting
44

55
import java.lang.System.{lineSeparator => EOL}
66

7-
import core.Contexts.{Context, ctx}
7+
import core.Contexts._
88
import core.Decorators._
99
import printing.Highlighting.{Blue, Red, Yellow}
1010
import printing.SyntaxHighlighting

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33
package reporting
44

5-
import core.Contexts.{Context, ctx}
5+
import core.Contexts._
66
import collection.mutable
77
import config.Printers.typr
88
import Diagnostic._

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools
22
package dotc
33
package reporting
44

5-
import core.Contexts.{Context, ctx}
5+
import core.Contexts._
66
import Diagnostic.Error
77

88
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package reporting
44

55
import scala.collection.mutable
66
import util.SourceFile
7-
import core.Contexts.{Context, ctx}
7+
import core.Contexts._
88

99
/** This trait implements `isHidden` so that multiple messages per position
1010
* are suppressed, unless they are of increasing severity. */

0 commit comments

Comments
 (0)