Support aliases for any type

Author: ltrzesniewski

src/Quoter.Tests/Quoter.Tests.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime;build;native;contentFiles;analyzers</IncludeAssets>
     </PackageReference>

src/Quoter.Tests/Tests.cs

@@ -867,6 +867,13 @@ public void TestRecordStruct()
             nodeKind: NodeKind.MemberDeclaration);
     }
 
+    [Fact]
+    public void TestIssue85()
+    {
+        Test("using Foo = object;");
+        Test("using Foo = (int foo, int bar);");
+    }
+
     private void Test(
         string sourceText,
         string expected,

src/Quoter/Quoter.cs

@@ -1044,12 +1044,25 @@ private MethodInfo PickFactoryMethodToCreateNode(SyntaxNode node)
                 return candidates.First();
             }
 
-            var usingDirectiveSyntax = node as UsingDirectiveSyntax;
-            if (usingDirectiveSyntax != null)
+            if (node is UsingDirectiveSyntax usingDirectiveSyntax)
             {
                 if (usingDirectiveSyntax.Alias == null)
                 {
-                    candidates = candidates.Where(m => m.ToString() != "Microsoft.CodeAnalysis.CSharp.Syntax.UsingDirectiveSyntax UsingDirective(Microsoft.CodeAnalysis.CSharp.Syntax.NameEqualsSyntax, Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)");
+                    const string signatureWithNameSyntax = "Microsoft.CodeAnalysis.CSharp.Syntax.UsingDirectiveSyntax UsingDirective(Microsoft.CodeAnalysis.CSharp.Syntax.NameEqualsSyntax, Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)";
+                    const string signatureWithTypeSyntax = "Microsoft.CodeAnalysis.CSharp.Syntax.UsingDirectiveSyntax UsingDirective(Microsoft.CodeAnalysis.CSharp.Syntax.NameEqualsSyntax, Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)";
+
+                    candidates = candidates.Where(m => m.ToString() is not (signatureWithNameSyntax or signatureWithTypeSyntax));
+                }
+                else
+                {
+                    var preferredSignature = usingDirectiveSyntax.NamespaceOrType is NameSyntax
+                        ? "Microsoft.CodeAnalysis.CSharp.Syntax.UsingDirectiveSyntax UsingDirective(Microsoft.CodeAnalysis.CSharp.Syntax.NameSyntax)"
+                        : "Microsoft.CodeAnalysis.CSharp.Syntax.UsingDirectiveSyntax UsingDirective(Microsoft.CodeAnalysis.CSharp.Syntax.TypeSyntax)";
+
+                    if (candidates.FirstOrDefault(m => m.ToString() == preferredSignature) is { } preferredMethod)
+                    {
+                        return preferredMethod;
+                    }
                 }
             }
 

src/Quoter/Quoter.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
   </ItemGroup>
 
 </Project>