summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-03-20 16:08:34 -0700
committerJames Iry <jamesiry@gmail.com>2013-03-20 16:08:34 -0700
commit241c8c0b6f79436e7cd53b28a18d1db6d2b6b5bb (patch)
tree53f661c888dea0ebcceb225e8ef2fb41df1d3de0 /test/files/pos
parentbbd69f5dd1d5b7eb6a90aa7d59df9c491d112d4d (diff)
parentf0468537e8b95d15b81f3480ae24555ddb029d36 (diff)
downloadscala-241c8c0b6f79436e7cd53b28a18d1db6d2b6b5bb.tar.gz
scala-241c8c0b6f79436e7cd53b28a18d1db6d2b6b5bb.tar.bz2
scala-241c8c0b6f79436e7cd53b28a18d1db6d2b6b5bb.zip
Merge pull request #2269 from retronym/ticket/7259
SI-7259 Fix detection of Java defined Selects
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t3120/J1.java4
-rw-r--r--test/files/pos/t3120/J2.java4
-rw-r--r--test/files/pos/t3120/Q.java3
-rw-r--r--test/files/pos/t3120/Test.scala3
4 files changed, 14 insertions, 0 deletions
diff --git a/test/files/pos/t3120/J1.java b/test/files/pos/t3120/J1.java
new file mode 100644
index 0000000000..12b23c1c98
--- /dev/null
+++ b/test/files/pos/t3120/J1.java
@@ -0,0 +1,4 @@
+class J1 {
+ public class Inner1 { }
+ public static class Inner2 { }
+}
diff --git a/test/files/pos/t3120/J2.java b/test/files/pos/t3120/J2.java
new file mode 100644
index 0000000000..db6e859020
--- /dev/null
+++ b/test/files/pos/t3120/J2.java
@@ -0,0 +1,4 @@
+public class J2 {
+ public void f1(J1.Inner1 p) { }
+ public void f2(J1.Inner2 p) { }
+}
diff --git a/test/files/pos/t3120/Q.java b/test/files/pos/t3120/Q.java
new file mode 100644
index 0000000000..fe2269308a
--- /dev/null
+++ b/test/files/pos/t3120/Q.java
@@ -0,0 +1,3 @@
+public class Q {
+ public static void passInner(J1.Inner1 myInner) {}
+}
diff --git a/test/files/pos/t3120/Test.scala b/test/files/pos/t3120/Test.scala
new file mode 100644
index 0000000000..c02146fba1
--- /dev/null
+++ b/test/files/pos/t3120/Test.scala
@@ -0,0 +1,3 @@
+object Test {
+ Q.passInner(null)
+}