Add imports instead of fully qualifying (#38)

* Add imports instead of fully qualifying * Add skipped test * Skip on non-Windows
Youssef1313 · Jun 28, 2021 · a7d8c68 · a7d8c68
1 parent 7184ac0
commit a7d8c68
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 2 deletions.
diff --git a/src/CSharp/YAnalyzers.CSharp.CodeFixes/UseImplicitOrExplicitTypeCodeFix.cs b/src/CSharp/YAnalyzers.CSharp.CodeFixes/UseImplicitOrExplicitTypeCodeFix.cs
@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.Simplification;
 
 namespace YAnalyzers.CSharp
 {
@@ -90,7 +91,7 @@ private static async Task<Document> UseExplicitTypeAsync(Document document, Synt
             TypeInfo typeInfo = model.GetTypeInfo(typeSyntax, cancellationToken);
 
             SyntaxGenerator generator = SyntaxGenerator.GetGenerator(document);
-            SyntaxNode newNode = generator.TypeExpression(typeInfo.ConvertedType).WithTriviaFrom(typeSyntax);
+            SyntaxNode newNode = generator.TypeExpression(typeInfo.ConvertedType).WithTriviaFrom(typeSyntax).WithAdditionalAnnotations(Simplifier.AddImportsAnnotation);
 
             return document.WithSyntaxRoot(root.ReplaceNode(typeSyntax, newNode));
         }

diff --git a/src/UnitTests/UseImplicitOrExplicitTypeAnalyzerTests.cs b/src/UnitTests/UseImplicitOrExplicitTypeAnalyzerTests.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using VerifyCS = YAnalyzers.Test.CSharpCodeFixVerifier<
@@ -449,6 +451,80 @@ public void Process(string s)
         }
     }
 }
+";
+            await VerifyCS.VerifyCodeFixAsync(code, VerifyCS.Diagnostic(UseImplicitOrExplicitTypeAnalyzer.UseExplicitTypeDiagnosticId).WithLocation(0), fixedCode);
+        }
+
+        [TestMethod]
+        public async Task TestAddUsing()
+        {
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                // Ugly way to conditionally skip a test.
+                // This should be removed anyway.
+                // https://github.com/dotnet/roslyn-sdk/issues/876
+                return;
+            }
+
+            var code = @"
+using System.Linq;
+
+class C
+{
+    public void M(string[] s)
+    {
+        {|#0:var x = s.ToList()|};
+    }
+}
+";
+            var fixedCode = @"
+using System.Collections.Generic;
+using System.Linq;
+
+class C
+{
+    public void M(string[] s)
+    {
+        List<string> x = s.ToList();
+    }
+}
+";
+            await VerifyCS.VerifyCodeFixAsync(code, VerifyCS.Diagnostic(UseImplicitOrExplicitTypeAnalyzer.UseExplicitTypeDiagnosticId).WithLocation(0), fixedCode);
+        }
+
+        [TestMethod]
+        [Ignore("https://github.com/dotnet/roslyn/issues/54437 - https://github.com/Youssef1313/YAnalyzers/issues/33")]
+        public async Task TestDeconstruction()
+        {
+            var code = @"
+using System.Collections.Generic;
+using System.Linq;
+
+class C
+{
+    public void M(string[] s)
+    {
+        var x = new Dictionary<int, string>();
+        foreach ({|#0:var (a, b)|} in x)
+        {
+        }
+    }
+}
+";
+            var fixedCode = @"
+using System.Collections.Generic;
+using System.Linq;
+
+class C
+{
+    public void M(string[] s)
+    {
+        var x = new Dictionary<int, string>();
+        foreach ((int a, string b) in x)
+        {
+        }
+    }
+}
 ";
             await VerifyCS.VerifyCodeFixAsync(code, VerifyCS.Diagnostic(UseImplicitOrExplicitTypeAnalyzer.UseExplicitTypeDiagnosticId).WithLocation(0), fixedCode);
         }