Skip to content
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

Non transient value type error #163

Merged
merged 8 commits into from
Dec 23, 2023
Merged

Non transient value type error #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3daba2d
Scoped value type compile error Unit test
AlonTalmi Dec 17, 2023
f7ad3b8
Fix scoped value type resolve
AlonTalmi Dec 17, 2023
0db9065
Merge remote-tracking branch 'origin/main' into FixScopedValueType
AlonTalmi Dec 20, 2023
21833e0
Support rename
AlonTalmi Dec 20, 2023
6f40196
Better describe the issue
AlonTalmi Dec 20, 2023
2061648
Fix spacing
AlonTalmi Dec 23, 2023
a8cb822
Replace default with null and remove !
AlonTalmi Dec 23, 2023
105bebf
Merge branch 'pakrym:main' into NonTransientValueTypeError
AlonTalmi Dec 23, 2023
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
15 changes: 15 additions & 0 deletions src/Jab.FunctionalTests.Common/ContainerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,21 @@ public void SupportsNamedServices()
internal partial class SupportsNamedServicesContainer
{
}

[Fact]
public void SupportsNoneTransientValueType()
{
SupportsNoneTransientValueTypeContainer c = new();
Assert.IsType<int>(c.GetService<int>());
Assert.IsType<float>(c.GetService<float>());
}

[ServiceProvider]
[Scoped(typeof(int))]
[Singleton(typeof(float))]
internal partial class SupportsNoneTransientValueTypeContainer
{
}
}
}

Expand Down
13 changes: 10 additions & 3 deletions src/Jab/ContainerGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ private void GenerateCallSiteWithCache(CodeWriter codeWriter, string rootReferen
if (serviceCallSite.Lifetime != ServiceLifetime.Transient)
{
var cacheLocation = GetCacheLocation(serviceCallSite.Identity);
codeWriter.Line($"if ({cacheLocation} == default)");
codeWriter.Line($"if ({cacheLocation} == null)");
codeWriter.Line($"lock (this)");
using (codeWriter.Scope($"if ({cacheLocation} == default)"))
using (codeWriter.Scope($"if ({cacheLocation} == null)"))
{
GenerateCallSite(
codeWriter,
Expand All @@ -38,7 +38,14 @@ private void GenerateCallSiteWithCache(CodeWriter codeWriter, string rootReferen
});
}

valueCallback(codeWriter, w => w.Append($"{cacheLocation}"));
if (serviceCallSite.ImplementationType.IsValueType)
{
valueCallback(codeWriter, w => w.Append($"{cacheLocation}.Value"));
}
else
{
valueCallback(codeWriter, w => w.Append($"{cacheLocation}"));
}
}
else if (serviceCallSite.IsDisposable != false)
{
Expand Down
Loading