Address last review comments

Author: Duhemm

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -1193,6 +1193,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
    */
   def importSelections(imp: Import)(implicit ctx: Context): List[Select] = {
     def imported(sym: Symbol, id: untpd.Ident, rename: Option[untpd.Ident]): List[Select] = {
+      // Give a zero-extent position to the qualifier to prevent it from being included several
+      // times in results in the language server.
       val noPosExpr = focusPositions(imp.expr)
       val selectTree = Select(noPosExpr, sym.name).withPos(id.pos)
       rename match {

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

@@ -556,11 +556,11 @@ object Interactive {
   }
 
   /**
-   * Is this tree using a renaming introduced by an import statement?
+   * Is this tree using a renaming introduced by an import statement or an alias for `this`?
    *
    * @param tree The tree to inspect
    * @return True, if this tree's name is different than its symbol's name, indicating that
-   *         it uses a renaming introduced by an import statement.
+   *         it uses a renaming introduced by an import statement or an alias for `this`.
    */
   def isRenamed(tree: NameTree)(implicit ctx: Context): Boolean = {
     val symbol = tree.symbol
@@ -572,37 +572,4 @@ object Interactive {
     n0.stripModuleClassSuffix.toTermName eq n1.stripModuleClassSuffix.toTermName
   }
 
-  /**
-   * Is this tree immediately enclosing an import that renames a symbol to `toName`?
-   *
-   * @param toName        The target name to check
-   * @param tree          The tree to check
-   * @return True if this tree immediately encloses an import that renames a symbol to `toName`,
-   *         false otherwise.
-   */
-  def immediatelyEnclosesRenaming(toName: Name, inTree: Tree)(implicit ctx: Context): Boolean = {
-    def isImportRenaming(tree: Tree): Boolean = {
-      tree match {
-        case Import(_, selectors) =>
-          selectors.exists {
-            case Thicket(_ :: Ident(rename) :: Nil) => sameName(rename, toName)
-            case _ => false
-          }
-        case _ =>
-          false
-      }
-    }
-
-    inTree match {
-      case PackageDef(_, stats) =>
-        stats.exists(isImportRenaming)
-      case template: Template =>
-        template.body.exists(isImportRenaming)
-      case Block(stats, _) =>
-        stats.exists(isImportRenaming)
-      case _ =>
-        false
-    }
-  }
-
 }

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

@@ -415,7 +415,7 @@ class DottyLanguageServer extends LanguageServer
     val uriTrees = driver.openedTrees(uri)
     val path = Interactive.pathTo(uriTrees, pos)
     val syms = Interactive.enclosingSourceSymbols(path, pos)
-    val includes = Include.definitions | Include.references | Include.imports
+    val includes = Include.all.except(Include.linkedClass)
 
     syms.flatMap { sym =>
       val refs = Interactive.findTreesMatching(uriTrees, includes, sym)