Support for aliases in using directives.

InterfaceStubGenerator/InterfaceStubGenerator.cs

@@ -67,7 +67,7 @@ public TemplateInformation GenerateTemplateInfoForInterfaceList(List<InterfaceDe
 
                     return rootNode.DescendantNodes()
                         .OfType<UsingDirectiveSyntax>()
-                        .Select(x => x.Name.ToString());
+                        .Select(x => string.Format("{0} {1}", x.Alias, x.Name).TrimStart());
                 })
                 .Distinct()
                 .Where(x => x != "System" && x != "System.Net.Http" && x != "System.Collections.Generic" && x != "System.Linq")

Refit-Tests/InterfaceStubGenerator.cs

@@ -37,7 +37,7 @@ public void FindInterfacesSmokeTest()
             var fixture = new InterfaceStubGenerator();
 
             var result = fixture.FindInterfacesToGenerate(CSharpSyntaxTree.ParseFile(input));
-            Assert.AreEqual(2, result.Count);
+            Assert.AreEqual(3, result.Count);
             Assert.True(result.Any(x => x == "IGitHubApi"));
         }
 
@@ -53,7 +53,7 @@ public void GenerateClassInfoForInterfaceSmokeTest()
 
             var result = fixture.GenerateClassInfoForInterface(input);
 
-            Assert.AreEqual(2, result.MethodList.Count);
+            Assert.AreEqual(7, result.MethodList.Count);
             Assert.AreEqual("GetUser", result.MethodList[0].Name);
             Assert.AreEqual("string userName", result.MethodList[0].ArgumentListWithTypes);
         }
@@ -69,7 +69,21 @@ public void GenerateTemplateInfoForInterfaceListSmokeTest()
                 .ToList();
 
             var result = fixture.GenerateTemplateInfoForInterfaceList(input);
-            Assert.AreEqual(1, result.ClassList.Count);
+            Assert.AreEqual(2, result.ClassList.Count);
+        }
+
+        [Test]
+        public void RetainsAliasesInUsings()
+        {
+            var fixture = new InterfaceStubGenerator();
+
+            var syntaxTree = CSharpSyntaxTree.ParseFile(IntegrationTestHelper.GetPath("NamespaceCollisionApi.cs"));
+            var interfaceDefinition = syntaxTree.GetRoot().DescendantNodes().OfType<InterfaceDeclarationSyntax>();
+            var result = fixture.GenerateTemplateInfoForInterfaceList(new List<InterfaceDeclarationSyntax>(interfaceDefinition));
+
+            var usingList = result.UsingList.Select(x => x.Item).ToList();
+            CollectionAssert.Contains(usingList, "SomeType = CollisionA.SomeType");
+            CollectionAssert.Contains(usingList, "CollisionB");
         }
     }
 }

Refit-Tests/NamespaceCollisionApi.cs

@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using SomeType = CollisionA.SomeType;
+using CollisionB;
+
+namespace Refit.Tests
+{
+    public interface INamespaceCollisionApi
+    {
+        [Get("/")]
+        Task<SomeType> SomeRequest();
+    }
+
+    public static class NamespaceCollisionApi
+    {
+        public static INamespaceCollisionApi Create()
+        {
+            return RestService.For<INamespaceCollisionApi>("http://somewhere.com");
+        }
+    }
+}
+
+namespace CollisionA
+{
+    public class SomeType { }
+}
+
+namespace CollisionB
+{
+    public class SomeType { }
+}

Refit-Tests/Refit-Tests-Net45.csproj

@@ -108,6 +108,7 @@
     <Compile Include="GitHubApi.cs" />
     <Compile Include="IntegrationTestHelper.cs" />
     <Compile Include="InterfaceStubGenerator.cs" />
+    <Compile Include="NamespaceCollisionApi.cs" />
     <Compile Include="RefitStubs.cs" />
     <Compile Include="RequestBuilder.cs" />
     <Compile Include="RestService.cs" />

Refit-Tests/RefitStubs.cs

@@ -1,9 +1,11 @@
-using System;
+using System;
 using System.Net.Http;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SomeType = CollisionA.SomeType;
+using CollisionB;
 using System.Net;
 using System.Reactive.Linq;
 using NUnit.Framework;
@@ -90,6 +92,31 @@ public virtual Task NothingToSeeHere()
     }
 }
 
+namespace Refit.Tests
+{
+    using RefitInternalGenerated;
+
+    [Preserve]
+    public partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi
+    {
+        public HttpClient Client { get; protected set; }
+        readonly Dictionary<string, Func<HttpClient, object[], object>> methodImpls;
+
+        public AutoGeneratedINamespaceCollisionApi(HttpClient client, IRequestBuilder requestBuilder)
+        {
+            methodImpls = requestBuilder.InterfaceHttpMethods.ToDictionary(k => k, v => requestBuilder.BuildRestResultFuncForMethod(v));
+            Client = client;
+        }
+
+        public virtual Task<SomeType> SomeRequest()
+        {
+            var arguments = new object[] {  };
+            return (Task<SomeType>) methodImpls["SomeRequest"](Client, arguments);
+        }
+
+    }
+}
+
 namespace Refit.Tests
 {
     using RefitInternalGenerated;