refactor out fresh name prefix extraction logic

1. refactor out FreshNameExtractor out of Quasiquotes cake into
   SymbolTable (can’t put it outside due to the fact that names are
   path-dependent)

2. add optional parameter to the fresh name creator to cover additional
   qq$ prefix needed for quasiquotes

3. add unit tests

1 files changed, 2 insertions, 18 deletions

diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala
index 3901184c25..126c14ac81 100644
--- a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala
+++ b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala
@@ -55,9 +55,7 @@ trait Parsers { self: Quasiquotes =>
 
       def isHole(name: Name): Boolean = holeMap.contains(name)
 
-      override implicit def fresh: FreshNameCreator = new FreshNameCreator {
-        override def newName(prefix: String) = super.newName(nme.QUASIQUOTE_PREFIX + prefix)
-      }
+      override implicit def fresh: FreshNameCreator = new FreshNameCreator(nme.QUASIQUOTE_PREFIX)
 
       override val treeBuilder = new ParserTreeBuilder {
         override implicit def fresh: FreshNameCreator = parser.fresh
@@ -189,19 +187,5 @@ trait Parsers { self: Quasiquotes =>
     }
   }
 
-  // Extractor that matches names which were generated by call to
-  // freshTermName or freshTypeName within quasiquotes. Such names
-  // have qq$some$random$prefix$0 shape where qq$ part is added
-  // by modified fresh name creator in QuasiquoteParser.
-  object FreshName {
-    def unapply(name: Name): Option[String] =
-      name.toString.split("\\$").toSeq match {
-        case qq +: (middle :+ last)
-          if qq + "$" == nme.QUASIQUOTE_PREFIX
-          && Try(last.toInt).isSuccess && middle.nonEmpty =>
-          Some(middle.mkString("", "$", "$"))
-        case _ =>
-          None
-      }
-  }
+  object FreshName extends FreshNameExtractor(nme.QUASIQUOTE_PREFIX)
 }
\ No newline at end of file