summaryrefslogtreecommitdiff
path: root/test/files/neg/t7259.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-03-16 16:26:32 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-03-26 09:13:26 +0100
commit7d03dcc45ff3b892bc5db8c9f334697c103e767a (patch)
treed70bba55c0b5540d6cde71dd3620ba5bf23574a4 /test/files/neg/t7259.scala
parent59d4998cf4a19eb5d44118d4867c2370e9a935e5 (diff)
downloadscala-7d03dcc45ff3b892bc5db8c9f334697c103e767a.tar.gz
scala-7d03dcc45ff3b892bc5db8c9f334697c103e767a.tar.bz2
scala-7d03dcc45ff3b892bc5db8c9f334697c103e767a.zip
SI-7259 Fix detection of Java defined Selects
The fix for SI-3120, 3ff7743, introduced a fallback within `typedSelect` that accounted for the ambiguity of a Java selection syntax. Does `A.B` refer to a member of the type `A` or of the companion object `A`? (The companion object here is a fiction used by scalac to group the static members of a Java class.) The fallback in `typedSelect` was predicated on `context.owner.enclosingTopLevelClass.isJavaDefined`. However, this was incorrectly including Select-s in top-level annotations in Scala files, which are owned by the enclosing package class, which is considered to be Java defined. This led to nonsensical error messages ("type scala not found.") Instead, this commit checks the compilation unit of the context, which is more direct and correct. (As I learned recently, `currentUnit.isJavaDefined` would *not* be correct, as a lazy type might complete a Java signature while compiling some other compilation unit!) A bonus post factum test case is included for SI-3120. Manual forward port of f046853 which was not merged as part of the routine 2.10.x to master merge. The test case uncovered a NullPointerExceptiion crasher in annotation typechecking introduced in 5878099c; this has been prevented with a null check. Conflicts: src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/files/neg/t7259.scala')
-rw-r--r--test/files/neg/t7259.scala9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/files/neg/t7259.scala b/test/files/neg/t7259.scala
new file mode 100644
index 0000000000..0fdfe18822
--- /dev/null
+++ b/test/files/neg/t7259.scala
@@ -0,0 +1,9 @@
+@xxxxx // error: not found: type xxxx
+class Ok
+
+//
+// This had the wrong error message in 2.9 and 2.10.
+//
+
+@annotation.xxxxx // error: not found: type scala
+class WrongErrorMessage