Fixed VB test cases

SonarSource · Feb 2, 2023 · b9f2741 · b9f2741
1 parent 98dc16c
commit b9f2741
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/analyzers/src/SonarAnalyzer.Common/Rules/UnusedStringBuilderBase.cs b/analyzers/src/SonarAnalyzer.Common/Rules/UnusedStringBuilderBase.cs
@@ -29,17 +29,14 @@ public abstract class UnusedStringBuilderBase<TSyntaxKind, TVariableDeclarator,
     private const string DiagnosticId = "S3063";
     protected override string MessageFormat => """Remove this "StringBuilder"; ".ToString()" is never called.""";
 
-    private readonly DiagnosticDescriptor rule;
-
     protected abstract string GetVariableName(TVariableDeclarator declaration);
     protected abstract bool NeedsToTrack(TVariableDeclarator declaration, SemanticModel semanticModel);
     protected abstract SyntaxNode GetAncestorBlock(TVariableDeclarator declaration);
     protected abstract bool IsIsStringInvoked(string variableName, IList<TInvocationExpression> invocations, SemanticModel semanticModel);
     protected abstract bool IsPassedToMethod(string variableName, IList<TInvocationExpression> invocations);
     protected abstract bool IsReturned(string variableName, IList<TReturnStatement> returnStatements);
 
-    protected UnusedStringBuilderBase() : base(DiagnosticId) =>
-        rule = Language.CreateDescriptor(DiagnosticId, MessageFormat);
+    protected UnusedStringBuilderBase() : base(DiagnosticId) { }
 
     protected sealed override void Initialize(SonarAnalysisContext context) =>
         context.RegisterNodeAction(Language.GeneratedCodeRecognizer, c =>
@@ -56,13 +53,12 @@ public abstract class UnusedStringBuilderBase<TSyntaxKind, TVariableDeclarator,
                 return;
             }
             var invocations = block.DescendantNodes().OfType<TInvocationExpression>().ToList();
-
             if (IsIsStringInvoked(variableName, invocations, c.SemanticModel)
                 || IsPassedToMethod(variableName, invocations)
                 || IsReturned(variableName, block.DescendantNodes().OfType<TReturnStatement>().ToList()))
             {
                 return;
             }
-            c.ReportIssue(Diagnostic.Create(rule, variableDeclaration.GetLocation()));
+            c.ReportIssue(Diagnostic.Create(Rule, variableDeclaration.GetLocation()));
         }, Language.SyntaxKind.VariableDeclarator);
 }
diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/Rules/UnusedStringBuilder.cs b/analyzers/src/SonarAnalyzer.VisualBasic/Rules/UnusedStringBuilder.cs
@@ -28,7 +28,7 @@ public sealed class UnusedStringBuilder : UnusedStringBuilderBase<SyntaxKind, Va
     protected override ILanguageFacade<SyntaxKind> Language => VisualBasicFacade.Instance;
 
     protected override string GetVariableName(VariableDeclaratorSyntax declaration) =>
-        declaration.GetName();
+        declaration.Names.FirstOrDefault().ToString();
 
     protected override bool NeedsToTrack(VariableDeclaratorSyntax expression, SemanticModel semanticModel) =>
         expression.Initializer is not null

diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/UnusedStringBuilder.vb b/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/UnusedStringBuilder.vb
@@ -24,9 +24,11 @@ Public Class Program
         builderCalls.Append("Append")
         builderCalls.AppendLine("AppendLine")
         builderCalls.Replace("a", "b")
-        builderCalls.Remove(builderCalls.Length - 1, 1)
-        builderCalls.Insert(builderCalls.Length, "a")
         builderCalls.Clear()
+
+        Dim builderCalls2 As StringBuilder = New StringBuilder() ' Compliant
+        builderCalls2.Remove(builderCalls2.Length - 1, 1)
+
         Dim builderReturn = New StringBuilder()                 ' Compliant
         Return builderReturn
     End Function