macros fixed, gitignore updated

ghik · Mar 8, 2023 · 41b8e2c · 41b8e2c
1 parent 954a194
commit 41b8e2c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,21 @@
+.idea/*
+!.idea/vcs.xml
+!.idea/codeStyleSettings.xml
+!.idea/codeStyles/
+*.iml
+*.iws
+*.ipr
+
+target
+out
+.bloop
+.bsp
+
+*.sjsir
 *.class
+*.diff
+*.orig
+*~
+*.scss.cache
+*.scssc
 *.log
diff --git a/src/main/scala/com/github/ghik/plainsbt/Macros.scala b/src/main/scala/com/github/ghik/plainsbt/Macros.scala
@@ -6,9 +6,15 @@ class Macros(val c: blackbox.Context) {
 
   import c.universe.*
 
+  private def PlainsbtPkg = q"_root_.com.github.ghik.plainsbt"
+
   def discoverProjectsImpl: Tree = {
     val sbtProjectCls = c.mirror.staticClass("_root_.sbt.Project")
-    val rootProjectSym = c.mirror.staticClass("ProjectGroup").toType.member(TermName("root"))
+
+    val rootProjectSym =
+      c.mirror.staticClass("_root_.com.github.ghik.plainsbt.ProjectGroup")
+        .toType.member(TermName("root"))
+
     val ptpe = c.prefix.actualType
 
     val projectRefs =
@@ -25,5 +31,5 @@ class Macros(val c: blackbox.Context) {
   }
 
   def mkFreshProject: Tree =
-    q"FreshProject(_root_.sbt.project)"
+    q"$PlainsbtPkg.FreshProject(_root_.sbt.project)"
 }