Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/library/scala/concurrent/Future.scala
	versions.properties

2 files changed, 10 insertions, 6 deletions

diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
index 7d37beeca4..a192dd3738 100644
--- a/src/interactive/scala/tools/nsc/interactive/Global.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -80,7 +80,11 @@ trait InteractiveAnalyzer extends Analyzer {
         val owningInfo = sym.owner.info
         val existingDerivedSym = owningInfo.decl(sym.name.toTermName).filter(sym => sym.isSynthetic && sym.isMethod)
         existingDerivedSym.alternatives foreach (owningInfo.decls.unlink)
-        enterImplicitWrapper(tree.asInstanceOf[ClassDef])
+        val defTree = tree match {
+          case dd: DocDef => dd.definition // See SI-9011, Scala IDE's presentation compiler incorporates ScalaDocGlobal with InterativeGlobal, so we have to unwrap DocDefs.
+          case _ => tree
+        }
+        enterImplicitWrapper(defTree.asInstanceOf[ClassDef])
       }
       super.enterExistingSym(sym, tree)
     }
@@ -523,7 +527,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
   /** The current presentation compiler runner */
   @volatile private[interactive] var compileRunner: Thread = newRunnerThread()
 
-  /** Check that the currenyly executing thread is the presentation compiler thread.
+  /** Check that the currently executing thread is the presentation compiler thread.
    *
    *  Compiler initialization may happen on a different thread (signalled by globalPhase being NoPhase)
    */
@@ -1189,7 +1193,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
     }
   }
 
-  /** Parses and enters given source file, stroring parse tree in response */
+  /** Parses and enters given source file, storing parse tree in response */
   private def getParsedEnteredNow(source: SourceFile, response: Response[Tree]) {
     respond(response) {
       onUnitOf(source) { unit =>
diff --git a/src/interactive/scala/tools/nsc/interactive/Pickler.scala b/src/interactive/scala/tools/nsc/interactive/Pickler.scala
index 83f3fab925..ddc0c8a068 100644
--- a/src/interactive/scala/tools/nsc/interactive/Pickler.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Pickler.scala
@@ -6,7 +6,7 @@ import scala.language.implicitConversions
 import scala.reflect.ClassTag
 
 /** An abstract class for writing and reading Scala objects to and
- *  from a legible representation. The presesentation follows the following grammar:
+ *  from a legible representation. The representation follows the following grammar:
  *  {{{
  *  Pickled = `true` | `false` | `null` | NumericLit | StringLit |
  *            Labelled | Pickled `,` Pickled
@@ -85,7 +85,7 @@ abstract class Pickler[T] {
 
 object Pickler {
   /** A base class representing unpickler result. It has two subclasses:
-   *  `UnpickleSucess` for successful unpicklings and `UnpickleFailure` for failures,
+   *  `UnpickleSuccess` for successful unpicklings and `UnpickleFailure` for failures,
    *  where a value of the given type `T` could not be unpickled from input.
    *  @tparam  T the type of unpickled values in case of success.
    */
@@ -154,7 +154,7 @@ object Pickler {
    */
   def pkl[T: Pickler] = implicitly[Pickler[T]]
 
-  /** A class represenenting `~`-pairs */
+  /** A class representing `~`-pairs */
   case class ~[+S, +T](fst: S, snd: T)
 
   /** A wrapper class to be able to use `~` s an infix method */