Skip to content

Commit 90e950f

Browse files
committed
Revert changes to completion mode for renamed imports
1 parent 4733fbf commit 90e950f

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,10 @@ object Completion:
9090

9191
val completionSymbolKind: Mode =
9292
path match
93-
case GenericImportSelector(_) => Mode.ImportOrExport // import scala.@@
93+
case GenericImportSelector(sel) =>
94+
if sel.imported.span.contains(pos.span) then Mode.ImportOrExport // import scala.@@
95+
else Mode.None // import scala.{util => u@@}
9496
case GenericImportOrExport(_) => Mode.ImportOrExport | Mode.Scope // import TrieMa@@
95-
9697
case untpd.Literal(Constants.Constant(_: String)) :: _ => Mode.Term | Mode.Scope // literal completions
9798
case (ref: untpd.RefTree) :: _ =>
9899
val maybeSelectMembers = if ref.isInstanceOf[untpd.Select] then Mode.Member else Mode.Scope

language-server/test/dotty/tools/languageserver/CompletionTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,11 @@ class CompletionTest {
213213
("FileDescriptor", Class, "java.io.FileDescriptor"),
214214
("FileDescriptor", Module, "java.io.FileDescriptor"),
215215
)
216+
}
216217

218+
@Test def noImportRename: Unit = {
219+
code"""import java.io.{FileDescriptor => Fo$m1}"""
220+
.noCompletions()
217221
}
218222

219223
@Test def importGivenByType: Unit = {
@@ -1695,4 +1699,12 @@ class CompletionTest {
16951699
val interestingResults = results.filter(_.getLabel().startsWith("util"))
16961700
assertEquals(1, interestingResults.size)
16971701
})
1702+
1703+
@Test def methodsWithInstantiatedTypeVars: Unit =
1704+
code"""|object M:
1705+
| Map.empty[Int, String].getOrEls$m1
1706+
|"""
1707+
.completion(m1, Set(
1708+
("getOrElse", Method, "[V1 >: String](key: Int, default: => V1): V1"),
1709+
))
16981710
}

0 commit comments

Comments
 (0)