diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-02-20 14:27:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 14:27:50 -0800 |
| commit | 13f7b2a975ee77520535598fd192376b4d4b235e (patch) | |
| tree | 530d8aadd5824e76ff02f0e16ba8f490440cdc64 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | 023a96afe30d04e6de771d0676b85b0889b89a37 (diff) | |
| parent | aa7e3359be92afbb6d3cc8dee2139a9872a03a57 (diff) | |
| download | scala-13f7b2a975ee77520535598fd192376b4d4b235e.tar.gz scala-13f7b2a975ee77520535598fd192376b4d4b235e.tar.bz2 scala-13f7b2a975ee77520535598fd192376b4d4b235e.zip | |
Merge pull request #5640 from optimizely/repl-import-handler
SI-9881 Fix ImportHandler's reporting of importedNames and importedSymbols
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index d349597b14..d142cdb84c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -64,9 +64,8 @@ trait Contexts { self: Analyzer => for (imps <- allImportInfos.remove(unit)) { for (imp <- imps.reverse.distinct) { val used = allUsedSelectors(imp) - def isMask(s: ImportSelector) = s.name != nme.WILDCARD && s.rename == nme.WILDCARD - imp.tree.selectors filterNot (s => isMask(s) || used(s)) foreach { sel => + imp.tree.selectors filterNot (s => isMaskImport(s) || used(s)) foreach { sel => reporter.warning(imp posOf sel, "Unused import") } } @@ -74,6 +73,10 @@ trait Contexts { self: Analyzer => } } + def isMaskImport(s: ImportSelector): Boolean = s.name != nme.WILDCARD && s.rename == nme.WILDCARD + def isIndividualImport(s: ImportSelector): Boolean = s.name != nme.WILDCARD && s.rename != nme.WILDCARD + def isWildcardImport(s: ImportSelector): Boolean = s.name == nme.WILDCARD + var lastAccessCheckDetails: String = "" /** List of symbols to import from in a root context. Typically that |