Commit 96aff06

authored

bugfix: Fix possible SuspendException thrown when using macros (#24174)

2 parents f1cbbe9 + 078be56 commit 96aff06Copy full SHA for 96aff06

File tree

1 file changed

+22

-7

lines changed

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

1 file changed

+22

-7

lines changed

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

Lines changed: 22 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ import dotty.tools.dotc.core.Constants`
`35`	`35`	`import dotty.tools.dotc.core.TypeOps`
`36`	`36`	`import dotty.tools.dotc.core.StdNames`
`37`	`37`
	`38`	`+import java.util.logging.Logger`
	`39`	`+`
`38`	`40`	`/**`
`39`	`41`	`* One of the results of a completion query.`
`40`	`42`	`*`
`@@ -48,6 +50,8 @@ case class Completion(label: String, description: String, symbols: List[Symbol])`
`48`	`50`
`49`	`51`	`object Completion:`
`50`	`52`
	`53`	`+ private val logger = Logger.getLogger(this.getClass.getName)`
	`54`	`+`
`51`	`55`	`def scopeContext(pos: SourcePosition)(using Context): CompletionResult =`
`52`	`56`	`val tpdPath = Interactive.pathTo(ctx.compilationUnit.tpdTree, pos.span)`
`53`	`57`	`val completionContext = Interactive.contextOfPath(tpdPath).withPhase(Phases.typerPhase)`
`@@ -601,12 +605,19 @@ object Completion:`
`601`	`605`	`case _: MethodOrPoly => tpe`
`602`	`606`	`case _ => ExprType(tpe)`
`603`	`607`
	`608`	`+ // Try added due to https://github.com/scalameta/metals/issues/7872`
`604`	`609`	`def tryApplyingReceiverToExtension(termRef: TermRef): Option[SingleDenotation] =`
`605`		`- ctx.typer.tryApplyingExtensionMethod(termRef, qual)`
`606`		`- .map { tree =>`
`607`		`- val tpe = asDefLikeType(tree.typeOpt.dealias)`
`608`		`- termRef.denot.asSingleDenotation.mapInfo(_ => tpe)`
`609`		`- }`
	`610`	`+ try`
	`611`	`+ ctx.typer.tryApplyingExtensionMethod(termRef, qual)`
	`612`	`+ .map { tree =>`
	`613`	`+ val tpe = asDefLikeType(tree.typeOpt.dealias)`
	`614`	`+ termRef.denot.asSingleDenotation.mapInfo(_ => tpe)`
	`615`	`+ }`
	`616`	`+ catch case NonFatal(ex) =>`
	`617`	`+ logger.warning(`
	`618`	`+ s"Exception when trying to apply extension method:\n${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"`
	`619`	`+ )`
	`620`	`+ None`
`610`	`621`
`611`	`622`	`def extractMemberExtensionMethods(types: Seq[Type]): Seq[(TermRef, TermName)] =`
`612`	`623`	`object DenotWithMatchingName:`
`@@ -704,13 +715,17 @@ object Completion:`
`704`	`715`	`* @param qual The argument to which the implicit conversion should be applied.`
`705`	`716`	* @return The set of types after `qual` implicit conversion.
`706`	`717`	`*/`
`707`		`- private def implicitConversionTargets(qual: tpd.Tree)(using Context): Set[SearchSuccess] = {`
	`718`	`+ private def implicitConversionTargets(qual: tpd.Tree)(using Context): Set[SearchSuccess] = try{`
`708`	`719`	`val typer = ctx.typer`
`709`	`720`	`val conversions = new typer.ImplicitSearch(defn.AnyType, qual, pos.span, Set.empty).allImplicits`
`710`	`721`
`711`	`722`	`interactiv.println(i"implicit conversion targets considered: ${conversions.toList}%, %")`
`712`	`723`	`conversions`
`713`		`- }`
	`724`	`+ } catch case NonFatal(ex) =>`
	`725`	`+ logger.warning(`
	`726`	`+ s"Exception when searching for implicit conversions:\n${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"`
	`727`	`+ )`
	`728`	`+ Set.empty`
`714`	`729`
`715`	`730`	`/** Filter for names that should appear when looking for completions. */`
`716`	`731`	`private object completionsFilter extends NameFilter:`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 96aff06

File tree

1 file changed

1 file changed

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

0 commit comments