Skip to content

Fix #5460: Improve completion of import nodes #5476

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 14 commits into from
Nov 23, 2018
Merged

Fix #5460: Improve completion of import nodes #5476

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
43455e4
Fix #5460: Improve completion of import nodes
Duhemm Nov 20, 2018
c60930a
Exclude Java module class in completion in imports
Duhemm Nov 20, 2018
25dc9cb
Fix completion with renaming imports
Duhemm Nov 20, 2018
18f4c82
Refactor `completionInfo`
Duhemm Nov 20, 2018
ffa4691
Prefer types over terms in import completions
Duhemm Nov 20, 2018
341dc28
Improve display of completion results
Duhemm Nov 20, 2018
82e84d2
Mark deprecated symbols as such in completion
Duhemm Nov 20, 2018
ae59176
Address review comments
Duhemm Nov 21, 2018
1e82eb0
Refactor completions, add interactive.Completion
Duhemm Nov 21, 2018
ace5092
Fix completion without prefix
Duhemm Nov 23, 2018
9321210
Extract name kind from `ERROR`
Duhemm Nov 23, 2018
5677dfc
Show stable terms when completing types
Duhemm Nov 23, 2018
a746215
Address review comments
Duhemm Nov 23, 2018
89f850a
Always remove duplicates in completion
Duhemm Nov 23, 2018
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
5 changes: 3 additions & 2 deletions compiler/src/dotty/tools/dotc/interactive/Completion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import dotty.tools.dotc.core.NameKinds.SimpleNameKind
import dotty.tools.dotc.core.NameOps.NameDecorator
import dotty.tools.dotc.core.Symbols.{defn, NoSymbol, Symbol}
import dotty.tools.dotc.core.Scopes
import dotty.tools.dotc.core.StdNames.nme
import dotty.tools.dotc.core.StdNames.{nme, tpnme}
import dotty.tools.dotc.core.TypeError
import dotty.tools.dotc.core.Types.{NamedType, NameFilter, Type, takeAllFilter}
import dotty.tools.dotc.printing.Texts._
Expand Down Expand Up @@ -45,7 +45,8 @@ object Completion {
private def completionMode(path: List[Tree], pos: SourcePosition): Mode = {
path match {
case (ref: RefTree) :: _ =>
if (ref.name == nme.ERROR) Mode.Term | Mode.Type
if (ref.name == tpnme.ERROR) Mode.Type
else if (ref.name == nme.ERROR) Mode.Term
else if (ref.name.isTermName) Mode.Term
else if (ref.name.isTypeName) Mode.Type
else Mode.None
Expand Down
13 changes: 13 additions & 0 deletions language-server/test/dotty/tools/languageserver/CompletionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,17 @@ class CompletionTest {
|}""".withSource
.completion(m1, results => assertTrue(results.nonEmpty))
}

@Test def completeErrorKnowsKind: Unit = {
code"""object Bar {
| class Zig
| val Zag: Int = 0
| val b = 3 + Bar.${m1}
|}""".withSource
.completion(m1, completionItems => {
val results = CodeCompletion.simplifyResults(completionItems)
assertTrue(results.contains(("Zag", Field, "Int")))
assertFalse(results.exists((label, _, _) => label == "Zig"))
})
}
}