Skip to content

Fix #3979: Completion for renamed imports #4977

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 9 commits into from
Dec 2, 2018
Merged

Fix #3979: Completion for renamed imports #4977

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9155812
Fix #5508: Add `Completion` structure
Duhemm Nov 27, 2018
317f16c
Fix #3979: Completion for renamed imports
Duhemm Nov 27, 2018
55c55cc
Support multiple renames for the same symbol
Duhemm Nov 28, 2018
21b0b97
Exclude symbols w/o sourceSymbol in completions
Duhemm Nov 28, 2018
fa72067
Better completion description for multiple symbols
Duhemm Nov 28, 2018
6ed0ccd
Handle symbols renamed multiple times better
Duhemm Nov 28, 2018
f9443e1
Return syms grouped by name in `RenameAwareScope`
Duhemm Nov 30, 2018
976eecb
Use `NameFilter` in `Completion`
Duhemm Dec 1, 2018
29fe495
Simplify `def mappings`
Duhemm Dec 1, 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
26 changes: 13 additions & 13 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 @@ -7,7 +7,7 @@ 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._
import dotty.tools.dotc.core.Names.{Name, TermName}
import dotty.tools.dotc.core.Names.{Name, SimpleName, TermName}
import dotty.tools.dotc.core.NameKinds.SimpleNameKind
import dotty.tools.dotc.core.NameOps.NameDecorator
import dotty.tools.dotc.core.Symbols.{defn, NoSymbol, Symbol}
Expand Down Expand Up @@ -146,12 +146,8 @@ object Completion {
* the same `Completion`.
*/
def getCompletions(implicit ctx: Context): List[Completion] = {
val groupedSymbols = {
val symbols = completions.toListWithNames
val nameToSymbols = symbols.groupBy(_._2.stripModuleClassSuffix.toSimpleName)
nameToSymbols.mapValues(_.map(_._1)).toList
}
groupedSymbols.map { case (name, symbols) =>
val nameToSymbols = completions.mappings.toList
nameToSymbols.map { case (name, symbols) =>
val typesFirst = symbols.sortWith((s1, s2) => s1.isType && !s2.isType)
val desc = description(typesFirst)
Completion(name.toString, desc, typesFirst)
Expand Down Expand Up @@ -357,12 +353,16 @@ object Completion {
sym
}

/** Lists the symbols in this scope along with the name associated with them. */
def toListWithNames(implicit ctx: Context): List[(Symbol, Name)] = {
for {
(name, syms) <- nameToSymbols.toList
sym <- syms
} yield (sym, name)
/** Get the names that are known in this scope, along with the list of symbols they refer to. */
def mappings(implicit ctx: Context): Map[SimpleName, List[Symbol]] = {
Copy link
Member

@smarter smarter Dec 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't the body of this method just be equal to nameToSymbols ? (assuming def enter above is changed to do stripModuleClassSufffix)

Copy link
Contributor Author

@Duhemm Duhemm Dec 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good catch. That should have been the case from the beginning, since nameToSymbold contained exactly one symbol per name. Thanks

val symbols =
for {
(name, syms) <- nameToSymbols.toList
sym <- syms
} yield (sym, name)
symbols
.groupBy(_._2.stripModuleClassSuffix.toSimpleName)
.mapValues(_.map(_._1))
}
}

Expand Down