Skip to content

Refactor to support RS1038 #216

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
merged 16 commits into from
Oct 13, 2024
Merged

Refactor to support RS1038 #216

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f3cdd5
Quick refactor to support RS1038
rjmurillo Oct 8, 2024
5e40fae
Merge branch 'main' into feature/rs1038-resolution
rjmurillo Oct 8, 2024
172268b
Ensure the code fixes are also packaged in the NuGet
rjmurillo Oct 8, 2024
775aa71
Remove tabs and fix indentation
rjmurillo Oct 8, 2024
948ce3c
Remove unnecessary using statements
rjmurillo Oct 8, 2024
ad79a74
Update namespace of code fix to align with new project structure
rjmurillo Oct 8, 2024
d934c48
Fix for CS1574
rjmurillo Oct 8, 2024
428dac6
Fixes for SA1503
rjmurillo Oct 8, 2024
9bcc8c9
Add SquiggleCop baseline for Moq.CodeFixes project
rjmurillo Oct 8, 2024
e8ff90d
Update to use 4.3.1 (.NET 6) code analysis and workspace
rjmurillo Oct 9, 2024
0d69c55
Update package test baseline to include code fix DLL
rjmurillo Oct 9, 2024
e45e55f
Move the C# analyzer reference next to the workspace since we want th…
rjmurillo Oct 9, 2024
dea2f74
Update include for package include to include `Moq.*.dll` to avoid fu…
rjmurillo Oct 9, 2024
b50ff4c
Remove reference to code fix project through BDN project (it's transi…
rjmurillo Oct 9, 2024
edc4d56
Remove project reference to code fix (it's transitively included)
rjmurillo Oct 9, 2024
5b3e4e4
Update method of including analyzer and code fix DLLs
rjmurillo Oct 9, 2024
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
- https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md
- https://learn.microsoft.com/en-us/visualstudio/productinfo/vs-servicing
-->

<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
Expand Down
6 changes: 6 additions & 0 deletions Moq.Analyzers.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Analyzers.Test", "tests
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Analyzers.Benchmarks", "tests\Moq.Analyzers.Benchmarks\Moq.Analyzers.Benchmarks.csproj", "{11B3412F-456C-452E-94D2-B42D5C52F61C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.CodeFixes", "src\Moq.CodeFixes\Moq.CodeFixes.csproj", "{8E99C15C-E80A-49E5-988C-1B5071CE775F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,6 +29,10 @@ Global
{11B3412F-456C-452E-94D2-B42D5C52F61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11B3412F-456C-452E-94D2-B42D5C52F61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11B3412F-456C-452E-94D2-B42D5C52F61C}.Release|Any CPU.Build.0 = Release|Any CPU
{8E99C15C-E80A-49E5-988C-1B5071CE775F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E99C15C-E80A-49E5-988C-1B5071CE775F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E99C15C-E80A-49E5-988C-1B5071CE775F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E99C15C-E80A-49E5-988C-1B5071CE775F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion build/targets/codeanalysis/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.12.7" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" />
<PackageVersion Include="SquiggleCop.Tasks" Version="1.0.26" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
<PackageVersion Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
Expand Down
18 changes: 15 additions & 3 deletions src/Moq.Analyzers/Common/SemanticModelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ internal static class SemanticModelExtensions
internal static InvocationExpressionSyntax? FindSetupMethodFromCallbackInvocation(this SemanticModel semanticModel, ExpressionSyntax expression, CancellationToken cancellationToken)
{
InvocationExpressionSyntax? invocation = expression as InvocationExpressionSyntax;
if (invocation?.Expression is not MemberAccessExpressionSyntax method) return null;
if (semanticModel.IsMoqSetupMethod(method, cancellationToken)) return invocation;
if (invocation?.Expression is not MemberAccessExpressionSyntax method)
{
return null;
}

if (semanticModel.IsMoqSetupMethod(method, cancellationToken))
{
return invocation;
}

return semanticModel.FindSetupMethodFromCallbackInvocation(method.Expression, cancellationToken);
}

Expand Down Expand Up @@ -103,7 +111,11 @@ private static List<T> GetAllMatchingSymbols<T>(this SemanticModel semanticModel
private static bool IsCallbackOrReturnSymbol(ISymbol? symbol)
{
// TODO: Check what is the best way to do such checks
if (symbol is not IMethodSymbol methodSymbol) return false;
if (symbol is not IMethodSymbol methodSymbol)
{
return false;
}

string? methodName = methodSymbol.ToString();
return methodName.StartsWith("Moq.Language.ICallback", StringComparison.Ordinal)
|| methodName.StartsWith("Moq.Language.IReturns", StringComparison.Ordinal);
Expand Down
8 changes: 6 additions & 2 deletions src/Moq.Analyzers/Moq.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand All @@ -35,7 +35,11 @@
<ItemGroup>
<None Include="$(RepoRoot)\README.md" Pack="true" PackagePath="/" />
<None Update="tools\*.ps1" CopyToOutputDirectory="Always" Pack="true" PackagePath="" />
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(OutputPath)\Moq.*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(RepoRoot)\src\Moq.CodeFixes\Moq.CodeFixes.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...ignatureShouldMatchMockedMethodCodeFix.cs → ...ignatureShouldMatchMockedMethodCodeFix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
using Microsoft.CodeAnalysis.CodeFixes;
using Microsoft.CodeAnalysis.Text;

namespace Moq.Analyzers;
namespace Moq.CodeFixes;

/// <summary>
/// Fixes <see cref="CallbackSignatureShouldMatchMockedMethodAnalyzer"/>.
/// Fixes for CallbackSignatureShouldMatchMockedMethodAnalyzer (Moq1100).
/// </summary>
[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(CallbackSignatureShouldMatchMockedMethodCodeFix))]
[Shared]
Expand Down
26 changes: 26 additions & 0 deletions src/Moq.CodeFixes/Moq.CodeFixes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>Moq.CodeFixes</RootNamespace>
<AssemblyName>Moq.CodeFixes</AssemblyName>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Moq.Analyzers\Common\DiagnosticIds.cs" Link="Common\DiagnosticIds.cs" />
<Compile Include="..\Moq.Analyzers\Common\MoqMethodDescriptorBase.cs" Link="Common\MoqMethodDescriptorBase.cs" />
<Compile Include="..\Moq.Analyzers\Common\SemanticModelExtensions.cs" Link="Common\SemanticModelExtensions.cs" />
<Compile Include="..\Moq.Analyzers\Common\WellKnownTypeNames.cs" Link="Common\WellKnownTypeNames.cs" />
<Compile Include="..\Moq.Analyzers\GlobalUsings.cs" Link="GlobalUsings.cs" />
<Compile Include="..\Moq.Analyzers\MoqSetupMethodDescriptor.cs" Link="MoqSetupMethodDescriptor.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<Folder Include="Common\" />
</ItemGroup>

</Project>
Loading
Loading