Skip to content

Commit 94a8cd9

Browse files
abgruszeckimichelou
authored andcommitted
Fix scala#11307 - look up definitions in packages as well
1 parent ba8aae3 commit 94a8cd9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

scaladoc/test/dotty/tools/scaladoc/tasty/comments/MemberLookupTests.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,11 @@ class LookupTestCases[Q <: Quotes](val q: Quotes) {
104104

105105
cls("tests.inner.B") -> "A" -> cls("tests.inner.A$"),
106106

107+
<<<<<<< HEAD
107108
cls("tests.B$") -> "foo" -> cls("tests.BModule").fun("foo"),
108109

110+
=======
111+
>>>>>>> 1c58b4062f (Fix #11307 - look up definitions in packages as well)
109112
cls("tests.D") -> "foo" -> cls("tests.package$").fld("foo"),
110113
cls("tests.D") -> "bar" -> cls("tests.tests$package$").fld("bar"),
111114
cls("tests.inner.A$") -> "foo" -> cls("tests.package$").fld("foo"),

0 commit comments

Comments
 (0)