Make use of FlavorBinder#scope when injecting into fields

GrowlyX · Jan 2, 2022 · f2c883b · f2c883b
1 parent a229883
commit f2c883b
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/main/kotlin/gg/scala/flavor/Flavor.kt b/src/main/kotlin/gg/scala/flavor/Flavor.kt
@@ -96,7 +96,7 @@ class Flavor(
         }
     }
 
-    fun tracked(lambda: () -> Unit): Long
+    private fun tracked(lambda: () -> Unit): Long
     {
         val start = System.currentTimeMillis()
         lambda.invoke()
@@ -106,8 +106,15 @@ class Flavor(
 
     private fun scanAndInject(clazz: KClass<*>, instance: Any? = null)
     {
-        val singleton = instance ?: InjectScope.SINGLETON
-            .instanceCreator.invoke(clazz)
+        val singletonRaw = try
+        {
+            InjectScope.SINGLETON
+                .instanceCreator.invoke(clazz)
+        } catch (exception: Exception)
+        {
+            null
+        }
+        val singleton = instance ?: singletonRaw!!
 
         for (field in clazz.java.fields)
         {
@@ -138,6 +145,14 @@ class Flavor(
                 val accessability = field.isAccessible
 
                 binder?.let {
+                    if (binder.scope == InjectScope.SINGLETON)
+                    {
+                        if (singletonRaw == null)
+                        {
+                            return@let
+                        }
+                    }
+
                     field.isAccessible = false
                     field.set(singleton, it.instance)
                     field.isAccessible = accessability