diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-09 15:00:32 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-09 15:00:32 -0800 |
| commit | 0c927046dc5df974e6c39187107cf3548825282b (patch) | |
| tree | e225bca8841e16829efda1176fe260f5d3a1db96 /src/compiler | |
| parent | a444ed778843ca67689f6550c95bdb945fbfde51 (diff) | |
| parent | 5ed834e251f2a83cadf19ae832268ead3e34de37 (diff) | |
| download | scala-0c927046dc5df974e6c39187107cf3548825282b.tar.gz scala-0c927046dc5df974e6c39187107cf3548825282b.tar.bz2 scala-0c927046dc5df974e6c39187107cf3548825282b.zip | |
Merge pull request #3222 from skyluc/issue/completion-import-vals-210-7995
SI-7995 completion imported vars and vals
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 531d7ec1e0..d6fa42b1cc 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -955,7 +955,11 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "") val enclosing = new Members[ScopeMember] def addScopeMember(sym: Symbol, pre: Type, viaImport: Tree) = locals.add(sym, pre, false) { (s, st) => - new ScopeMember(s, st, context.isAccessible(s, pre, false), viaImport) + // imported val and var are always marked as inaccessible, but they could be accessed through their getters. SI-7995 + if (s.hasGetter) + new ScopeMember(s, st, context.isAccessible(s.getter, pre, superAccess = false), viaImport) + else + new ScopeMember(s, st, context.isAccessible(s, pre, superAccess = false), viaImport) } def localsToEnclosing() = { enclosing.addNonShadowed(locals) |