Fixed evaluation of constructor parameter with Scala 2.10

Author: Benjamin Hagemeister

README.md

@@ -492,23 +492,6 @@ def foo(bar: String, baz: Int)(p: Boolean): Unit = {
 foo("baz", 42)(true) // foo(bar=baz, baz=42)(p=true)
 ```
 
-Please note, that it's currently not possible to access the arguments passed
-to a constructor if you are using Scala 2.10, e.g. the following code will 
-work as expected with 2.11, but _not_ with 2.10:
-```scala
-def debug(implicit name: sourcecode.Name, args: sourcecode.Args): Unit = {
-  println(name.value + args.value.map(_.map(a => a.source + "=" + a.value).mkString("(", ", ", ")")).mkString(""))
-}
-
-class Foo(arg1: String, arg2: Int) {
-  debug
-}
-
-new Foo("bar", 42)
-```
-
-For 2.10 `sourcecode.Args.value will be an empty list.`
-
 Embedding Domain-Specific Languages
 -----------------------------------
 

build.sbt

@@ -22,10 +22,6 @@ lazy val sourcecode = crossProject.settings(
     if (scalaVersion.value startsWith "2.10.") Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.10")
     else Seq(baseDirectory.value / ".."/"shared" / "src" / "main" / "scala-2.11")
   },
-  unmanagedSourceDirectories in Test ++= {
-    if (scalaVersion.value startsWith "2.10.") Seq(baseDirectory.value / ".."/"shared"/"src"/ "test" / "scala-2.10")
-    else Seq(baseDirectory.value / ".."/"shared" / "src" / "test" / "scala-2.11")
-  },
   publishTo := Some("releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
 
   pomExtra :=

sourcecode/shared/src/main/scala-2.10/sourcecode/Compat.scala

@@ -15,6 +15,11 @@ object Compat{
       if (owner.isMethod || owner.isClass) owner else nearestClassOrMethod(owner.owner)
 
     val com = nearestClassOrMethod(enclosingOwner(c))
-    if (com.isClass) List() else com.asMethod.paramss
+    if (com.isClass) {
+      val pc = com.typeSignature.members.filter(m => m.isMethod && m.asMethod.isPrimaryConstructor)
+      pc.head.asMethod.paramss
+    } else {
+      com.asMethod.paramss
+    }
   }
 }

sourcecode/shared/src/test/scala-2.10/sourcecode/ArgsPrimaryConstructorTests.scala

@@ -27,13 +27,17 @@ object ArgsTests {
     }
 
     class Foo(p1: String, p2: Long, p3: Boolean)(foo: String, bar: String) {
+      debug
 
       def this(p1: String, p2: Long) = {
         this(p1, p2, false)("foo", "bar")
         debug
       }
     }
 
+    new Foo("text", 42, false)("foo", "bar")
+    assert(args == Seq(Seq("p1" -> "text", "p2" -> 42, "p3" -> false), Seq("foo" -> "foo", "bar" -> "bar")))
+
     new Foo("text", 42)
     assert(args == Seq(Seq("p1" -> "text", "p2" -> 42)))
 

sourcecode/shared/src/test/scala-2.11/sourcecode/ArgsPrimaryConstructorTests.scala

@@ -21,7 +21,6 @@ object Tests{
     ManualImplicit()
     TextTests()
     ArgsTests()
-    ArgsPrimaryConstructorTests()
 
     println("================LogExample================")
     logExample()