[Vsintegration] Resolving a field from a sourcetype can also return a System.Type. Also resolve exception when there are no entities found when finding ExtensionMethods.

Author: RobertvanderHulst

src/VisualStudio/LanguageService/Generic/DropDownClient.cs

@@ -63,7 +63,7 @@ public class XSharpDropDownClient : IVsDropdownBarClient
         readonly List<XDropDownMember> _members = null;
         readonly Dictionary<string, int> _membersDict = null;	// to speed up the lookup of members
         readonly List<XDropDownMember> _types = null;
-        readonly List<XProject> _projects = null;   
+        readonly List<XProject> _projects = null;
         XFile _file = null;
         uint _lastHashCode = 0;
         private int _lastLine;
@@ -164,7 +164,7 @@ internal void addTextView(ITextView textView, IVsTextView textViewAdapter)
                 textView.LostAggregateFocus += TextView_LostAggregateFocus;
                 textView.Closed += TextView_Closed;
                 StartOnIdleAsync(textViewAdapter).FireAndForget();
-                
+
 
             }
         }
@@ -412,7 +412,7 @@ private IList<XSourceEntity> GetTypeMembers(XSourceTypeSymbol type)
                 // Load members from all partial type definitions inside this project
                 var usings = new List<string>();
                 usings.Add(type.Namespace);
-                var fullType = _file.Project.Lookup(type.Name, usings);
+                var fullType = _file.Project.Lookup(type.Name, usings) as XSourceTypeSymbol;
                 if (fullType != null)
                 {
                     members.AddRange(fullType.XMembers);
@@ -472,7 +472,7 @@ private IList<XSourceEntity> GetAllMembers()
                         // load methods from other files
                         var usings = new List<string>();
                         usings.Add(xType.Namespace);
-                        var fullType = _file.Project.Lookup(xType.Name, usings);
+                        var fullType = _file.Project.Lookup(xType.Name, usings) as XSourceTypeSymbol;
                         if (fullType != null)
                         {
                             foreach (var member in fullType.XMembers)
@@ -838,7 +838,7 @@ public int GetEntryImage(int combo, int index, out int imageIndex)
                         imageIndex = _members[index].Glyph;
                     break;
                 case PROJECTINDEX: // projects
-                    imageIndex = projectIcon; 
+                    imageIndex = projectIcon;
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();

src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs

@@ -1914,7 +1914,7 @@ public IXTypeSymbol ResolveExternalType(string name, IList<string> usings)
         public XSourceTypeSymbol ResolveXType(string name, IList<string> usings)
         {
             var model = this.ProjectModel;
-            XSourceTypeSymbol result = model.Lookup(name, usings);
+            XSourceTypeSymbol result = model.Lookup(name, usings) as XSourceTypeSymbol;
             if (result != null)
                 return result;
             return result;

src/VisualStudio/XSharpCodeModelXs/Model/Interfaces.prg

@@ -69,6 +69,7 @@ BEGIN NAMESPACE XSharpModel
       PROPERTY TypeParameters AS IList<STRING> GET
       PROPERTY DeclaringType  AS STRING GET
       PROPERTY IsExtension    AS LOGIC GET
+      METHOD Resolve() as VOID
       PROPERTY XMLSignature   AS STRING GET
       PROPERTY OriginalTypeName  AS STRING GET
       PROPERTY IsGeneric      AS LOGIC GET

src/VisualStudio/XSharpCodeModelXs/PE/XPEMemberSymbol.prg

@@ -35,7 +35,7 @@ ABSTRACT CLASS XPEMemberSymbol     INHERIT XPESymbol IMPLEMENTS IXMemberSymbol
 
 #endregion
 
-    PROTECTED INTERNAL VIRTUAL METHOD Resolve() AS VOID
+    PUBLIC VIRTUAL METHOD Resolve() AS VOID
         IF SELF:_custatts != NULL
             FOREACH VAR custatt IN SELF:_custatts
                 SWITCH custatt:AttributeType:FullName

src/VisualStudio/XSharpCodeModelXs/PE/XPEMethodSymbol.prg

@@ -88,7 +88,7 @@ CLASS XPEMethodSymbol  INHERIT XPEMemberSymbol
             SELF:_signature:ReadGenericParameters(def:GenericParameters)
         ENDIF
         SELF:IsSpecialName := def:IsSpecialName
-    PROTECTED INTERNAL OVERRIDE METHOD Resolve() AS VOID
+    PUBLIC OVERRIDE METHOD Resolve() AS VOID
         IF ! _resolved .and. _methoddef != NULL
             // Add Generic parameters first so have that info when processing the parameters
             IF _methoddef:HasGenericParameters

src/VisualStudio/XSharpCodeModelXs/ProjectSystem/XProject.prg

@@ -979,7 +979,7 @@ BEGIN NAMESPACE XSharpModel
         RETURN myusings:ToList()
 
 
-    PRIVATE _lastFound := NULL AS XSourceTypeSymbol
+    PRIVATE _lastFound := NULL AS IXTypeSymbol
     PRIVATE _lastName  := NULL AS STRING
 
     METHOD GetTypesLike( startWith AS STRING, usings AS IList<STRING>) AS IList<XSourceTypeSymbol>
@@ -1015,11 +1015,11 @@ BEGIN NAMESPACE XSharpModel
         endif
         RETURN result
 
-    METHOD Lookup(typeName AS STRING) AS XSourceTypeSymbol
+    METHOD Lookup(typeName AS STRING) AS IXTypeSymbol
         VAR usings := List<STRING>{}
         RETURN SELF:Lookup(typeName, usings)
 
-    METHOD Lookup(typeName AS STRING, usings AS IList<STRING>) AS XSourceTypeSymbol
+    METHOD Lookup(typeName AS STRING, usings AS IList<STRING>) AS IXTypeSymbol
         // lookup Type definition in this project and X# projects referenced by this project
         SELF:LogTypeMessage(i"Lookup {typeName}")
         VAR originalName := typeName
@@ -1051,6 +1051,17 @@ BEGIN NAMESPACE XSharpModel
             var elements := originalName:Split(<char>{'.'})
             var first := SELF:Lookup(elements.First(), usings)
             if first != NULL
+                if elements.Length > 1
+                    var mem := elements[1]
+                    foreach var m in first.Members
+                        if String.Equals(m.Name, mem, StringComparison.OrdinalIgnoreCase)
+                            m.Resolve()
+                            _lastFound := m.ResolvedType
+                            return _lastFound
+                        endif
+                    next
+                endif
+
                 typeName := first:FullName + "." + typeName
                 return SELF:Lookup(typeName, usings)
             endif
@@ -1301,11 +1312,13 @@ BEGIN NAMESPACE XSharpModel
         sb:AppendLine("END CLASS")
         VAR walker := SourceWalker{oFile, FALSE}
         walker:Parse(sb:ToString())
-        foreach var entity in walker:EntityList
-            if entity is XSourceMemberSymbol var sms
-                entities:Add(sms)
-            endif
-        next
+        if (walker:EntityList != null)
+            foreach var entity in walker:EntityList
+                if entity is XSourceMemberSymbol var sms
+                    entities:Add(sms)
+                endif
+            next
+        endif
         if entities:Count == list:Count
             FOR var i := 0 to entities:Count-1
                 var entity := (XSourceMemberSymbol) entities[i]

src/VisualStudio/XSharpCodeModelXs/Source/XSourceEntity.prg

@@ -54,7 +54,7 @@ CLASS XSourceEntity INHERIT XSourceSymbol IMPLEMENTS IXSymbol, IXSourceSymbol
     METHOD ForceComplete() AS VOID
         LOCAL ParentName AS STRING
         LOCAL thisName AS STRING
-        LOCAL tmp AS XSourceTypeSymbol
+        LOCAL tmp AS IXTypeSymbol
 
         IF SELF:Parent == NULL .AND. ! String.IsNullOrEmpty(SELF:ParentName)
 
@@ -75,7 +75,14 @@ CLASS XSourceEntity INHERIT XSourceSymbol IMPLEMENTS IXSymbol, IXSourceSymbol
                 ENDIF
             ENDIF
         ENDIF
-
+    METHOD Resolve() AS VOID
+        IF SELF:ResolvedType == null
+            var name := SELF:TypeName
+            SELF:ResolvedType := SELF:File:FindType(name)
+            if (SELF:ResolvedType != NULL)
+                SELF:TypeName     := SELF:ResolvedType:FullName
+            endif
+        ENDIF
 
 #region Complexer properties
         // Properties

src/VisualStudio/XSharpCodeModelXs/Source/XSourceParameterSymbol.prg

@@ -40,14 +40,7 @@ CLASS XSourceParameterSymbol INHERIT XSourceVariableSymbol IMPLEMENTS IXParamete
             result += ParamTypeDesc+" "+SELF:TypeName
         ENDIF
         RETURN result
-    METHOD Resolve() AS VOID
-        IF SELF:ResolvedType == null
-            var name := SELF:TypeName
-            SELF:ResolvedType := SELF:File:FindType(name)
-            if (SELF:ResolvedType != NULL)
-                SELF:TypeName     := SELF:ResolvedType:FullName
-            endif
-        ENDIF
+    
 END CLASS
 [DebuggerDisplay("{DebuggerDisplay(),nq}")];
 CLASS XSourceTypeParameterSymbol INHERIT XSourceParameterSymbol

src/VisualStudio/XSharpCodeModelXs/Source/XSourceTypeSymbol.prg

@@ -249,7 +249,7 @@ BEGIN NAMESPACE XSharpModel
       PROPERTY Clone AS XSourceTypeSymbol
          GET
             IF SELF:IsPartial .AND. SELF:File != NULL
-               RETURN SUPER:File:Project:Lookup(SELF:FullName, SELF:File:Usings:ToArray())
+               RETURN SUPER:File:Project:Lookup(SELF:FullName, SELF:File:Usings:ToArray()) astype XSourceTypeSymbol
             ENDIF
             RETURN SELF
          END GET

src/VisualStudio/XSharpVoEditors/XSharp_WED.prg

@@ -352,7 +352,7 @@ CLASS XSharp_VOWindowEditor INHERIT VOWindowEditor
         VAR rootNs := oFile:Project:ProjectNode:RootNameSpace
         VAR usings := List<STRING>{}
         usings:Add(rootNs)
-        oType := oProject:Lookup(cClass,usings)
+        oType := oProject:Lookup(cClass,usings) ASTYPE XSharpModel.XSourceTypeSymbol
         IF cName:ToUpper() == "CLASSDECLARATION"
             IF (oType != NULL_OBJECT)
                 oType:OpenEditor()