Skip to content

Commit be8f708

Browse files
committed
language-server: make sure we use the right context
currentCtx is a def which is updated after each run, so when making it available implicitly, we shouldn't use a val.
1 parent 80c8dc8 commit be8f708

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class DottyLanguageServer extends LanguageServer
240240
val document = params.getTextDocument
241241
val uri = new URI(document.getUri)
242242
val driver = driverFor(uri)
243-
implicit val ctx = driver.currentCtx
243+
implicit def ctx: Context = driver.currentCtx
244244
val worksheetMode = isWorksheet(uri)
245245

246246
val text =
@@ -265,7 +265,7 @@ class DottyLanguageServer extends LanguageServer
265265
checkMemory()
266266

267267
val driver = driverFor(uri)
268-
implicit val ctx = driver.currentCtx
268+
implicit def ctx: Context = driver.currentCtx
269269

270270
val change = params.getContentChanges.get(0)
271271
assert(change.getRange == null, "TextDocumentSyncKind.Incremental support is not implemented")
@@ -305,7 +305,7 @@ class DottyLanguageServer extends LanguageServer
305305
override def completion(params: CompletionParams) = computeAsync { cancelToken =>
306306
val uri = new URI(params.getTextDocument.getUri)
307307
val driver = driverFor(uri)
308-
implicit val ctx = driver.currentCtx
308+
implicit def ctx: Context = driver.currentCtx
309309

310310
val pos = sourcePosition(driver, uri, params.getPosition)
311311
val items = driver.compilationUnits.get(uri) match {
@@ -324,7 +324,7 @@ class DottyLanguageServer extends LanguageServer
324324
override def definition(params: TextDocumentPositionParams) = computeAsync { cancelToken =>
325325
val uri = new URI(params.getTextDocument.getUri)
326326
val driver = driverFor(uri)
327-
implicit val ctx = driver.currentCtx
327+
implicit def ctx: Context = driver.currentCtx
328328

329329
val pos = sourcePosition(driver, uri, params.getPosition)
330330
val path = Interactive.pathTo(driver.openedTrees(uri), pos)
@@ -347,7 +347,7 @@ class DottyLanguageServer extends LanguageServer
347347
val pos = sourcePosition(driver, uri, params.getPosition)
348348

349349
val (definitions, originalSymbols) = {
350-
implicit val ctx: Context = driver.currentCtx
350+
implicit def ctx: Context = driver.currentCtx
351351
val path = Interactive.pathTo(driver.openedTrees(uri), pos)
352352
val definitions = Interactive.findDefinitions(path, pos, driver)
353353
val originalSymbols = Interactive.enclosingSourceSymbols(path, pos)
@@ -376,7 +376,7 @@ class DottyLanguageServer extends LanguageServer
376376
override def rename(params: RenameParams) = computeAsync { cancelToken =>
377377
val uri = new URI(params.getTextDocument.getUri)
378378
val driver = driverFor(uri)
379-
implicit val ctx = driver.currentCtx
379+
implicit def ctx: Context = driver.currentCtx
380380

381381
val uriTrees = driver.openedTrees(uri)
382382
val pos = sourcePosition(driver, uri, params.getPosition)
@@ -443,7 +443,7 @@ class DottyLanguageServer extends LanguageServer
443443
override def documentHighlight(params: TextDocumentPositionParams) = computeAsync { cancelToken =>
444444
val uri = new URI(params.getTextDocument.getUri)
445445
val driver = driverFor(uri)
446-
implicit val ctx = driver.currentCtx
446+
implicit def ctx: Context = driver.currentCtx
447447

448448
val pos = sourcePosition(driver, uri, params.getPosition)
449449
val uriTrees = driver.openedTrees(uri)
@@ -463,7 +463,7 @@ class DottyLanguageServer extends LanguageServer
463463
override def hover(params: TextDocumentPositionParams) = computeAsync { cancelToken =>
464464
val uri = new URI(params.getTextDocument.getUri)
465465
val driver = driverFor(uri)
466-
implicit val ctx = driver.currentCtx
466+
implicit def ctx: Context = driver.currentCtx
467467

468468
val pos = sourcePosition(driver, uri, params.getPosition)
469469
val trees = driver.openedTrees(uri)
@@ -487,7 +487,7 @@ class DottyLanguageServer extends LanguageServer
487487
override def documentSymbol(params: DocumentSymbolParams) = computeAsync { cancelToken =>
488488
val uri = new URI(params.getTextDocument.getUri)
489489
val driver = driverFor(uri)
490-
implicit val ctx = driver.currentCtx
490+
implicit def ctx: Context = driver.currentCtx
491491

492492
val uriTrees = driver.openedTrees(uri)
493493

@@ -502,7 +502,7 @@ class DottyLanguageServer extends LanguageServer
502502
val query = params.getQuery
503503

504504
drivers.values.toList.flatMap { driver =>
505-
implicit val ctx = driver.currentCtx
505+
implicit def ctx: Context = driver.currentCtx
506506

507507
val trees = driver.sourceTreesContaining(query)
508508
val defs = Interactive.namedTrees(trees, Include.empty, _.name.toString.contains(query))
@@ -517,7 +517,7 @@ class DottyLanguageServer extends LanguageServer
517517
val pos = sourcePosition(driver, uri, params.getPosition)
518518

519519
val (definitions, originalSymbols) = {
520-
implicit val ctx: Context = driver.currentCtx
520+
implicit def ctx: Context = driver.currentCtx
521521
val path = Interactive.pathTo(driver.openedTrees(uri), pos)
522522
val originalSymbols = Interactive.enclosingSourceSymbols(path, pos)
523523
val definitions = Interactive.findDefinitions(path, pos, driver)
@@ -545,7 +545,7 @@ class DottyLanguageServer extends LanguageServer
545545

546546
val uri = new URI(params.getTextDocument.getUri)
547547
val driver = driverFor(uri)
548-
implicit val ctx = driver.currentCtx
548+
implicit def ctx: Context = driver.currentCtx
549549

550550
val pos = sourcePosition(driver, uri, params.getPosition)
551551
val trees = driver.openedTrees(uri)

0 commit comments

Comments
 (0)