summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-08-09 16:18:16 -0700
committerJason Zaugg <jzaugg@gmail.com>2016-08-13 13:25:34 +1000
commit4e822d74be9c21377189428ca474ec990af6cc87 (patch)
treec7fc4bcb478cf6d1838b5807a720f33a73768aba /test
parent4b77734b28f82e2573446bd997e739b80de4af1d (diff)
downloadscala-4e822d74be9c21377189428ca474ec990af6cc87.tar.gz
scala-4e822d74be9c21377189428ca474ec990af6cc87.tar.bz2
scala-4e822d74be9c21377189428ca474ec990af6cc87.zip
Javadoc: java static name resolution
[Jakob Odersky <jodersky@gmail.com>: remove obsolete comments and fix tests]
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/t2377b/Q.java13
-rw-r--r--test/files/pos/t2377b/a.scala5
2 files changed, 18 insertions, 0 deletions
diff --git a/test/files/pos/t2377b/Q.java b/test/files/pos/t2377b/Q.java
new file mode 100644
index 0000000000..fbf9c776e9
--- /dev/null
+++ b/test/files/pos/t2377b/Q.java
@@ -0,0 +1,13 @@
+public class Q {
+
+ public static class Builder {}
+
+ public static class Inner {
+ public static class Builder { public void innerMethod() {} }
+ public Builder foo() { return new Builder(); } // this line gives an error, that Builder is ambiguous
+
+ public Inner.Builder viaSelect() { return new Builder(); } // this line gives an error, that Builder is ambiguous
+ }
+
+}
+
diff --git a/test/files/pos/t2377b/a.scala b/test/files/pos/t2377b/a.scala
new file mode 100644
index 0000000000..3053841589
--- /dev/null
+++ b/test/files/pos/t2377b/a.scala
@@ -0,0 +1,5 @@
+object Test {
+ (new Q.Inner).foo.innerMethod
+ (new Q.Inner).viaSelect.innerMethod
+
+}