work in progress

Author: maca88

src/NHibernate.AsyncGenerator/DocumentInfo.cs

@@ -10,7 +10,7 @@
 
 namespace NHibernate.AsyncGenerator
 {
-	public class DocumentInfo
+	public class DocumentInfo : Dictionary<string, NamespaceInfo>
 	{
 		public DocumentInfo(ProjectInfo projectInfo, Document document)
 		{
@@ -32,14 +32,13 @@ public DocumentInfo(ProjectInfo projectInfo, Document document)
 
 		public SemanticModel SemanticModel { get; set; }
 
-		public Dictionary<INamespaceSymbol, NamespaceInfo> NamespaceInfos { get; } = new Dictionary<INamespaceSymbol, NamespaceInfo>();
-
 		public NamespaceInfo GetNamespaceInfo(ISymbol symbol, bool create = false)
 		{
 			var namespaceSymbol = symbol.ContainingNamespace;
-			if (NamespaceInfos.ContainsKey(namespaceSymbol))
+			var namespaceName = namespaceSymbol.Name;
+			if (ContainsKey(namespaceName))
 			{
-				return NamespaceInfos[namespaceSymbol];
+				return this[namespaceName];
 			}
 			if (!create)
 			{
@@ -64,7 +63,7 @@ public NamespaceInfo GetNamespaceInfo(ISymbol symbol, bool create = false)
 				node = RootNode.DescendantNodes().OfType<NamespaceDeclarationSyntax>().Single(o => o.FullSpan.End == location.SourceSpan.End);
 			}
 			var docNamespace = new NamespaceInfo(this, namespaceSymbol, node);
-			NamespaceInfos.Add(namespaceSymbol, docNamespace);
+			Add(namespaceName, docNamespace);
 			return docNamespace;
 		}
 
@@ -73,6 +72,11 @@ public MethodInfo GetOrCreateMethodInfo(IMethodSymbol symbol)
 			return GetNamespaceInfo(symbol, true).GetTypeInfo(symbol, true).GetMethodInfo(symbol, true);
 		}
 
+		public MethodInfo GetMethodInfo(IMethodSymbol symbol)
+		{
+			return GetNamespaceInfo(symbol).GetTypeInfo(symbol).GetMethodInfo(symbol);
+		}
+
 		public TypeInfo GetTypeInfo(INamedTypeSymbol symbol)
 		{
 			return GetNamespaceInfo(symbol).GetTypeInfo(symbol);

src/NHibernate.AsyncGenerator/DocumentWriter.cs

@@ -265,11 +265,11 @@ public void Write()
 			var namespaceNodes = new List<MemberDeclarationSyntax>();
 			var customTask = Configuration.Async.CustomTaskType;
 			var tasksUsed = false;
-			foreach (var namespaceInfo in DocumentInfo.NamespaceInfos.Values.OrderBy(o => o.Node.SpanStart))
+			foreach (var namespaceInfo in DocumentInfo.Values.OrderBy(o => o.Node.SpanStart))
 			{
 				var namespaceNode = namespaceInfo.Node;
 				var typeNodes = new List<MemberDeclarationSyntax>();
-				foreach (var typeInfo in namespaceInfo.TypeInfos.Values.OrderBy(o => o.Node.SpanStart))
+				foreach (var typeInfo in namespaceInfo.Values.OrderBy(o => o.Node.SpanStart))
 				{
 					var typeNode = typeInfo.Node;
 					var asyncLock = false;

src/NHibernate.AsyncGenerator/Extensions/SymbolExtensions.cs

@@ -355,6 +355,23 @@ public static bool IsNullable(this ITypeSymbol symbol)
 			return symbol?.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T;
 		}
 
+		public static bool HaveSameParameters(this IMethodSymbol m1, IMethodSymbol m2)
+		{
+			if (m1.Parameters.Length != m2.Parameters.Length)
+			{
+				return false;
+			}
+
+			for (var i = 0; i < m1.Parameters.Length; i++)
+			{
+				if (!m1.Parameters[i].Type.Equals(m2.Parameters[i].Type))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
 		public static ExpressionSyntax GenerateExpressionSyntax(
 			this ITypeSymbol typeSymbol)
 		{

src/NHibernate.AsyncGenerator/MethodInfo.cs

@@ -142,25 +142,6 @@ public MethodReferenceResult AnalyzeReference(ReferenceLocation reference)
 			return result;
 		}
 
-		private static bool HaveSameParameters(IMethodSymbol m1, IMethodSymbol m2)
-		{
-			if (m1.Parameters.Length != m2.Parameters.Length)
-			{
-				return false;
-			}
-
-			for (var i = 0; i < m1.Parameters.Length; i++)
-			{
-				if (!m1.Parameters[i].Type.Equals(m2.Parameters[i].Type))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
-
-
-
 		public List<AsyncCounterpartMethod> FindAsyncCounterpartMethodsWhitinBody()
 		{
 			var result = new List<AsyncCounterpartMethod>();
@@ -181,7 +162,7 @@ public List<AsyncCounterpartMethod> FindAsyncCounterpartMethodsWhitinBody()
 				var type = methodInfo.ContainingType;
 				var asyncMethodInfo = type.GetMembers(methodInfo.Name + "Async")
 										  .OfType<IMethodSymbol>()
-										  .FirstOrDefault(o => HaveSameParameters(o, methodInfo));
+										  .FirstOrDefault(o => o.HaveSameParameters(methodInfo));
 				if (asyncMethodInfo == null)
 				{
 					continue;
@@ -234,13 +215,15 @@ public MethodAnalyzeResult Analyze()
 				result.CanBeAsnyc = true;
 			}
 
+			var solutionConfig = TypeInfo.NamespaceInfo.DocumentInfo.ProjectInfo.SolutionInfo.Configuration;
 			if (Node.AttributeLists
 					.SelectMany(o => o.Attributes.Where(a => a.Name.ToString() == "MethodImpl"))
 					.Any(o => o.ArgumentList.Arguments.Any(a => a.Expression.ToString() == "MethodImplOptions.Synchronized")))
 			{
 				result.MustRunSynchronized = true;
 			}
-			else if (counter.InvocationExpressions.Count == 1 && Symbol.GetAttributes().All(o => o.AttributeClass.Name != "TestAttribute"))
+			else if (counter.InvocationExpressions.Count == 1 && Symbol.GetAttributes()
+				.All(o => !solutionConfig.TestAttributeNames.Contains(o.AttributeClass.Name)))
 			{
 				var invocation = counter.InvocationExpressions[0];
 				if (Symbol.ReturnsVoid)

src/NHibernate.AsyncGenerator/NamespaceInfo.cs

@@ -9,7 +9,7 @@
 
 namespace NHibernate.AsyncGenerator
 {
-	public class NamespaceInfo
+	public class NamespaceInfo : Dictionary<TypeDeclarationSyntax, TypeInfo>
 	{
 		public NamespaceInfo(DocumentInfo documentInfo, INamespaceSymbol symbol, NamespaceDeclarationSyntax node)
 		{
@@ -24,7 +24,7 @@ public NamespaceInfo(DocumentInfo documentInfo, INamespaceSymbol symbol, Namespa
 
 		public NamespaceDeclarationSyntax Node { get; }
 
-		public Dictionary<INamedTypeSymbol, TypeInfo> TypeInfos { get; } = new Dictionary<INamedTypeSymbol, TypeInfo>();
+		//public Dictionary<TypeDeclarationSyntax, TypeInfo> TypeInfos { get; } = new Dictionary<TypeDeclarationSyntax, TypeInfo>();
 
 		public TypeInfo GetTypeInfo(IMethodSymbol symbol, bool create = false)
 		{
@@ -44,23 +44,27 @@ public TypeInfo GetTypeInfo(INamedTypeSymbol type, bool create = false)
 			while (nestedTypes.Count > 0)
 			{
 				var typeSymbol = nestedTypes.Pop().OriginalDefinition;
+				var location = typeSymbol.Locations.Single(o => o.SourceTree.FilePath == path);
+				var node = Node.DescendantNodes()
+							   .OfType<TypeDeclarationSyntax>()
+							   .First(o => o.ChildTokens().First(t => t.IsKind(SyntaxKind.IdentifierToken)).Span == location.SourceSpan);
 
-				if ((currentDocType?.TypeInfos ?? TypeInfos).ContainsKey(typeSymbol))
+				if ((currentDocType?.TypeInfos ?? this).ContainsKey(node))
 				{
-					currentDocType = (currentDocType?.TypeInfos ?? TypeInfos)[typeSymbol];
+					currentDocType = (currentDocType?.TypeInfos ?? this)[node];
 					continue;
 				}
 				if (!create)
 				{
 					return null;
 				}
 
-				var location = typeSymbol.Locations.Single(o => o.SourceTree.FilePath == path);
-				var node = Node.DescendantNodes()
-							   .OfType<TypeDeclarationSyntax>()
-							   .Single(o => o.ChildTokens().Single(t => t.IsKind(SyntaxKind.IdentifierToken)).Span == location.SourceSpan);
 				var docType = new TypeInfo(this, typeSymbol, node);
-				(currentDocType?.TypeInfos ?? TypeInfos).Add(typeSymbol, docType);
+				(currentDocType?.TypeInfos ?? this).Add(node, docType);
+				if ((currentDocType?.TypeInfos ?? this).Keys.GroupBy(o => o.Identifier.ValueText).Any(o => o.Count() > 1))
+				{
+
+				}
 				currentDocType = docType;
 			}
 			return currentDocType;