Skip to content

Commit 05cdb97

Browse files
authored
Merge branch 'next' into next
2 parents d7bbe58 + 3480934 commit 05cdb97

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ public NonReturningFunctionInspectionResult(IInspection inspection,
1717
: base(inspection, qualifiedContext.ModuleName, qualifiedContext.Context, target)
1818
{
1919
_quickFixes = isInterfaceImplementation
20-
? new CodeInspectionQuickFix[] { }
20+
? new CodeInspectionQuickFix[]
21+
{
22+
new IgnoreOnceQuickFix(Context, QualifiedSelection, Inspection.AnnotationName),
23+
}
2124
: new CodeInspectionQuickFix[]
2225
{
2326
new ConvertToProcedureQuickFix(Context, QualifiedSelection, target),

RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ public void GivenParameterizedPropertyGetter_QuickFixKeepsParameter()
477477

478478
[TestMethod]
479479
[TestCategory("Inspections")]
480-
public void NonReturningFunction_ReturnsResult_InterfaceImplementation_NoQuickFix()
480+
public void NonReturningFunction_ReturnsResult_InterfaceImplementation_OnlyIgnoreOnceQuickFix()
481481
{
482482
//Input
483483
const string inputCode1 =
@@ -507,7 +507,8 @@ Function IClass1_Foo() As Boolean
507507
var inspection = new NonReturningFunctionInspection(parser.State);
508508
var inspectionResults = inspection.GetInspectionResults();
509509

510-
Assert.AreEqual(0, inspectionResults.First().QuickFixes.Count());
510+
Assert.IsTrue(inspectionResults.First().QuickFixes.Any()
511+
&& inspectionResults.First().QuickFixes.All(quickfix => quickfix.Description == InspectionsUI.IgnoreOnce));
511512
}
512513

513514
[TestMethod]

0 commit comments

Comments
 (0)