Skip to content

Refactor: Separate AutoInject from SetContainer build callback #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asdqwe02 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −5
Open

Refactor: Separate AutoInject from SetContainer build callback #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ public void Build()
// ReSharper disable once PossibleNullReferenceException
Parent.Container.CreateScope(builder =>
{
builder.RegisterBuildCallback(SetContainer);
builder.ApplicationOrigin = this;
builder.Diagnostics = VContainerSettings.DiagnosticsEnabled ? DiagnositcsContext.GetCollector(scopeName) : null;
InstallTo(builder);
Expand All @@ -215,7 +214,6 @@ public void Build()
ApplicationOrigin = this,
Diagnostics = VContainerSettings.DiagnosticsEnabled ? DiagnositcsContext.GetCollector(scopeName) : null,
};
builder.RegisterBuildCallback(SetContainer);
InstallTo(builder);
builder.Build();
}
Expand All @@ -226,7 +224,6 @@ public void Build()
void SetContainer(IObjectResolver container)
{
Container = container;
AutoInjectAll();
}

public TScope CreateChild<TScope>(IInstaller installer = null, string childScopeName = null)
Expand Down Expand Up @@ -287,8 +284,8 @@ public TScope CreateChildFromPrefab<TScope>(TScope prefab, Action<IContainerBuil

void InstallTo(IContainerBuilder builder)
{
builder.RegisterBuildCallback(SetContainer);
Configure(builder);

foreach (var installer in localExtraInstallers)
{
installer.Install(builder);
Expand All @@ -304,6 +301,7 @@ void InstallTo(IContainerBuilder builder)
}

builder.RegisterInstance<LifetimeScope>(this).AsSelf();
builder.RegisterBuildCallback(AutoInjectAll);
EntryPointsBuilder.EnsureDispatcherRegistered(builder);
}

Expand Down Expand Up @@ -356,7 +354,7 @@ LifetimeScope GetRuntimeParent()
return null;
}

void AutoInjectAll()
void AutoInjectAll(IObjectResolver container)
{
if (autoInjectGameObjects == null)
return;
Expand Down