Skip to content

fix: Location not working for cross-assembly compilations #20

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

Merged
glennawatson merged 2 commits into from
Jul 20, 2021
Merged

fix: Location not working for cross-assembly compilations #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc79da2
fix: Location not working for cross-assembly compilatins
glennawatson Jul 20, 2021
3ec171c
Remove unneeded using statement
glennawatson Jul 20, 2021
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
21 changes: 19 additions & 2 deletions src/Splat.DependencyInjection.SourceGenerator/MetadataDependencyChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Linq;

using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;

using ReactiveMarbles.RoslynHelpers;

Expand Down Expand Up @@ -43,10 +44,12 @@ public static List<MethodMetadata> CheckMetadata(GeneratorExecutionContext conte
{
if (childConstructor.TypeName == metadataMethod.InterfaceTypeName)
{
var location = childConstructor.Parameter.GetLocation(metadataMethod.MethodInvocation);

context.ReportDiagnostic(
Diagnostic.Create(
DiagnosticWarnings.ConstructorsMustNotHaveCircularDependency,
childConstructor.Parameter.Locations.FirstOrDefault(x => x is not null) ?? metadataMethod.MethodInvocation.GetLocation()));
location));
isError = true;
}
}
Expand All @@ -65,10 +68,12 @@ public static List<MethodMetadata> CheckMetadata(GeneratorExecutionContext conte

if (metadataDependencies.TryGetValue(lazyType.ToDisplayString(RoslynCommonHelpers.TypeFormat), out dependencyMethod) && !dependencyMethod.IsLazy)
{
var location = constructorDependency.Parameter.GetLocation(metadataMethod.MethodInvocation);

context.ReportDiagnostic(
Diagnostic.Create(
DiagnosticWarnings.LazyParameterNotRegisteredLazy,
constructorDependency.Parameter.Locations.FirstOrDefault(x => x is not null) ?? metadataMethod.MethodInvocation.GetLocation(),
location,
metadataMethod.ConcreteTypeName,
constructorDependency.Parameter.Name));
isError = true;
Expand All @@ -84,5 +89,17 @@ public static List<MethodMetadata> CheckMetadata(GeneratorExecutionContext conte

return methods;
}

private static Location GetLocation(this ISymbol symbol, InvocationExpressionSyntax backupInvocation)
{
var location = symbol.Locations.FirstOrDefault();

if (location?.Kind != LocationKind.SourceFile)
{
location = backupInvocation.GetLocation();
}

return location;
}
}
}
17 changes: 9 additions & 8 deletions ...plat.DependencyInjection.SourceGenerator/Splat.DependencyInjection.SourceGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<DevelopmentDependency>true</DevelopmentDependency>
<IncludeBuildOutput>false</IncludeBuildOutput>
<!-- forces SDK to copy dependencies into build output to make packing easier -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<PackageDescription>Produces DI registration for both property and constructor injection using the Splat locators.</PackageDescription>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
<NoWarn>$(NoWarn);AD0001</NoWarn>
<BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder>
<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
<PackageReference Include="ReactiveMarbles.RoslynHelpers" Version="1.0.9" PrivateAssets="all" />
<PackageReference Include="ReactiveMarbles.RoslynHelpers" GeneratePathProperty="true" Version="1.0.9" PrivateAssets="all" />
</ItemGroup>

<Target Name="PackBuildOutputs">
<PropertyGroup>
</PropertyGroup>

<Target Name="GetDependencyTargetPaths">
<ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)\**\*" PackagePath="analyzers/dotnet/cs" Visible="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGReactiveMarbles_RoslynHelpers)\lib\netstandard2.0\ReactiveMarbles.RoslynHelpers.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
</Target>
</Project>