Skip to content

Commit 1d1a28d

Browse files
DuhemmDuhemm
committed
Introduce SourceImportTree and SourceNamedTree 
1 parent 309e323 commit 1d1a28d

File tree

4 files changed

+79
-51
lines changed

4 files changed

+79
-51
lines changed

‎compiler/src/dotty/tools/dotc/interactive/Interactive.scala

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ object Interactive {
258258
* source code.
259259
*/
260260
def namedTrees(trees: List[SourceTree], include: Include.Set, sym: Symbol)
261-
(implicit ctx: Context): List[SourceTree] =
261+
(implicit ctx: Context): List[SourceNamedTree] =
262262
if (!sym.exists)
263263
Nil
264264
else
@@ -269,38 +269,40 @@ object Interactive {
269269
* @param includeReferences If true, include references and not just definitions
270270
*/
271271
def namedTrees(trees: List[SourceTree], includeReferences: Boolean, nameSubstring: String)
272-
(implicit ctx: Context): List[SourceTree] =
272+
(implicit ctx: Context): List[SourceNamedTree] =
273273
namedTrees(trees, includeReferences, _.show.toString.contains(nameSubstring))
274274

275275
/** Find named trees with a non-empty position satisfying `treePredicate` in `trees`.
276276
*
277277
* @param includeReferences If true, include references and not just definitions
278278
*/
279279
def namedTrees(trees: List[SourceTree], includeReferences: Boolean, treePredicate: NameTree => Boolean)
280-
(implicit ctx: Context): List[SourceTree] = safely {
281-
val buf = new mutable.ListBuffer[SourceTree]
282-
283-
trees foreach { case SourceTree(_, topTree, source) =>
284-
new untpd.TreeTraverser {
285-
override def traverse(tree: untpd.Tree)(implicit ctx: Context) = {
286-
tree match {
287-
case utree: untpd.NameTree if tree.hasType =>
288-
val tree = utree.asInstanceOf[tpd.NameTree]
289-
if (tree.symbol.exists
290-
&& !tree.symbol.is(Synthetic)
291-
&& tree.pos.exists
292-
&& !tree.pos.isZeroExtent
293-
&& (includeReferences || isDefinition(tree))
294-
&& treePredicate(tree))
295-
buf += SourceTree(Nil, tree, source)
296-
traverseChildren(tree)
297-
case tree: untpd.Inlined =>
298-
traverse(tree.call)
299-
case _ =>
300-
traverseChildren(tree)
280+
(implicit ctx: Context): List[SourceNamedTree] = safely {
281+
val buf = new mutable.ListBuffer[SourceNamedTree]
282+
283+
trees foreach {
284+
case SourceNamedTree(topTree, source) =>
285+
new untpd.TreeTraverser {
286+
override def traverse(tree: untpd.Tree)(implicit ctx: Context) = {
287+
tree match {
288+
case utree: untpd.NameTree if tree.hasType =>
289+
val tree = utree.asInstanceOf[tpd.NameTree]
290+
if (tree.symbol.exists
291+
&& !tree.symbol.is(Synthetic)
292+
&& tree.pos.exists
293+
&& !tree.pos.isZeroExtent
294+
&& (includeReferences || isDefinition(tree))
295+
&& treePredicate(tree))
296+
buf += SourceNamedTree(tree, source)
297+
traverseChildren(tree)
298+
case tree: untpd.Inlined =>
299+
traverse(tree.call)
300+
case _ =>
301+
traverseChildren(tree)
302+
}
301303
}
302-
}
303-
}.traverse(topTree)
304+
}.traverse(topTree)
305+
case _: SourceImportTree => ()
304306
}
305307

306308
buf.toList
@@ -315,7 +317,7 @@ object Interactive {
315317
*/
316318
def findTreesMatching(trees: List[SourceTree],
317319
includes: Include.Set,
318-
symbol: Symbol)(implicit ctx: Context): List[SourceTree] = {
320+
symbol: Symbol)(implicit ctx: Context): List[SourceNamedTree] = {
319321
val linkedSym = symbol.linkedClass
320322
val includeReferences = (includes & Include.references) != 0
321323
val includeDeclaration = (includes & Include.definitions) != 0
@@ -340,9 +342,9 @@ object Interactive {
340342
* the tree closest enclosing `pos` and ends with an element of `trees`.
341343
*/
342344
def pathTo(trees: List[SourceTree], pos: SourcePosition)(implicit ctx: Context): List[Tree] = {
343-
val allTrees = trees.flatMap(t => t.tree :: t.topLevelImports)
344-
allTrees.find(t => t.pos.contains(pos.pos)) match {
345-
case Some(tree) => pathTo(tree, pos.pos)
345+
trees.find(t => t.pos.contains(pos)) match {
346+
case Some(tree) =>
347+
pathTo(tree.tree, pos.pos)
346348
case None => Nil
347349
}
348350
}

‎compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
6767
(fromSource ++ fromClassPath).distinct
6868
}
6969

70-
private def tree(className: TypeName, id: String)(implicit ctx: Context): Option[SourceTree] = {
70+
private def tree(className: TypeName, id: String)(implicit ctx: Context): List[SourceTree] = {
7171
val clsd = ctx.base.staticRef(className)
7272
clsd match {
7373
case clsd: ClassDenotation =>
7474
clsd.ensureCompleted()
7575
SourceTree.fromSymbol(clsd.symbol.asClass, id)
7676
case _ =>
77-
None
77+
Nil
7878
}
7979
}
8080

@@ -169,18 +169,19 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
169169
names.toList
170170
}
171171

172-
private def topLevelClassTrees(topTree: Tree, source: SourceFile): List[SourceTree] = {
172+
private def topLevelTrees(topTree: Tree, source: SourceFile): List[SourceTree] = {
173173
val trees = new mutable.ListBuffer[SourceTree]
174174

175-
def addTrees(topLevelImports: List[Import], tree: Tree): Unit = tree match {
175+
def addTrees(tree: Tree): Unit = tree match {
176176
case PackageDef(_, stats) =>
177-
val imports = stats.collect { case imp: Import => imp }
178-
stats.foreach(addTrees(imports, _))
177+
stats.foreach(addTrees)
178+
case imp: Import =>
179+
trees += SourceImportTree(imp, source)
179180
case tree: TypeDef =>
180-
trees += SourceTree(topLevelImports, tree, source)
181+
trees += SourceNamedTree(tree, source)
181182
case _ =>
182183
}
183-
addTrees(Nil, topTree)
184+
addTrees(topTree)
184185

185186
trees.toList
186187
}
@@ -244,7 +245,7 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
244245
val unit = ctx.run.units.head
245246
val t = unit.tpdTree
246247
cleanup(t)
247-
myOpenedTrees(uri) = topLevelClassTrees(t, source)
248+
myOpenedTrees(uri) = topLevelTrees(t, source)
248249
myCompilationUnits(uri) = unit
249250

250251
reporter.removeBufferedMessages

‎compiler/src/dotty/tools/dotc/interactive/SourceTree.scala

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,24 @@ import core._, core.Decorators.{sourcePos => _, _}
99
import Contexts._, NameOps._, Symbols._, StdNames._
1010
import util._, util.Positions._
1111

12-
/** A typechecked named `tree` coming from `source` */
13-
case class SourceTree(topLevelImports: List[tpd.Import], tree: tpd.NameTree, source: SourceFile) {
12+
/** A `tree` coming from `source` */
13+
sealed trait SourceTree {
14+
15+
/** The underlying tree. */
16+
def tree: tpd.Tree
17+
18+
/** The source from which `tree` comes. */
19+
def source: SourceFile
20+
1421
/** The position of `tree` */
15-
def pos(implicit ctx: Context): SourcePosition = source.atPos(tree.pos)
22+
final def pos(implicit ctx: Context): SourcePosition = source.atPos(tree.pos)
23+
}
24+
25+
/** An import coming from `source` */
26+
case class SourceImportTree(tree: tpd.Import, source: SourceFile) extends SourceTree
27+
28+
/** A typechecked `tree` coming from `source` */
29+
case class SourceNamedTree(tree: tpd.NameTree, source: SourceFile) extends SourceTree {
1630

1731
/** The position of the name in `tree` */
1832
def namePos(implicit ctx: Context): SourcePosition = {
@@ -39,22 +53,34 @@ case class SourceTree(topLevelImports: List[tpd.Import], tree: tpd.NameTree, sou
3953
}
4054

4155
object SourceTree {
42-
def fromSymbol(sym: ClassSymbol, id: String = "")(implicit ctx: Context): Option[SourceTree] = {
56+
def fromSymbol(sym: ClassSymbol, id: String = "")(implicit ctx: Context): List[SourceTree] = {
4357
if (sym == defn.SourceFileAnnot || // FIXME: No SourceFile annotation on SourceFile itself
4458
sym.sourceFile == null) // FIXME: We cannot deal with external projects yet
45-
None
59+
Nil
4660
else {
4761
import ast.Trees._
48-
def sourceTreeOfClass(tree: tpd.Tree): Option[SourceTree] = tree match {
62+
63+
def sourceTreeOfClass(tree: tpd.Tree): Option[SourceNamedTree] = tree match {
4964
case PackageDef(_, stats) =>
50-
val imports = stats.collect { case imp: tpd.Import => imp }
51-
stats.flatMap(sourceTreeOfClass(_).map(_.copy(topLevelImports = imports))).headOption
65+
stats.flatMap(sourceTreeOfClass).headOption
5266
case tree: tpd.TypeDef if tree.symbol == sym =>
5367
val sourceFile = new SourceFile(sym.sourceFile, Codec.UTF8)
54-
Some(SourceTree(Nil, tree, sourceFile))
55-
case _ => None
68+
Some(SourceNamedTree(tree, sourceFile))
69+
case _ =>
70+
None
71+
}
72+
73+
def sourceImports(tree: tpd.Tree, sourceFile: SourceFile): List[SourceImportTree] = tree match {
74+
case PackageDef(_, stats) => stats.flatMap(sourceImports(_, sourceFile))
75+
case imp: tpd.Import => SourceImportTree(imp, sourceFile) :: Nil
76+
case _ => Nil
77+
}
78+
79+
val tree = sym.treeContaining(id)
80+
sourceTreeOfClass(tree) match {
81+
case Some(namedTree) => namedTree :: sourceImports(tree, namedTree.source)
82+
case None => Nil
5683
}
57-
sourceTreeOfClass(sym.treeContaining(id))
5884
}
5985
}
6086
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,11 @@ class DottyLanguageServer extends LanguageServer
303303
case _ =>
304304
sym.topLevelClass match {
305305
case cls: ClassSymbol =>
306-
val trees = SourceTree.fromSymbol(cls.toList)
306+
val trees = SourceTree.fromSymbol(cls)
307307
Interactive.namedTrees(trees, Include.overriding, sym)
308308
case _ =>
309309
Nil
310310
}
311-
312311
}
313312
defs.map(d => location(d.namePos)).asJava
314313
}

0 commit comments

Comments
 (0)