Move some shared definitions back to src/main/scala/

com-lihaoyi · Feb 4, 2021 · 6208f80 · 6208f80
1 parent a15c08f
commit 6208f80
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/amm/compiler/src/main/scala-2/ammonite/compiler/AmmonitePlugin.scala b/amm/compiler/src/main/scala-2/ammonite/compiler/AmmonitePlugin.scala
@@ -84,30 +84,15 @@ object AmmonitePlugin{
       val sym = t.symbol
       (sym.isType, sym.decodedName, sym.decodedName, Seq())
     }
-    val ignoredSyms = Set(
-      "package class-use",
-      "object package-info",
-      "class package-info"
-    )
-    val ignoredNames = Set(
-      // Probably synthetic
-      "<init>",
-      "<clinit>",
-      "$main",
-      // Don't care about this
-      "toString",
-      // Behaves weird in 2.10.x, better to just ignore.
-      "_"
-    )
     def saneSym(sym: g.Symbol): Boolean = {
       !sym.name.decoded.contains('$') &&
       sym.exists &&
       !sym.isSynthetic &&
       !sym.isPrivate &&
       !sym.isProtected &&
       sym.isPublic &&
-      !ignoredSyms(sym.toString) &&
-      !ignoredNames(sym.name.decoded)
+      !CompilerUtil.ignoredSyms(sym.toString) &&
+      !CompilerUtil.ignoredNames(sym.name.decoded)
     }
 
     val stats = {
@@ -272,7 +257,7 @@ object AmmonitePlugin{
 
     val open = for {
       ((fromName, toName, importString), items) <- grouped
-      if !ignoredNames(fromName)
+      if !CompilerUtil.ignoredNames(fromName)
     } yield {
       val importType = items match{
         case Seq(true) => ImportData.Type

diff --git a/amm/compiler/src/main/scala/ammonite/compiler/CompilerUtil.scala b/amm/compiler/src/main/scala/ammonite/compiler/CompilerUtil.scala
@@ -0,0 +1,21 @@
+package ammonite.compiler
+
+object CompilerUtil {
+
+  val ignoredSyms = Set(
+    "package class-use",
+    "object package-info",
+    "class package-info"
+  )
+  val ignoredNames = Set(
+    // Probably synthetic
+    "<init>",
+    "<clinit>",
+    "$main",
+    // Don't care about this
+    "toString",
+    // Behaves weird in 2.10.x, better to just ignore.
+    "_"
+  )
+
+}