diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-08-13 08:32:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-13 08:32:41 -0700 |
commit | d6f601d53e53be6f8071c0646c19b68faac69ec0 (patch) | |
tree | 8d8aec4c13199596a8cf04991380fed4fb3b902b /test/files | |
parent | 69c6500b5f25e1b4a66d3a62cf40d23877a9023f (diff) | |
parent | 36732d7a14ab246d9ab6b011a0eafe4115978f19 (diff) | |
download | scala-d6f601d53e53be6f8071c0646c19b68faac69ec0.tar.gz scala-d6f601d53e53be6f8071c0646c19b68faac69ec0.tar.bz2 scala-d6f601d53e53be6f8071c0646c19b68faac69ec0.zip |
Merge pull request #5332 from retronym/review/5304
Fixes to Java source support in Scaladoc
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/pos/t2377b/Q.java | 13 | ||||
-rw-r--r-- | test/files/pos/t2377b/a.scala | 5 |
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 + +} |