Skip to content

compile dotty with Ysemanticdb #8983

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 11 commits into from
May 19, 2020
Merged

compile dotty with Ysemanticdb #8983

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86bd57d
fix #8954 use tree source, look inside byname arguments
bishabosha May 13, 2020
0a369f4
add regression tests
bishabosha May 13, 2020
51ce9bb
traverse annots once per definition symbol
bishabosha May 14, 2020
1c67d79
fix literal type in ctor, move tests
bishabosha May 14, 2020
996b81b
resolve vars in overloads
bishabosha May 14, 2020
5f5fa14
fix #8970 support scala 2 macros in semanticdb
bishabosha May 14, 2020
45571b2
support inlined local defs
bishabosha May 14, 2020
3c167a7
compile codebase tests with semanticdb
bishabosha May 14, 2020
5f43d09
pass Tree in context, source->treeSource
bishabosha May 15, 2020
8ac0e64
enable ReadPositions when Ysemanticdb is set
bishabosha May 19, 2020
bd906c4
test throw and inlined defs
bishabosha May 19, 2020
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
18 changes: 10 additions & 8 deletions compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ class ExtractSemanticDB extends Phase:

override def traverse(tree: Tree)(using Context): Unit =

inline def traverseCtorParamTpt(ctorSym: Symbol, tpt: Tree): Unit =
val tptSym = tpt.symbol
def traverseCtorParamTpt(ctorSym: Symbol, tpt: Tree)(using Context): Unit =
val tptSym = tpt match
case ByNameTypeTree(tpt) => tpt.symbol
case tpt => tpt.symbol
if tptSym.owner == ctorSym
val found = matchingMemberType(tptSym, ctorSym.owner)
if tpt.span.hasLength
Expand All @@ -131,7 +133,7 @@ class ExtractSemanticDB extends Phase:
&& tree.pid.span.hasLength
tree.pid match
case tree @ Select(qual, name) =>
registerDefinition(tree.symbol, adjustSpanToName(tree.span, qual.span, name), Set.empty)
registerDefinition(tree.symbol, adjustSpanToName(tree.span, qual.span, name, tree.source), Set.empty)
traverse(qual)
case tree => registerDefinition(tree.symbol, tree.span, Set.empty)
tree.stats.foreach(traverse)
Expand Down Expand Up @@ -206,7 +208,7 @@ class ExtractSemanticDB extends Phase:
val lhs = tree.lhs.symbol
val setter = lhs.matchingSetter.orElse(lhs)
tree.lhs match
case tree @ Select(qual, name) => registerUse(setter, adjustSpanToName(tree.span, qual.span, name))
case tree @ Select(qual, name) => registerUse(setter, adjustSpanToName(tree.span, qual.span, name, tree.source))
case tree => registerUse(setter, tree.span)
traverseChildren(tree.lhs)
traverse(tree.rhs)
Expand All @@ -217,7 +219,7 @@ class ExtractSemanticDB extends Phase:
case tree: Select =>
val qualSpan = tree.qualifier.span
val sym = tree.symbol.adjustIfCtorTyparam
registerUseGuarded(tree.qualifier.symbol.ifExists, sym, adjustSpanToName(tree.span, qualSpan, tree.name))
registerUseGuarded(tree.qualifier.symbol.ifExists, sym, adjustSpanToName(tree.span, qualSpan, tree.name, tree.source))
if qualSpan.exists && qualSpan.hasLength then
traverse(tree.qualifier)
case tree: Import =>
Expand Down Expand Up @@ -502,7 +504,7 @@ class ExtractSemanticDB extends Phase:
}).toMap
end findGetters

private def adjustSpanToName(span: Span, qualSpan: Span, name: Name)(using Context) =
private def adjustSpanToName(span: Span, qualSpan: Span, name: Name, source: SourceFile) =
val end = span.end
val limit = qualSpan.end
val start =
Expand Down Expand Up @@ -559,8 +561,8 @@ class ExtractSemanticDB extends Phase:
case _ =>
symkinds.toSet

private inline def ctorParams(
vparamss: List[List[ValDef]], body: List[Tree])(traverseTpt: => Tree => Unit)(using Context): Unit =
private def ctorParams(
vparamss: List[List[ValDef]], body: List[Tree])(traverseTpt: Tree => Unit)(using Context): Unit =
@tu lazy val getters = findGetters(vparamss.flatMap(_.map(_.name)).toSet, body)
for
vparams <- vparamss
Expand Down