Skip to content

Commit d1f2a11

Browse files
oderskyodersky
committed
Remove implicit definitions of ctx that are not parameters (2)
1 parent 9d52399 commit d1f2a11

File tree

8 files changed

+40
-2005
lines changed

8 files changed

+40
-2005
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ object Interactive {
333333
* @return The definitions for the symbol at the end of `path`.
334334
*/
335335
def findDefinitions(path: List[Tree], pos: SourcePosition, driver: InteractiveDriver): List[SourceTree] = {
336-
implicit val ctx = driver.currentCtx
336+
given Context = driver.currentCtx
337337
val enclTree = enclosingTree(path)
338338
val includeOverridden = enclTree.isInstanceOf[MemberDef]
339339
val symbols = enclosingSourceSymbols(path, pos)
@@ -355,7 +355,7 @@ object Interactive {
355355
driver: InteractiveDriver,
356356
includeOverridden: Boolean,
357357
includeExternal: Boolean): List[SourceTree] = {
358-
implicit val ctx = driver.currentCtx
358+
given Context = driver.currentCtx
359359
val include = Include.definitions | Include.overriding |
360360
(if (includeOverridden) Include.overridden else Include.empty)
361361
symbols.flatMap { sym =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
149149
val run = compiler.newRun(myInitCtx.fresh.setReporter(reporter))
150150
myCtx = run.runContext
151151

152-
implicit val ctx = myCtx
152+
given Context = myCtx
153153

154154
myOpenedFiles(uri) = source
155155

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object SyntaxHighlighting {
3535
else {
3636
val source = SourceFile.virtual("<highlighting>", in)
3737

38-
implicit val ctx = freshCtx.setCompilationUnit(CompilationUnit(source, mustExist = false)(freshCtx))
38+
given Context = freshCtx.setCompilationUnit(CompilationUnit(source, mustExist = false)(freshCtx))
3939

4040
val colorAt = Array.fill(in.length)(NoColor)
4141

‎compiler/src/dotty/tools/dotc/transform/MegaPhase.scala

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
221221

222222
def transformNamed(tree: Tree, start: Int, outerCtx: Context): Tree = tree match {
223223
case tree: Ident =>
224-
implicit val ctx = prepIdent(tree, start)(outerCtx)
224+
given Context = prepIdent(tree, start)(outerCtx)
225225
goIdent(tree, start)
226226
case tree: Select =>
227-
implicit val ctx = prepSelect(tree, start)(outerCtx)
227+
given Context = prepSelect(tree, start)(outerCtx)
228228
val qual = transformTree(tree.qualifier, start)
229229
goSelect(cpy.Select(tree)(qual, tree.name), start)
230230
case tree: ValDef =>
231-
implicit val ctx = prepValDef(tree, start)(outerCtx)
231+
given Context = prepValDef(tree, start)(outerCtx)
232232
def mapValDef(implicit ctx: Context) = {
233233
val tpt = transformTree(tree.tpt, start)
234234
val rhs = transformTree(tree.rhs, start)
@@ -237,7 +237,7 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
237237
if (tree.isEmpty) tree
238238
else goValDef(mapValDef(if (tree.symbol.exists) localContext else ctx), start)
239239
case tree: DefDef =>
240-
implicit val ctx = prepDefDef(tree, start)(outerCtx)
240+
given Context = prepDefDef(tree, start)(outerCtx)
241241
def mapDefDef(implicit ctx: Context) = {
242242
val tparams = transformSpecificTrees(tree.tparams, start)
243243
val vparamss = tree.vparamss.mapConserve(transformSpecificTrees(_, start))
@@ -247,144 +247,144 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase {
247247
}
248248
goDefDef(mapDefDef(localContext), start)
249249
case tree: TypeDef =>
250-
implicit val ctx = prepTypeDef(tree, start)(outerCtx)
250+
given Context = prepTypeDef(tree, start)(outerCtx)
251251
val rhs = transformTree(tree.rhs, start)(localContext)
252252
goTypeDef(cpy.TypeDef(tree)(tree.name, rhs), start)
253253
case tree: Labeled =>
254-
implicit val ctx = prepLabeled(tree, start)(outerCtx)
254+
given Context = prepLabeled(tree, start)(outerCtx)
255255
val bind = transformTree(tree.bind, start).asInstanceOf[Bind]
256256
val expr = transformTree(tree.expr, start)
257257
goLabeled(cpy.Labeled(tree)(bind, expr), start)
258258
case tree: Bind =>
259-
implicit val ctx = prepBind(tree, start)(outerCtx)
259+
given Context = prepBind(tree, start)(outerCtx)
260260
val body = transformTree(tree.body, start)
261261
goBind(cpy.Bind(tree)(tree.name, body), start)
262262
case _ =>
263-
implicit val ctx = prepOther(tree, start)(outerCtx)
263+
given Context = prepOther(tree, start)(outerCtx)
264264
goOther(tree, start)
265265
}
266266

267267
def transformUnnamed(tree: Tree, start: Int, outerCtx: Context): Tree = tree match {
268268
case tree: Apply =>
269-
implicit val ctx = prepApply(tree, start)(outerCtx)
269+
given Context = prepApply(tree, start)(outerCtx)
270270
val fun = transformTree(tree.fun, start)
271271
val args = transformTrees(tree.args, start)
272272
goApply(cpy.Apply(tree)(fun, args), start)
273273
case tree: TypeTree =>
274-
implicit val ctx = prepTypeTree(tree, start)(outerCtx)
274+
given Context = prepTypeTree(tree, start)(outerCtx)
275275
goTypeTree(tree, start)
276276
case tree: Thicket =>
277277
cpy.Thicket(tree)(transformTrees(tree.trees, start))
278278
case tree: This =>
279-
implicit val ctx = prepThis(tree, start)(outerCtx)
279+
given Context = prepThis(tree, start)(outerCtx)
280280
goThis(tree, start)
281281
case tree: Literal =>
282-
implicit val ctx = prepLiteral(tree, start)(outerCtx)
282+
given Context = prepLiteral(tree, start)(outerCtx)
283283
goLiteral(tree, start)
284284
case tree: Block =>
285-
implicit val ctx = prepBlock(tree, start)(outerCtx)
285+
given Context = prepBlock(tree, start)(outerCtx)
286286
val stats = transformStats(tree.stats, ctx.owner, start)
287287
val expr = transformTree(tree.expr, start)
288288
goBlock(cpy.Block(tree)(stats, expr), start)
289289
case tree: TypeApply =>
290-
implicit val ctx = prepTypeApply(tree, start)(outerCtx)
290+
given Context = prepTypeApply(tree, start)(outerCtx)
291291
val fun = transformTree(tree.fun, start)
292292
val args = transformTrees(tree.args, start)
293293
goTypeApply(cpy.TypeApply(tree)(fun, args), start)
294294
case tree: If =>
295-
implicit val ctx = prepIf(tree, start)(outerCtx)
295+
given Context = prepIf(tree, start)(outerCtx)
296296
val cond = transformTree(tree.cond, start)
297297
val thenp = transformTree(tree.thenp, start)
298298
val elsep = transformTree(tree.elsep, start)
299299
goIf(cpy.If(tree)(cond, thenp, elsep), start)
300300
case tree: New =>
301-
implicit val ctx = prepNew(tree, start)(outerCtx)
301+
given Context = prepNew(tree, start)(outerCtx)
302302
val tpt = transformTree(tree.tpt, start)
303303
goNew(cpy.New(tree)(tpt), start)
304304
case tree: Typed =>
305-
implicit val ctx = prepTyped(tree, start)(outerCtx)
305+
given Context = prepTyped(tree, start)(outerCtx)
306306
val expr = transformTree(tree.expr, start)
307307
val tpt = transformTree(tree.tpt, start)
308308
goTyped(cpy.Typed(tree)(expr, tpt), start)
309309
case tree: CaseDef =>
310-
implicit val ctx = prepCaseDef(tree, start)(outerCtx)
310+
given Context = prepCaseDef(tree, start)(outerCtx)
311311
val pat = transformTree(tree.pat, start)(ctx.addMode(Mode.Pattern))
312312
val guard = transformTree(tree.guard, start)
313313
val body = transformTree(tree.body, start)
314314
goCaseDef(cpy.CaseDef(tree)(pat, guard, body), start)
315315
case tree: Closure =>
316-
implicit val ctx = prepClosure(tree, start)(outerCtx)
316+
given Context = prepClosure(tree, start)(outerCtx)
317317
val env = transformTrees(tree.env, start)
318318
val meth = transformTree(tree.meth, start)
319319
val tpt = transformTree(tree.tpt, start)
320320
goClosure(cpy.Closure(tree)(env, meth, tpt), start)
321321
case tree: Assign =>
322-
implicit val ctx = prepAssign(tree, start)(outerCtx)
322+
given Context = prepAssign(tree, start)(outerCtx)
323323
val lhs = transformTree(tree.lhs, start)
324324
val rhs = transformTree(tree.rhs, start)
325325
goAssign(cpy.Assign(tree)(lhs, rhs), start)
326326
case tree: SeqLiteral =>
327-
implicit val ctx = prepSeqLiteral(tree, start)(outerCtx)
327+
given Context = prepSeqLiteral(tree, start)(outerCtx)
328328
val elems = transformTrees(tree.elems, start)
329329
val elemtpt = transformTree(tree.elemtpt, start)
330330
goSeqLiteral(cpy.SeqLiteral(tree)(elems, elemtpt), start)
331331
case tree: Super =>
332-
implicit val ctx = prepSuper(tree, start)(outerCtx)
332+
given Context = prepSuper(tree, start)(outerCtx)
333333
goSuper(tree, start)
334334
case tree: Template =>
335-
implicit val ctx = prepTemplate(tree, start)(outerCtx)
335+
given Context = prepTemplate(tree, start)(outerCtx)
336336
val constr = transformSpecificTree(tree.constr, start)
337337
val parents = transformTrees(tree.parents, start)(ctx.superCallContext)
338338
val self = transformSpecificTree(tree.self, start)
339339
val body = transformStats(tree.body, tree.symbol, start)
340340
goTemplate(cpy.Template(tree)(constr, parents, Nil, self, body), start)
341341
case tree: Match =>
342-
implicit val ctx = prepMatch(tree, start)(outerCtx)
342+
given Context = prepMatch(tree, start)(outerCtx)
343343
val selector = transformTree(tree.selector, start)
344344
val cases = transformSpecificTrees(tree.cases, start)
345345
goMatch(cpy.Match(tree)(selector, cases), start)
346346
case tree: UnApply =>
347-
implicit val ctx = prepUnApply(tree, start)(outerCtx)
347+
given Context = prepUnApply(tree, start)(outerCtx)
348348
val fun = transformTree(tree.fun, start)
349349
val implicits = transformTrees(tree.implicits, start)
350350
val patterns = transformTrees(tree.patterns, start)
351351
goUnApply(cpy.UnApply(tree)(fun, implicits, patterns), start)
352352
case tree: PackageDef =>
353-
implicit val ctx = prepPackageDef(tree, start)(outerCtx)
353+
given Context = prepPackageDef(tree, start)(outerCtx)
354354
def mapPackage(implicit ctx: Context) = {
355355
val pid = transformSpecificTree(tree.pid, start)
356356
val stats = transformStats(tree.stats, tree.symbol, start)
357357
cpy.PackageDef(tree)(pid, stats)
358358
}
359359
goPackageDef(mapPackage(localContext), start)
360360
case tree: Try =>
361-
implicit val ctx = prepTry(tree, start)(outerCtx)
361+
given Context = prepTry(tree, start)(outerCtx)
362362
val expr = transformTree(tree.expr, start)
363363
val cases = transformSpecificTrees(tree.cases, start)
364364
val finalizer = transformTree(tree.finalizer, start)
365365
goTry(cpy.Try(tree)(expr, cases, finalizer), start)
366366
case tree: Inlined =>
367-
implicit val ctx = prepInlined(tree, start)(outerCtx)
367+
given Context = prepInlined(tree, start)(outerCtx)
368368
val bindings = transformSpecificTrees(tree.bindings, start)
369369
val expansion = transformTree(tree.expansion, start)(inlineContext(tree.call))
370370
goInlined(cpy.Inlined(tree)(tree.call, bindings, expansion), start)
371371
case tree: Return =>
372-
implicit val ctx = prepReturn(tree, start)(outerCtx)
372+
given Context = prepReturn(tree, start)(outerCtx)
373373
val expr = transformTree(tree.expr, start)
374374
goReturn(cpy.Return(tree)(expr, tree.from), start)
375375
// don't transform `tree.from`, as this is not a normal ident, but
376376
// a pointer to the enclosing method.
377377
case tree: WhileDo =>
378-
implicit val ctx = prepWhileDo(tree, start)(outerCtx)
378+
given Context = prepWhileDo(tree, start)(outerCtx)
379379
val cond = transformTree(tree.cond, start)
380380
val body = transformTree(tree.body, start)
381381
goWhileDo(cpy.WhileDo(tree)(cond, body), start)
382382
case tree: Alternative =>
383-
implicit val ctx = prepAlternative(tree, start)(outerCtx)
383+
given Context = prepAlternative(tree, start)(outerCtx)
384384
val trees = transformTrees(tree.trees, start)
385385
goAlternative(cpy.Alternative(tree)(trees), start)
386386
case tree =>
387-
implicit val ctx = prepOther(tree, start)(outerCtx)
387+
given Context = prepOther(tree, start)(outerCtx)
388388
goOther(tree, start)
389389
}
390390

0 commit comments

Comments
 (0)