Fix another fixer

Author: Youssef1313

src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/Runtime/CSharpPreferStreamAsyncMemoryOverloads.Fixer.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
 
-using System.Collections.Generic;
+using System.Composition;
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -11,7 +11,7 @@
 
 namespace Microsoft.NetCore.CSharp.Analyzers.Runtime
 {
-    [ExportCodeFixProvider(LanguageNames.CSharp)]
+    [ExportCodeFixProvider(LanguageNames.CSharp), Shared]
     public sealed class CSharpPreferStreamAsyncMemoryOverloadsFixer : PreferStreamAsyncMemoryOverloadsFixer
     {
         protected override SyntaxNode? GetArgumentByPositionOrName(IInvocationOperation invocation, int index, string name, out bool isNamed)
@@ -54,19 +54,6 @@ public sealed class CSharpPreferStreamAsyncMemoryOverloadsFixer : PreferStreamAs
             return null;
         }
 
-        protected override bool IsSystemNamespaceImported(IReadOnlyList<SyntaxNode> importList)
-        {
-            foreach (SyntaxNode import in importList)
-            {
-                if (import is UsingDirectiveSyntax { Name: IdentifierNameSyntax { Identifier.Text: nameof(System) } })
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
         protected override bool IsPassingZeroAndBufferLength(SemanticModel model, SyntaxNode bufferValueNode, SyntaxNode offsetValueNode, SyntaxNode countValueNode)
         {
             // First argument should be an identifier name node

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/PreferStreamAsyncMemoryOverloads.Fixer.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
+using Analyzer.Utilities;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
@@ -30,12 +30,11 @@ namespace Microsoft.NetCore.Analyzers.Runtime
     /// </summary>
     public abstract class PreferStreamAsyncMemoryOverloadsFixer : CodeFixProvider
     {
+        private static readonly SyntaxAnnotation s_asMemorySymbolAnnotation = new("SymbolId", "System.MemoryExtensions");
+
         // Checks if the argument in the specified index has a name. If it doesn't, returns that arguments. If it does, then looks for the argument using the specified name, and returns it, or null if not found.
         protected abstract SyntaxNode? GetArgumentByPositionOrName(IInvocationOperation invocation, int index, string name, out bool isNamed);
 
-        // Verifies if a namespace has already been added to the usings/imports list.
-        protected abstract bool IsSystemNamespaceImported(IReadOnlyList<SyntaxNode> importList);
-
         // Verifies if the user passed `0` as the 1st argument (`offset`) and `buffer.Length` as the 2nd argument (`count`),
         // where `buffer` is the name of the variable passed as the 0th argument.
         protected abstract bool IsPassingZeroAndBufferLength(SemanticModel model, SyntaxNode bufferValueNode, SyntaxNode offsetValueNode, SyntaxNode countValueNode);
@@ -152,7 +151,7 @@ private Task<Document> FixInvocationAsync(SemanticModel model, Document doc, Syn
                 SyntaxNode asMemoryInvocationNode = generator.InvocationExpression(
                     asMemoryExpressionNode,
                     namedStartNode.WithTriviaFrom(offsetNode),
-                    namedLengthNode.WithTriviaFrom(countNode));
+                    namedLengthNode.WithTriviaFrom(countNode)).WithAddImportsAnnotation().WithAdditionalAnnotations(s_asMemorySymbolAnnotation);
 
                 // Generate the new buffer argument, ensuring we include the buffer argument name if the user originally indicated one
                 replacedInvocationNode = GetNamedArgument(generator, asMemoryInvocationNode, isBufferNamed, "buffer")
@@ -175,14 +174,9 @@ private Task<Document> FixInvocationAsync(SemanticModel model, Document doc, Syn
             }
 
             SyntaxNode newInvocationExpression = generator.InvocationExpression(asyncMethodNode, nodeArguments).WithTriviaFrom(streamInstanceNode);
-
-            bool containsSystemImport = IsSystemNamespaceImported(generator.GetNamespaceImports(root));
-
-            // The invocation needs to be replaced before adding the import/using, it won't work the other way around
             SyntaxNode newRoot = generator.ReplaceNode(root, invocation.Syntax, newInvocationExpression.WithTriviaFrom(invocation.Syntax));
-            SyntaxNode newRootWithImports = containsSystemImport ? newRoot : generator.AddNamespaceImports(newRoot, generator.NamespaceImportDeclaration(nameof(System)));
 
-            return Task.FromResult(doc.WithSyntaxRoot(newRootWithImports));
+            return Task.FromResult(doc.WithSyntaxRoot(newRoot));
         }
     }
 }

src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/PreferStreamReadAsyncMemoryOverloadsTests.cs

@@ -594,10 +594,9 @@ public async void M()
     }
 }";
             string fixedCode = @"
+using System;
 using System.IO;
 using System.Threading;
-using System;
-
 class C
 {
     public async void M()
@@ -906,10 +905,9 @@ End Sub
 End Class
 ";
             string fixedCode = @"
+Imports System
 Imports System.IO
 Imports System.Threading
-Imports System
-
 Class C
     Public Async Sub M()
         Using s As FileStream = New FileStream(""path.txt"", FileMode.Create)

src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/PreferStreamWriteAsyncMemoryOverloadsTests.cs

@@ -584,9 +584,9 @@ public async void M()
     }
 }";
             string fixedCode = @"
+using System;
 using System.IO;
 using System.Threading;
-using System;
 
 class C
 {
@@ -866,10 +866,9 @@ End Sub
 End Class
 ";
             string fixedCode = @"
+Imports System
 Imports System.IO
 Imports System.Threading
-Imports System
-
 Class C
     Public Async Sub M()
         Using s As FileStream = File.Open(""path.txt"", FileMode.Open)

src/NetAnalyzers/VisualBasic/Microsoft.NetCore.Analyzers/Runtime/BasicPreferStreamAsyncMemoryOverloads.Fixer.vb

@@ -1,5 +1,6 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
 
+Imports System.Composition
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeFixes
 Imports Microsoft.CodeAnalysis.Editing
@@ -9,7 +10,7 @@ Imports Microsoft.NetCore.Analyzers.Runtime
 
 Namespace Microsoft.NetCore.VisualBasic.Analyzers.Runtime
 
-    <ExportCodeFixProvider(LanguageNames.VisualBasic)>
+    <ExportCodeFixProvider(LanguageNames.VisualBasic), [Shared]>
     Public NotInheritable Class BasicPreferStreamAsyncMemoryOverloadsFixer
 
         Inherits PreferStreamAsyncMemoryOverloadsFixer
@@ -39,25 +40,6 @@ Namespace Microsoft.NetCore.VisualBasic.Analyzers.Runtime
             Return Nothing
         End Function
 
-        Protected Overrides Function IsSystemNamespaceImported(importList As IReadOnlyList(Of SyntaxNode)) As Boolean
-            For Each import As SyntaxNode In importList
-                Dim importsStatement = TryCast(import, ImportsStatementSyntax)
-                If importsStatement IsNot Nothing Then
-                    For Each clause As ImportsClauseSyntax In importsStatement.ImportsClauses
-                        Dim simpleClause = TryCast(clause, SimpleImportsClauseSyntax)
-                        If simpleClause IsNot Nothing Then
-                            Dim identifier = TryCast(simpleClause.Name, IdentifierNameSyntax)
-                            If identifier IsNot Nothing AndAlso String.Equals(identifier.Identifier.Text, "System", StringComparison.OrdinalIgnoreCase) Then
-                                Return True
-                            End If
-                        End If
-                    Next
-                End If
-            Next
-
-            Return False
-        End Function
-
         Protected Overrides Function IsPassingZeroAndBufferLength(model As SemanticModel, bufferValueNode As SyntaxNode, offsetValueNode As SyntaxNode, countValueNode As SyntaxNode) As Boolean
             ' First argument should be an identifier name node
             Dim arg1 = TryCast(bufferValueNode, ArgumentSyntax)