Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 22 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 29af14ddc..d1ea9de43 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -133,7 +133,7 @@ namespace Tango.Scripting.Editors
             set { SetValue(ReferenceAssembliesProperty, value); }
         }
         public static readonly DependencyProperty ReferenceAssembliesProperty =
-            DependencyProperty.Register("ReferenceAssemblies", typeof(ObservableCollection<Assembly>), typeof(ScriptEditor), new PropertyMetadata(null));
+            DependencyProperty.Register("ReferenceAssemblies", typeof(ObservableCollection<Assembly>), typeof(ScriptEditor), new PropertyMetadata(null, (d, e) => (d as ScriptEditor).OnReferenceAssembliesChanged()));
 
         public Object CurrentPopupContent
         {
@@ -1520,7 +1520,7 @@ namespace Tango.Scripting.Editors
 
                         foreach (var knownType in _knownTypesCache.ToList().Select(x => x.Value).ToList())
                         {
-                            if (usings.Exists(x => knownType.Type.Namespace == x))
+                            if (usings.Exists(x => knownType.Type.Namespace == x) && assemblies.Exists(x => x == knownType.Type.Assembly))
                             {
                                 lock (_knownTypes)
                                 {
@@ -2080,5 +2080,25 @@ namespace Tango.Scripting.Editors
         }
 
         #endregion
+
+        #region Reference Assemblies Changed
+
+        private void OnReferenceAssembliesChanged()
+        {
+            if (ReferenceAssemblies != null)
+            {
+                ReferenceAssemblies.CollectionChanged -= ReferenceAssemblies_CollectionChanged;
+                ReferenceAssemblies.CollectionChanged += ReferenceAssemblies_CollectionChanged;
+
+                InvalidateHighlighting();
+            }
+        }
+
+        private void ReferenceAssemblies_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            InvalidateHighlighting();
+        }
+
+        #endregion
     }
 }