Added ElementResolver to resolve namespace conflicts in CBN

src/DynamoCore/Core/CustomNodeManager.cs

@@ -485,8 +485,7 @@ public bool TryGetInfoFromPath(string path, bool isTestMode, out CustomNodeInfo
                 nodeFactory,
                 nodeGraph.Nodes,
                 nodeGraph.Notes,
-                workspaceInfo,
-                nodeGraph.ElementResolver);
+                workspaceInfo);
 
             RegisterCustomNodeWorkspace(newWorkspace);
 
@@ -607,7 +606,7 @@ public WorkspaceModel CreateCustomNode(string name, string category, string desc
                 ID = newId.ToString(), 
                 FileName = string.Empty
             };
-            var workspace = new CustomNodeWorkspaceModel(info, nodeFactory, new ElementResolver());
+            var workspace = new CustomNodeWorkspaceModel(info, nodeFactory);
 
             RegisterCustomNodeWorkspace(workspace);
             return workspace;

src/DynamoCore/Core/NodeGraph.cs

@@ -13,8 +13,6 @@ public class NodeGraph
         public List<NodeModel> Nodes { get; private set; }
         public List<ConnectorModel> Connectors { get; private set; }
         public List<NoteModel> Notes { get; private set; }
-        public ElementResolver ElementResolver { get; private set; }
-
 
         private NodeGraph() { }
 
@@ -118,35 +116,12 @@ private static IEnumerable<NoteModel> LoadNotesFromXml(XmlDocument xmlDoc)
         /// <returns></returns>
         public static NodeGraph LoadGraphFromXml(XmlDocument xmlDoc, NodeFactory nodeFactory)
         {
-            var elementResolver = LoadElementResolver(xmlDoc);
-
             var nodes = LoadNodesFromXml(xmlDoc, nodeFactory).ToList();
             var connectors = LoadConnectorsFromXml(xmlDoc, nodes.ToDictionary(node => node.GUID)).ToList();
             var notes = LoadNotesFromXml(xmlDoc).ToList();
 
-            return new NodeGraph { Nodes = nodes, Connectors = connectors, Notes = notes, ElementResolver = elementResolver };
+            return new NodeGraph { Nodes = nodes, Connectors = connectors, Notes = notes };
         }
 
-        private static ElementResolver LoadElementResolver(XmlDocument xmlDoc)
-        {
-            var nodes = xmlDoc.GetElementsByTagName("NamespaceResolutionMap");
-
-            var resolutionMap = new Dictionary<string, KeyValuePair<string, string>>();
-            if (nodes.Count > 0)
-            {
-                foreach (XmlNode child in nodes[0].ChildNodes)
-                {
-                    if (child.Attributes != null)
-                    {
-                        XmlAttribute pName = child.Attributes["partialName"];
-                        XmlAttribute rName = child.Attributes["resolvedName"];
-                        XmlAttribute aName = child.Attributes["assemblyName"];
-                        var kvp = new KeyValuePair<string, string>(rName.Value, aName.Value);
-                        resolutionMap.Add(pName.Value, kvp);
-                    }
-                }
-            }
-            return new ElementResolver(resolutionMap);
-        }
     }
 }

src/DynamoCore/DSEngine/CodeCompletionServices.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ProtoCore.Namespace;
 
 namespace Dynamo.DSEngine.CodeCompletion
 {
@@ -37,10 +38,15 @@ public CodeCompletionServices(ProtoCore.Core core)
         /// <param name="code"> code typed in the code block </param>
         /// <param name="stringToComplete"> Class name or declared variable </param>
         /// <returns> list of method and property members of the type </returns>
-        internal IEnumerable<CompletionData> GetCompletionsOnType(string code, string stringToComplete)
+        internal IEnumerable<CompletionData> GetCompletionsOnType(string code, string stringToComplete, ElementResolver resolver = null)
         {
             IEnumerable<StaticMirror> members = null;
 
+            if (resolver != null)
+            {
+                stringToComplete = resolver.LookupResolvedName(stringToComplete) ?? stringToComplete;
+            }
+
             // Determine if the string to be completed is a class
             var type = GetClassType(stringToComplete);
             if (type != null)
@@ -88,8 +94,9 @@ internal IEnumerable<string> GetGlobals()
         /// </summary>
         /// <param name="stringToComplete"> current string being typed which is to be completed </param>
         /// <param name="guid"> code block node guid to identify current node being typed </param>
+        /// <param name="resolver"></param>
         /// <returns> list of classes, global methods and properties that match with string being completed </returns>
-        internal IEnumerable<CompletionData> SearchCompletions(string stringToComplete, Guid guid)
+        internal IEnumerable<CompletionData> SearchCompletions(string stringToComplete, Guid guid, ElementResolver resolver = null)
         {
             List<CompletionData> completions = new List<CompletionData>();
 
@@ -109,7 +116,7 @@ internal IEnumerable<CompletionData> SearchCompletions(string stringToComplete,
                 {
                     completions.AddRange(group.
                         Where(x => !x.IsHiddenInLibrary).
-                        Select(x =>CompletionData.ConvertMirrorToCompletionData(x, useFullyQualifiedName: true)));
+                        Select(x =>CompletionData.ConvertMirrorToCompletionData(x, useFullyQualifiedName: true, resolver: resolver)));
                 }
                 else
                     completions.AddRange(group.
@@ -165,7 +172,8 @@ internal IEnumerable<CompletionData> SearchTypes(string stringToComplete)
         /// <param name="functionPrefix"> class name in case of constructor or static method, OR
         /// declared instance variable on which method is invoked </param>
         /// <returns> list of method overload signatures </returns>
-        internal IEnumerable<CompletionData> GetFunctionSignatures(string code, string functionName, string functionPrefix)
+        internal IEnumerable<CompletionData> GetFunctionSignatures(string code, string functionName, string functionPrefix,
+            ElementResolver resolver = null)
         {
             IEnumerable<MethodMirror> candidates = null;
 
@@ -183,6 +191,11 @@ internal IEnumerable<CompletionData> GetFunctionSignatures(string code, string f
             }
 
             // Determine if the function prefix is a class name
+            if (resolver != null)
+            {
+                functionPrefix = resolver.LookupResolvedName(functionPrefix) ?? functionPrefix;
+            }
+
             var type = GetClassType(functionPrefix);
             if (type != null)
             {
@@ -191,7 +204,7 @@ internal IEnumerable<CompletionData> GetFunctionSignatures(string code, string f
             // If not of class type
             else
             {
-                // Check if the function prefix is a declared identifier
+                // Check if the function prefix is a typed identifier
                 string typeName = CodeCompletionParser.GetVariableType(code, functionPrefix);
                 if (typeName != null)
                     type = GetClassType(typeName);
@@ -266,9 +279,10 @@ internal CompletionData(string text, CompletionType type)
         }
 
 
-        internal static CompletionData ConvertMirrorToCompletionData(StaticMirror mirror, bool useFullyQualifiedName = false)
+        internal static CompletionData ConvertMirrorToCompletionData(StaticMirror mirror, bool useFullyQualifiedName = false, 
+            ElementResolver resolver = null)
         {
-            MethodMirror method = mirror as MethodMirror;
+            var method = mirror as MethodMirror;
             if (method != null)
             {
                 string methodName = method.MethodName;
@@ -279,20 +293,31 @@ internal static CompletionData ConvertMirrorToCompletionData(StaticMirror mirror
                     Stub = signature
                 };
             }
-            PropertyMirror property = mirror as PropertyMirror;
+            var property = mirror as PropertyMirror;
             if (property != null)
             {
                 string propertyName = property.PropertyName;
                 return new CompletionData(propertyName, CompletionType.Property);
             }
-            ClassMirror classMirror = mirror as ClassMirror;
+            var classMirror = mirror as ClassMirror;
             if (classMirror != null)
             {
-                string className = useFullyQualifiedName ? classMirror.ClassName : classMirror.Alias;
+                string className = useFullyQualifiedName ? GetShortClassName(classMirror, resolver) : classMirror.Alias;
                 return new CompletionData(className, CompletionType.Class);
             }
             else
                 throw new ArgumentException("Invalid argument");
         }
+
+        private static string GetShortClassName(ClassMirror mirror, ElementResolver resolver)
+        {
+            var shortName = string.Empty;
+            if (resolver != null)
+            {
+                shortName = resolver.LookupShortName(mirror.ClassName);
+            }
+
+            return string.IsNullOrEmpty(shortName) ? mirror.ClassName : shortName;
+        }
     }
 }

src/DynamoCore/DSEngine/EngineController.cs

@@ -7,6 +7,7 @@
 using ProtoCore.AST.AssociativeAST;
 using ProtoCore.DSASM.Mirror;
 using ProtoCore.Mirror;
+using ProtoCore.Namespace;
 using ProtoScript.Runners;
 using System;
 using System.Collections.Generic;
@@ -623,6 +624,7 @@ private bool HasVariableDefined(string var)
         }
 
         #endregion
+
     }
 
     public class CompilationServices

src/DynamoCore/Models/CustomNodeWorkspaceModel.cs

@@ -33,32 +33,37 @@ private set
 
         public CustomNodeWorkspaceModel( 
             WorkspaceInfo info, 
-            NodeFactory factory, 
-            ElementResolver elementResolver)
+            NodeFactory factory)
             : this(
                 factory,
                 Enumerable.Empty<NodeModel>(),
                 Enumerable.Empty<NoteModel>(),
-                info,
-                elementResolver) { }
+                info) { }
 
         public CustomNodeWorkspaceModel( 
             NodeFactory factory, 
             IEnumerable<NodeModel> e, 
             IEnumerable<NoteModel> n, 
             WorkspaceInfo info,
-            ElementResolver elementResolver) 
-            : base(e, n, info, factory, elementResolver)
+            ElementResolver elementResolver = null) 
+            : base(e, n, info, factory)
         {
             HasUnsavedChanges = false;
 
             CustomNodeId = Guid.Parse(info.ID);
             Category = info.Category;
             Description = info.Description;
 
+            if (elementResolver != null)
+            {
+                ElementResolver.CopyResolutionMap(elementResolver);
+            }
+
             PropertyChanged += OnPropertyChanged;
         }
 
+        #endregion
+
         private void OnPropertyChanged(object sender, PropertyChangedEventArgs args)
         {
             if (args.PropertyName == "Name")
@@ -71,7 +76,6 @@ private void OnPropertyChanged(object sender, PropertyChangedEventArgs args)
             }
         }
 
-        #endregion
 
         /// <summary>
         ///     All CustomNodeDefinitions which this Custom Node depends on.

src/DynamoCore/Models/DynamoModel.cs

@@ -902,8 +902,7 @@ private bool OpenFile(WorkspaceInfo workspaceInfo, XmlDocument xmlDoc, out Works
                 nodeGraph.Notes,
                 workspaceInfo,
                 DebugSettings.VerboseLogging, 
-                IsTestMode, 
-                nodeGraph.ElementResolver
+                IsTestMode
                );
 
             RegisterHomeWorkspace(newWorkspace);

src/DynamoCore/Models/HomeWorkspaceModel.cs

@@ -39,7 +39,7 @@ public class HomeWorkspaceModel : WorkspaceModel
                 Enumerable.Empty<NoteModel>(),
                 new WorkspaceInfo(){FileName = fileName, Name = "Home"},
                 verboseLogging, 
-                isTestMode, new ElementResolver()) { }
+                isTestMode) { }
 
         public HomeWorkspaceModel(
             EngineController engine, 
@@ -50,9 +50,8 @@ public class HomeWorkspaceModel : WorkspaceModel
             IEnumerable<NoteModel> n, 
             WorkspaceInfo info, 
             bool verboseLogging,
-            bool isTestMode, 
-            ElementResolver elementResolver)
-            : base(e, n, info, factory, elementResolver)
+            bool isTestMode)
+            : base(e, n, info, factory)
         {
             RunSettings = new RunSettings(info.RunType, info.RunPeriod);
 

src/DynamoCore/Models/WorkspaceModel.cs

@@ -423,6 +423,7 @@ public UndoRedoRecorder UndoRecorder
             get { return undoRecorder; }
         }
 
+        public ElementResolver ElementResolver { get; protected set; }
         /// <summary>
         /// A unique identifier for the workspace.
         /// </summary>
@@ -431,7 +432,6 @@ public Guid Guid
             get { return guid; }
         }
 
-        public ElementResolver ElementResolver { get; private set; }
 
         #endregion
 
@@ -441,8 +441,7 @@ public Guid Guid
             IEnumerable<NodeModel> e, 
             IEnumerable<NoteModel> n,
             WorkspaceInfo info, 
-            NodeFactory factory, 
-            ElementResolver elementResolver)
+            NodeFactory factory)
         {
             guid = Guid.NewGuid();
 
@@ -463,11 +462,20 @@ public Guid Guid
             undoRecorder = new UndoRedoRecorder(this);
 
             NodeFactory = factory;
-            ElementResolver = elementResolver;
 
+            // Update ElementResolver from nodeGraph.Nodes (where node is CBN)
+            ElementResolver = new ElementResolver();
             foreach (var node in nodes)
+            {
                 RegisterNode(node);
 
+                var cbn = node as CodeBlockNodeModel;
+                if (cbn != null && cbn.ElementResolver != null)
+                {
+                    ElementResolver.CopyResolutionMap(cbn.ElementResolver);
+                }
+            }
+
             foreach (var connector in Connectors)
                 RegisterConnector(connector);
         }
@@ -651,6 +659,7 @@ public virtual bool Save(ProtoCore.Core core)
 
         internal void ResetWorkspace()
         {
+            ElementResolver = new ElementResolver();
             ResetWorkspaceCore();
         }