summaryrefslogtreecommitdiff
path: root/test/files/presentation/t8085/src/nodescala/package.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-12-17 17:47:15 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-12-18 14:29:17 +0100
commit7e85b595502974bebf2f2625c6bc3645f0d3ab27 (patch)
tree842325683b4d5458e1ae639718a75c3bc32d25f7 /test/files/presentation/t8085/src/nodescala/package.scala
parenta12dd9c3b6fb4a767eec8f6d3bf0a9a2266eff85 (diff)
downloadscala-7e85b595502974bebf2f2625c6bc3645f0d3ab27.tar.gz
scala-7e85b595502974bebf2f2625c6bc3645f0d3ab27.tar.bz2
scala-7e85b595502974bebf2f2625c6bc3645f0d3ab27.zip
SI-8085 Fix BrowserTraverser for package objects
A source file like: import foo.bar package object baz Is parsed into: package <empty> { import foo.bar package baz { object `package` } } A special case in Namers compensates by adjusting the owner of `baz` to be `<root>`, rather than `<empty>`. This wasn't being accounted for in `BrowserTraverser`, which underpins `-sourcepath`, and allows the presentation compiler to load top level symbols from sources outside those passes as the list of sources to compile. This bug did not appear in sources like: package p1 package object p2 { ... } ... because the parser does not wrap this in the `package <empty> {}` This goes some way to explaining why it has gone unnoticed for so long.
Diffstat (limited to 'test/files/presentation/t8085/src/nodescala/package.scala')
-rw-r--r--test/files/presentation/t8085/src/nodescala/package.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/files/presentation/t8085/src/nodescala/package.scala b/test/files/presentation/t8085/src/nodescala/package.scala
index 6e9d4b729a..26fb9f08e4 100644
--- a/test/files/presentation/t8085/src/nodescala/package.scala
+++ b/test/files/presentation/t8085/src/nodescala/package.scala
@@ -1,8 +1,7 @@
-import scala.concurrent.Future // <-- if you move the import *inside* the package object, then it all works fine!!
+import scala.Some // <-- if you move the import *inside* the package object, then it all works fine!!
package object nodescala {
- implicit class FutureCompanionOps[T](val f: Future.type) extends AnyVal {
- def always[T](value: T): Future[T] = Promise[T].success(value).future
+ implicit class StringOps(val f: String) {
+ def rich = 0
}
}
-