Skip to content

Commit 6218bad

Browse files
committed
Fix up analyzer
1 parent e2ed9d4 commit 6218bad

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

Rubberduck.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,8 @@ Global
485485
{D488071E-EDCB-4601-B734-1A3109ED903C}.Release64|x64.Build.0 = Release|Any CPU
486486
{D488071E-EDCB-4601-B734-1A3109ED903C}.Release64|x86.ActiveCfg = Release|Any CPU
487487
{D488071E-EDCB-4601-B734-1A3109ED903C}.Release64|x86.Build.0 = Release|Any CPU
488-
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
489-
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|Any CPU.Build.0 = Debug|Any CPU
488+
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|Any CPU.ActiveCfg = Release|Any CPU
489+
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|Any CPU.Build.0 = Release|Any CPU
490490
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|x64.ActiveCfg = Release|Any CPU
491491
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|x64.Build.0 = Release|Any CPU
492492
{F83B6746-49A6-4CFD-9A29-3D7BBD4F0323}.Debug|x86.ActiveCfg = Release|Any CPU

RubberduckCodeAnalysis/ChainedWrapperAnalyzer.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,13 @@ private static void AnalyzeSymbol(SyntaxNodeAnalysisContext context)
4141
var expInterfaces = context.SemanticModel.GetTypeInfo(node.Expression).Type?.AllInterfaces;
4242
var nameInterfaces = context.SemanticModel.GetTypeInfo(node.Name).Type?.AllInterfaces;
4343

44-
if (expInterfaces?.Any(a => a.ToDisplayString() == "Rubberduck.VBEditor.SafeComWrappers.Abstract.ISafeComWrapper") == true ||
45-
nameInterfaces?.Any(a => a.ToDisplayString() == "Rubberduck.VBEditor.SafeComWrappers.Abstract.ISafeComWrapper") == true)
44+
if (!expInterfaces.HasValue || !nameInterfaces.HasValue)
45+
{
46+
return;
47+
}
48+
49+
if (expInterfaces.Value.Any(a => a.ToDisplayString() == "Rubberduck.VBEditor.SafeComWrappers.Abstract.ISafeComWrapper") &&
50+
nameInterfaces.Value.Any(a => a.ToDisplayString() == "Rubberduck.VBEditor.SafeComWrappers.Abstract.ISafeComWrapper"))
4651
{
4752
var diagnostic = Diagnostic.Create(ChainedWrapperRule, node.GetLocation());
4853
context.ReportDiagnostic(diagnostic);

RubberduckCodeAnalysis/Resources.Designer.cs

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RubberduckCodeAnalysis/RubberduckCodeAnalysis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
</ItemGroup>
163163
<ItemGroup>
164164
<EmbeddedResource Include="Resources.resx">
165-
<Generator>PublicResXFileCodeGenerator</Generator>
165+
<Generator>ResXFileCodeGenerator</Generator>
166166
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
167167
<SubType>Designer</SubType>
168168
</EmbeddedResource>

RubberduckTestsCodeAnalysis/RubberduckCodeAnalysisUnitTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ public class FooImp : Foo
720720
}
721721

722722
[TestFixture]
723-
public class ChainedWrapperUnitTests : ChanedWrapperAnalyzer
723+
public class ChainedWrapperUnitTests : ChainedWrapperAnalyzer
724724
{
725725
[Test]
726726
[Category("ChainedWrappers")]
@@ -771,7 +771,7 @@ protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer()
771771
}
772772
}
773773

774-
public class ChanedWrapperAnalyzer : CodeFixVerifier
774+
public class ChainedWrapperAnalyzer : CodeFixVerifier
775775
{
776776
protected override CodeFixProvider GetCSharpCodeFixProvider()
777777
{
@@ -780,7 +780,7 @@ protected override CodeFixProvider GetCSharpCodeFixProvider()
780780

781781
protected override DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer()
782782
{
783-
return new ChainedWrapperAnalyzer();
783+
return new RubberduckCodeAnalysis.ChainedWrapperAnalyzer();
784784

785785
}
786786
}

0 commit comments

Comments
 (0)