summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2011-01-26 12:07:07 +0000
committerIulian Dragos <jaguarul@gmail.com>2011-01-26 12:07:07 +0000
commitebafcc4e7cb4734736d6a063d49226f944d74637 (patch)
treee1b6cbce30f6ba1310ed5baa8af36653057e5b2a /test
parentccc81fa54cca9939e0d45487d65b1e317bef91b6 (diff)
downloadscala-ebafcc4e7cb4734736d6a063d49226f944d74637.tar.gz
scala-ebafcc4e7cb4734736d6a063d49226f944d74637.tar.bz2
scala-ebafcc4e7cb4734736d6a063d49226f944d74637.zip
One last attempt at getting the presentation co...
One last attempt at getting the presentation compiler pass some tests. no review.
Diffstat (limited to 'test')
-rw-r--r--test/files/presentation/simple-tests.check6
-rw-r--r--test/files/presentation/simple-tests/SimpleInteractiveTest.scala1
2 files changed, 4 insertions, 3 deletions
diff --git a/test/files/presentation/simple-tests.check b/test/files/presentation/simple-tests.check
index 26ddc0836c..ed972ddcda 100644
--- a/test/files/presentation/simple-tests.check
+++ b/test/files/presentation/simple-tests.check
@@ -1,7 +1,5 @@
reload: Tester.scala
askTypeCompletion at Tester.scala(12,39)
-askTypeCompletion at Tester.scala(23,24)
-askTypeCompletion at Tester.scala(105,29)
================================================================================
[response] aksTypeCompletion at (12,39)
@@ -71,6 +69,7 @@ TypeMember(method withSource,[A](src: scala.tools.nsc.util.SourceFile)(op: => A)
TypeMember(method withoutTruncating,[T](body: => T)T,true,true,<none>)
TypeMember(value x,=> scala.tools.nsc.reporters.StoreReporter,true,false,method any2ArrowAssoc)
TypeMember(value x,scala.tools.nsc.reporters.StoreReporter,false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(23,24)
================================================================================
[response] aksTypeCompletion at (23,24)
@@ -125,6 +124,7 @@ TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
TypeMember(value x,=> scala.tools.nsc.interactive.Response[U],true,false,method any2ArrowAssoc)
TypeMember(value x,scala.tools.nsc.interactive.Response[U],false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(105,29)
================================================================================
[response] aksTypeCompletion at (105,29)
@@ -181,8 +181,8 @@ TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
TypeMember(value x,=> scala.tools.nsc.util.SourceFile,true,false,method any2ArrowAssoc)
TypeMember(value x,scala.tools.nsc.util.SourceFile,false,false,method any2ArrowAssoc)
askTypeAt at Tester.scala(12,14)
-askTypeAt at Tester.scala(13,14)
[response] askTypeAt at (12,14)
private[this] val reporter: scala.tools.nsc.reporters.StoreReporter = new reporters.StoreReporter()
+askTypeAt at Tester.scala(13,14)
[response] askTypeAt at (13,14)
private[this] val compiler: scala.tools.nsc.interactive.Global = new Global(Tester.this.settings, Tester.this.reporter)
diff --git a/test/files/presentation/simple-tests/SimpleInteractiveTest.scala b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala
index 0456f9f5e7..cfadc561ae 100644
--- a/test/files/presentation/simple-tests/SimpleInteractiveTest.scala
+++ b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala
@@ -6,4 +6,5 @@ import scala.tools.nsc.interactive.tests._
*/
object Test extends InteractiveTest {
override val runRandomTests = false
+// override val synchronousRequests = false
}