Merge remote-tracking branch 'upstream/master' into dotty-community-build

Author: anatoliykmetyuk

README.md

@@ -2,8 +2,8 @@ SourceCode [![Build Status](https://travis-ci.org/lihaoyi/sourcecode.svg?branch=
 ==========
 
 ```scala
-"com.lihaoyi" %% "sourcecode" % "0.1.7" // Scala-JVM
-"com.lihaoyi" %%% "sourcecode" % "0.1.7" // Scala.js / Scala Native
+"com.lihaoyi" %% "sourcecode" % "0.1.9" // Scala-JVM
+"com.lihaoyi" %%% "sourcecode" % "0.1.9" // Scala.js / Scala Native
 ```
 
 `sourcecode` is a small Scala library for that provides common "source code"
@@ -228,8 +228,8 @@ object Implicits {
 }
 ```
 
-By default, the various implicits all ignore any synthetic `<init>` or 
-`<local Foo>` methods that might be present:
+By default, the various implicits all ignore any synthetic `<init>`,  
+`<local Foo>` or `$anonfun` methods that might be present:
 
 ```scala
 package sourcecode
@@ -620,6 +620,11 @@ in its `.toString` method.
 Version History
 ===============
 
+0.1.9
+-----
+
+- `$anonfun` segments are now ignored by `sourcecode.Enclosing`
+
 0.1.8
 -----
 

build.sc

@@ -4,7 +4,7 @@ import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
 trait SourcecodeModule extends PublishModule {
   def artifactName = "sourcecode"
 
-  def publishVersion = "0.1.8"
+  def publishVersion = "0.2.0"
 
   def pomSettings = PomSettings(
     description = artifactName(),
@@ -64,8 +64,7 @@ trait SourcecodeTestModule extends ScalaModule {
 }
 
 object sourcecode extends Module {
-  val dottyVersion = Option(sys.props("dottyVersion"))
-  object jvm extends Cross[JvmSourcecodeModule]((List("2.11.12", "2.12.8", "2.13.0") ++ dottyVersion): _*)
+  object jvm extends Cross[JvmSourcecodeModule]("2.11.12", "2.12.10", "2.13.1", "0.21.0-RC1")
   class JvmSourcecodeModule(val crossScalaVersion: String)
     extends SourcecodeMainModule with ScalaModule with SourcecodeModule {
 
@@ -86,7 +85,8 @@ object sourcecode extends Module {
   }
 
   object js extends Cross[JsSourcecodeModule](
-    ("2.11.12", "0.6.28"), ("2.12.8", "0.6.28"), ("2.13.0", "0.6.28")/*, ("2.12.8", "1.0.0-M8"), ("2.13.0", "1.0.0-M8")*/
+    ("2.11.12", "0.6.28"), ("2.12.10", "0.6.28"), ("2.13.1", "0.6.28"),
+    ("2.11.12", "1.0.0-RC2"), ("2.12.10", "1.0.0-RC2"), ("2.13.1", "1.0.0-RC2")
   )
   class JsSourcecodeModule(val crossScalaVersion: String, crossJSVersion: String)
     extends SourcecodeMainModule with ScalaJSModule with SourcecodeModule {
@@ -117,4 +117,4 @@ object sourcecode extends Module {
       val crossScalaVersion = NativeSourcecodeModule.this.crossScalaVersion
     }
   }
-}
+}

mill

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.5.0
+DEFAULT_MILL_VERSION=0.5.7
 
 set -e
 
@@ -17,13 +17,24 @@ if [ -z "$MILL_VERSION" ] ; then
   fi
 fi
 
-MILL_DOWNLOAD_PATH="$HOME/.mill/download"
-MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION"
+if [ "x${XDG_CACHE_HOME}" != "x" ] ; then
+  MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
+else
+  MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
+fi
+MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
+
+version_remainder="$MILL_VERSION"
+MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
+MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 
 if [ ! -x "$MILL_EXEC_PATH" ] ; then
   mkdir -p $MILL_DOWNLOAD_PATH
+  if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
+    ASSEMBLY="-assembly"
+  fi
   DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
-  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION-assembly"
+  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
   curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
   chmod +x "$DOWNLOAD_FILE"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"

sourcecode/src-0/sourcecode/Macros.scala

@@ -67,7 +67,7 @@ trait ArgsMacros {
 object Util{
   def isSynthetic(c: Reflection)(s: c.Symbol) = isSyntheticName(getName(c)(s))
   def isSyntheticName(name: String) = {
-    name == "<init>" || (name.startsWith("<local ") && name.endsWith(">"))
+    name == "<init>" || (name.startsWith("<local ") && name.endsWith(">")) || name == "$anonfun"
   }
   def getName(c: Reflection)(s: c.Symbol) = {
     import c.given

sourcecode/src-2/sourcecode/Macros.scala

@@ -54,7 +54,7 @@ trait ArgsMacros {
 object Util{
   def isSynthetic(c: Compat.Context)(s: c.Symbol) = isSyntheticName(getName(c)(s))
   def isSyntheticName(name: String) = {
-    name == "<init>" || (name.startsWith("<local ") && name.endsWith(">"))
+    name == "<init>" || (name.startsWith("<local ") && name.endsWith(">")) || name == "$anonfun"
   }
   def getName(c: Compat.Context)(s: c.Symbol) = s.name.decoded.toString.trim
 }

sourcecode/test/src/sourcecode/Apply.scala

@@ -24,7 +24,11 @@ object Apply {
     assert(line == 23)
 
     lazy val myLazy = {
-      trait Bar{
+      /* Bar used to be a trait, but that ran into the upstream bug
+       * https://github.com/scala-js/scala-js/issues/3918 in Scala.js 1.0.0-RC2
+       * and Scala 2.12+. We use an abstract class as a workaround.
+       */
+      abstract class Bar{
         val name = sourcecode.Name()
         assert(name == "name")
 
@@ -38,7 +42,7 @@ object Apply {
         assert(fileName == "Apply.scala")
 
         val line = sourcecode.Line()
-        assert(line == 40)
+        assert(line == 44)
 
         val enclosing = sourcecode.Enclosing()
         assert(

sourcecode/test/src/sourcecode/Implicits.scala

@@ -24,7 +24,11 @@ object Implicits {
     assert(line.value == 23)
 
     lazy val myLazy = {
-      trait Bar{
+      /* Bar used to be a trait, but that ran into the upstream bug
+       * https://github.com/scala-js/scala-js/issues/3918 in Scala.js 1.0.0-RC2
+       * and Scala 2.12+. We use an abstract class as a workaround.
+       */
+      abstract class Bar{
         val name = implicitly[sourcecode.Name]
         assert(name.value == "name")
 
@@ -41,7 +45,7 @@ object Implicits {
         assert(fileName.value == "Implicits.scala")
 
         val line = implicitly[sourcecode.Line]
-        assert(line.value == 43)
+        assert(line.value == 47)
 
         val enclosing = implicitly[sourcecode.Enclosing]
         assert(

sourcecode/test/src/sourcecode/NoSynthetic.scala

@@ -13,6 +13,13 @@ object NoSynthetic {
       assert(sourcecode.Name() == "Bar")
       assert(sourcecode.FullName() == "sourcecode.NoSynthetic.Bar")
       assert(sourcecode.Enclosing() == "sourcecode.NoSynthetic.run Bar")
+      assert(
+        (for {
+          _ <- Option(1)
+          _ <- Option(2)
+          foo <- Option(sourcecode.Enclosing())
+        } yield foo) == Some("sourcecode.NoSynthetic.run Bar")
+      )
     }
     Bar
   }