Improve identification of relevant nodes for QuickInfo in Roslyn

Fixes #119
microsoft · Jul 11, 2015 · efea728 · efea728
1 parent 94fa4e7
commit efea728
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...oft.Research/ContractAdornments/CSharp.Roslyn/Intellisense/IntellisenseContractsHelper.cs b/...oft.Research/ContractAdornments/CSharp.Roslyn/Intellisense/IntellisenseContractsHelper.cs
@@ -141,11 +141,18 @@ public static SyntaxNode GetTargetAtTriggerPoint(ITrackingPoint triggerPoint, IT
         if (asCall != null) {
 
           //Make sure we aren't on the right side of the call
+          if (asCall.Expression == leafNode)
+            return asCall;
+
           MemberAccessExpressionSyntax memberAccessExpression = asCall.Expression as MemberAccessExpressionSyntax;
-          if (memberAccessExpression == null || memberAccessExpression.Name == leafNode)
-            return null;
+          if (memberAccessExpression != null && memberAccessExpression.Name == leafNode)
+            return asCall;
 
-          return asCall;
+          GenericNameSyntax genericNameSyntax = asCall.Expression as GenericNameSyntax;
+          if (genericNameSyntax != null && genericNameSyntax.Identifier == leafToken)
+            return asCall;
+
+          return null;
         }
 
         var asProp = nodeInQuestion as MemberAccessExpressionSyntax;