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
20 changes: 17 additions & 3 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 @@ -3,6 +3,7 @@ package dotty.tools.dotc.interactive
import dotty.tools.dotc.ast.Trees._
import dotty.tools.dotc.config.Printers.interactiv
import dotty.tools.dotc.core.Contexts.{Context, NoContext}
import dotty.tools.dotc.core.CheckRealizable
import dotty.tools.dotc.core.Decorators.StringInterpolators
import dotty.tools.dotc.core.Denotations.SingleDenotation
import dotty.tools.dotc.core.Flags._
Expand All @@ -13,7 +14,7 @@ import dotty.tools.dotc.core.Symbols.{defn, NoSymbol, Symbol}
import dotty.tools.dotc.core.Scopes
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.core.Types.{NamedType, Type, takeAllFilter}
import dotty.tools.dotc.printing.Texts._
import dotty.tools.dotc.util.{NoSourcePosition, SourcePosition}

Expand Down Expand Up @@ -219,9 +220,20 @@ object Completion {
!sym.is(allOf(Mutable, Accessor)) &&
(
(mode.is(Mode.Term) && sym.isTerm)
|| (mode.is(Mode.StableTerm) && sym.isTerm && validPathSegment(sym))
|| (mode.is(Mode.Type) && sym.isType)
)

/** Can this symbol be part of a path? See SLS 3.1 for a definition of a valid path. */
private def validPathSegment(sym: Symbol)(implicit ctx: Context): Boolean = {
def isRealizable = {
val realizability = CheckRealizable.realizability(sym.info)
realizability == CheckRealizable.Realizable
}

!sym.is(Method) && isRealizable
}

/**
* Find all the members of `site` that are accessible and which should be included in `info`.
*
Expand Down Expand Up @@ -298,11 +310,13 @@ object Completion {
/** Term symbols are allowed */
val Term: Mode = new Mode(1)

val StableTerm: Mode = new Mode(2)

/** Type symbols are allowed */
val Type: Mode = new Mode(2)
val Type: Mode = new Mode(4) | StableTerm

/** Both term and type symbols are allowed */
val Import: Mode = new Mode(4) | Term | Type
val Import: Mode = new Mode(8) | Term | Type
}

}
11 changes: 11 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 @@ -188,4 +188,15 @@ class CompletionTest {
assertFalse(results.exists((label, _, _) => label == "Zig"))
})
}

@Test def typeCompletionShowsTerm: Unit = {
code"""class Bar
|object Foo {
| val bar = new Bar
| def baz = new Bar
| object bat
| val bizz: ba${m1}
|}""".withSource
.completion(m1, Set(("bar", Field, "Bar"), ("bat", Module, "Foo.bat")))
}
}