Skip to content

[SemanticDB] fix regression in type apply synthetics #16031

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
Sep 13, 2022
Merged

[SemanticDB] fix regression in type apply synthetics #16031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c1d1e
fix: Emit type apply synthetics
tanishiking Sep 13, 2022
49daf3c
fix: remove duplicated type apply synthetics
tanishiking Sep 13, 2022
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
6 changes: 6 additions & 0 deletions compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ object Scala3:
case NameKinds.AnyNumberedName(nme.EMPTY, _) => true
case _ => false
}

def isDynamic(using Context): Boolean =
name == nme.applyDynamic ||
name == nme.selectDynamic ||
name == nme.updateDynamic ||
name == nme.applyDynamicNamed
end NameOps

given SymbolOps: AnyRef with
Expand Down
18 changes: 16 additions & 2 deletions compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import dotty.tools.dotc.ast.tpd._
import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.StdNames.nme
import dotty.tools.dotc.core.NameKinds
import dotty.tools.dotc.{semanticdb => s}


Expand All @@ -26,8 +27,21 @@ class SyntheticsExtractor:
tree match
case tree: TypeApply
if tree.span.isSynthetic &&
tree.args.forall(arg => !arg.symbol.is(Scala2x)) &&
!tree.span.isZeroExtent =>
tree.args.forall(arg => !arg.symbol.isDefinedInSource) &&
!tree.span.isZeroExtent &&
(tree.fun match {
// for `Bar[Int]` of `class Foo extends Bar[Int]`
// we'll have `TypeTree(Select(New(AppliedTypeTree(...))), List(Int))`
// in this case, don't register `*[Int]` to synthetics as we already have `[Int]` in source.
case Select(New(AppliedTypeTree(_, _)), _) => false

// for `new SomeJavaClass[Int]()`
// there will be a synthesized default getter
// in addition to the source derived one.
case Select(_, name) if name.is(NameKinds.DefaultGetterName) => false
case Select(fun, _) if fun.symbol.name.isDynamic => false
case _ => true
}) =>
visited.add(tree)
val fnTree = tree.fun match
// Something like `List.apply[Int](1,2,3)`
Expand Down
Loading