Renamed SpellsConfig to SpellsConfigModule.

agilesteel · Nov 9, 2015 · ef9b899 · ef9b899
1 parent 8a86ef8
commit ef9b899
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 39 deletions.
diff --git a/src/main/scala/spells/CustomRendering.scala b/src/main/scala/spells/CustomRendering.scala
@@ -4,7 +4,7 @@ trait CustomRendering {
   implicit def rendered(implicit availableWidthInCharacters: CustomRendering.AvailableWidthInCharacters = CustomRendering.Defaults.AvailableWidthInCharacters): String
 }
 
-object CustomRendering extends SpellsConfig {
+object CustomRendering extends SpellsConfigModule with AnsiModule {
   object Defaults {
     object Any extends (Any => CustomRendering) {
       final def apply(any: Any): CustomRendering = new CustomRendering {

diff --git a/src/main/scala/spells/LocationAwareConfig.scala b/src/main/scala/spells/LocationAwareConfig.scala
@@ -3,7 +3,9 @@ package spells
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory._
 
-private[spells] trait LocationAwareConfig extends AnsiModule {
+private[spells] trait LocationAwareConfig {
+  this: AnsiModule =>
+
   spellsConfig.checkValid(defaultReference(), "spells")
 
   implicit final lazy val spellsConfig: Config = loadSpellsConfig

diff --git a/src/main/scala/spells/LocationAwareProperty.scala b/src/main/scala/spells/LocationAwareProperty.scala
@@ -6,8 +6,7 @@ private[spells] abstract class LocationAwareProperty[T](implicit materialised: (
   private[spells] final lazy val location: String =
     scala.reflect.NameTransformer
       .decode(getClass.getName)
-      .replace("spells.SpellsConfig$", "")
-      .replace("SpellsConfig$", "spells.")
+      .replace("SpellsConfigModule$SpellsConfig$", "")
       .split('$')
       .mkString(".")
 

diff --git a/src/main/scala/spells/SpellsConfig.scala b/src/main/scala/spells/SpellsConfig.scala
diff --git a/src/main/scala/spells/SpellsModule.scala b/src/main/scala/spells/SpellsModule.scala
@@ -11,7 +11,7 @@ trait SpellsModule
   with ErrorPrintModule
   with HumanRenderingModule
   with MiscModule
-  with SpellsConfig
+  with SpellsConfigModule
   with StringOpsModule
   with StylePrintModule
   with TraversableOpsModule

diff --git a/src/main/scala/spells/XRayModule.scala b/src/main/scala/spells/XRayModule.scala
@@ -4,7 +4,7 @@ import java.util.Calendar
 import scala.concurrent.duration._
 
 trait XrayModule {
-  this: AnsiModule with AnyOpsModule with CalendarOpsModule with DateOpsModule with DurationOpsModule with HumanRenderingModule with StringOpsModule with StylePrintModule with TraversableOpsModule with SpellsConfig =>
+  this: AnsiModule with AnyOpsModule with CalendarOpsModule with DateOpsModule with DurationOpsModule with HumanRenderingModule with StringOpsModule with StylePrintModule with TraversableOpsModule with SpellsConfigModule =>
 
   final def xrayed[T](expression: => T, description: XrayModule#Description = Xray.Defaults.Description, increaseStackTraceDepthBy: Int = 0)(implicit manifest: Manifest[T], style: AnsiModule.Style = Reset, rendering: T => CustomRendering = CustomRendering.Defaults.Any): XrayModule#XrayReport[T] = {
     val stackTraceElement = currentLineStackTraceElement(increaseStackTraceDepthBy - 1)