fixed typing annotations being incorrectly interpreted as classes instead of instances of repective classes microsoft#459

Author: lostmsu

src/Analysis/Engine/Impl/Analyzer/ExpressionEvaluator.cs

@@ -99,7 +99,8 @@ public IAnalysisSet EvaluateAnnotation(Expression annotation) {
             Evaluate(annotation);
 
             return new TypeAnnotation(_unit.State.LanguageVersion, annotation)
-                .GetValue(new ExpressionEvaluatorAnnotationConverter(this, annotation, _unit)) ?? AnalysisSet.Empty;
+                .GetValue(new ExpressionEvaluatorAnnotationConverter(this, annotation, _unit))
+                ?.GetInstanceType() ?? AnalysisSet.Empty;
         }
 
         /// <summary>

src/Analysis/Engine/Impl/Analyzer/ExpressionEvaluatorAnnotationConverter.cs

@@ -62,7 +62,7 @@ private IAnalysisSet FinalizeNames(IAnalysisSet types) {
                         }
                         var n = c.GetConstantValueAsString();
                         if (!string.IsNullOrEmpty(n)) {
-                            return _eval.LookupAnalysisSetByName(_node, n, addDependency: true).GetInstanceType();
+                            return _eval.LookupAnalysisSetByName(_node, n, addDependency: true);
                         }
                         return c;
                     })

src/Analysis/Engine/Impl/Values/TypingTypeInfo.cs

@@ -57,7 +57,7 @@ public override IAnalysisSet Call(Node node, AnalysisUnit unit, IAnalysisSet[] a
                         returnInternalTypes: true
                     );
                     foreach (var type in ce.Args.MaybeEnumerate().Where(e => e?.Expression != null).Select(e => new TypeAnnotation(unit.State.LanguageVersion, e.Expression))) {
-                        newArgs.Add(type.GetValue(eval) ?? AnalysisSet.Empty);
+                        newArgs.Add(type.GetValue(eval)?.GetInstanceType() ?? AnalysisSet.Empty);
                     }
                     return new TypingTypeInfo(_baseName, _innerValue, newArgs);
                 });
@@ -83,7 +83,7 @@ public override IAnalysisSet GetIndex(Node node, AnalysisUnit unit, IAnalysisSet
                         returnInternalTypes: true
                     );
                     foreach (var type in exprs.Select(e => new TypeAnnotation(unit.State.LanguageVersion, e))) {
-                        newArgs.Add(type.GetValue(eval) ?? AnalysisSet.Empty);
+                        newArgs.Add(type.GetValue(eval)?.GetInstanceType() ?? AnalysisSet.Empty);
                     }
                     return new TypingTypeInfo(_baseName, _innerValue, newArgs);
                 });