Merge commit '7c1d114' into merge-2.10.x-to-master

Conflicts:
	src/compiler/scala/tools/nsc/interactive/Global.scala

Author: retronym

src/interactive/scala/tools/nsc/interactive/Global.scala

@@ -327,7 +327,12 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
    *  @param  result   The transformed node
    */
   override def signalDone(context: Context, old: Tree, result: Tree) {
-    if (interruptsEnabled && analyzer.lockedCount == 0) {
+    val canObserveTree = (
+         interruptsEnabled
+      && analyzer.lockedCount == 0
+      && !context.bufferErrors // SI-7558 look away during exploratory typing in "silent mode"
+    )
+    if (canObserveTree) {
       if (context.unit.exists &&
           result.pos.isOpaqueRange &&
           (result.pos includes context.unit.targetPos)) {
@@ -338,14 +343,16 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
         }
         throw new TyperResult(located)
       }
-      try {
-        checkForMoreWork(old.pos)
-      } catch {
-        case ex: ValidateException => // Ignore, this will have been reported elsewhere
-          debugLog("validate exception caught: "+ex)
-        case ex: Throwable =>
-          log.flush()
-          throw ex
+      else {
+        try {
+          checkForMoreWork(old.pos)
+        } catch {
+          case ex: ValidateException => // Ignore, this will have been reported elsewhere
+            debugLog("validate exception caught: "+ex)
+          case ex: Throwable =>
+            log.flush()
+            throw ex
+        }
       }
     }
   }

test/files/presentation/t7548.check

@@ -0,0 +1 @@
+(x: Int)Unit

test/files/presentation/t7548/Test.scala

@@ -0,0 +1,17 @@
+import scala.tools.nsc.interactive.tests.InteractiveTest
+
+object Test extends InteractiveTest {
+  override protected def loadSources() { /* don't parse or typecheck sources */ }
+
+  import compiler._
+
+  override def runDefaultTests() {
+    val res = new Response[Tree]
+    val pos = compiler.rangePos(sourceFiles.head, 102,102,102)
+    compiler.askTypeAt(pos, res)
+    res.get match {
+      case Left(tree) => compiler.ask(() => reporter.println(tree.tpe))
+      case Right(ex) => reporter.println(ex)
+    }
+  }
+}

test/files/presentation/t7548/src/Foo.scala

@@ -0,0 +1,7 @@
+object Foo {
+  def foo(x: Int) = {}
+  def foo(x: String) = {}
+  def foo(x: Int, y: String) = {}
+  
+  foo(2)
+}

test/files/presentation/t7548b.check

@@ -0,0 +1 @@
+Foo.this.I2BI(Foo.this.I).+: (other: Foo.BI.type)Unit

test/files/presentation/t7548b/Test.scala

@@ -0,0 +1,17 @@
+import scala.tools.nsc.interactive.tests.InteractiveTest
+
+object Test extends InteractiveTest {
+  override protected def loadSources() { /* don't parse or typecheck sources */ }
+
+  import compiler._
+
+  override def runDefaultTests() {
+    val res = new Response[Tree]
+    val pos = compiler.rangePos(sourceFiles.head, 191, 191, 191) // +
+    compiler.askTypeAt(pos, res)
+    res.get match {
+      case Left(tree) => compiler.ask(() => reporter.println(s"$tree: ${tree.tpe}"))
+      case Right(ex) => reporter.println(ex)
+    }
+  }
+}

test/files/presentation/t7548b/src/Foo.scala

@@ -0,0 +1,12 @@
+import language._
+
+object Foo {
+  object I { 
+    def +(other: I.type) : Unit = ()
+  }
+  object BI {
+    def +(other: BI.type): Unit = ()
+  }
+  implicit def I2BI(i: I.type): BI.type = BI
+  I.+(BI)
+}