Skip to content

Backport "bugfix: Fix possible SuspendException thrown when using macros" to 3.7.4 #24222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
+22 −7
Merged

Backport "bugfix: Fix possible SuspendException thrown when using macros" to 3.7.4 #24222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff14efd
bugfix: Fix possible SuspendException thrown when using macros
tgodzik Oct 12, 2025
66b9b1b
chore: Add logget.warn in case where it breaks
tgodzik Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions compiler/src/dotty/tools/dotc/interactive/Completion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import dotty.tools.dotc.core.Constants
import dotty.tools.dotc.core.TypeOps
import dotty.tools.dotc.core.StdNames

import java.util.logging.Logger

/**
* One of the results of a completion query.
*
Expand All @@ -48,6 +50,8 @@ case class Completion(label: String, description: String, symbols: List[Symbol])

object Completion:

private val logger = Logger.getLogger(this.getClass.getName)

def scopeContext(pos: SourcePosition)(using Context): CompletionResult =
val tpdPath = Interactive.pathTo(ctx.compilationUnit.tpdTree, pos.span)
val completionContext = Interactive.contextOfPath(tpdPath).withPhase(Phases.typerPhase)
Expand Down Expand Up @@ -591,12 +595,19 @@ object Completion:
case _: MethodOrPoly => tpe
case _ => ExprType(tpe)

// Try added due to https://github.com/scalameta/metals/issues/7872
def tryApplyingReceiverToExtension(termRef: TermRef): Option[SingleDenotation] =
ctx.typer.tryApplyingExtensionMethod(termRef, qual)
.map { tree =>
val tpe = asDefLikeType(tree.typeOpt.dealias)
termRef.denot.asSingleDenotation.mapInfo(_ => tpe)
}
try
ctx.typer.tryApplyingExtensionMethod(termRef, qual)
.map { tree =>
val tpe = asDefLikeType(tree.typeOpt.dealias)
termRef.denot.asSingleDenotation.mapInfo(_ => tpe)
}
catch case NonFatal(ex) =>
logger.warning(
s"Exception when trying to apply extension method:\n ${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"
)
None

def extractMemberExtensionMethods(types: Seq[Type]): Seq[(TermRef, TermName)] =
object DenotWithMatchingName:
Expand Down Expand Up @@ -694,13 +705,17 @@ object Completion:
* @param qual The argument to which the implicit conversion should be applied.
* @return The set of types after `qual` implicit conversion.
*/
private def implicitConversionTargets(qual: tpd.Tree)(using Context): Set[SearchSuccess] = {
private def implicitConversionTargets(qual: tpd.Tree)(using Context): Set[SearchSuccess] = try {
val typer = ctx.typer
val conversions = new typer.ImplicitSearch(defn.AnyType, qual, pos.span, Set.empty).allImplicits

interactiv.println(i"implicit conversion targets considered: ${conversions.toList}%, %")
conversions
}
} catch case NonFatal(ex) =>
logger.warning(
s"Exception when searching for implicit conversions:\n ${ex.getMessage()}\n${ex.getStackTrace().mkString("\n")}"
)
Set.empty

/** Filter for names that should appear when looking for completions. */
private object completionsFilter extends NameFilter:
Expand Down