Improve support for referenceDef. Now the stuff the referenceDef references only needs local scope for the reference, not global scope.

Author: Lyeeedar

StructuredXmlEditor/Data/Workspace.cs

@@ -590,7 +590,22 @@ public void LoadDefinitions()
 
 			foreach (var scope in ReferenceableDefinitions.Values)
 			{
-				foreach (var def in scope.Values)
+				foreach (var def in scope.Values.Where(e => e is ReferenceDefinition))
+				{
+					try
+					{
+						def.RecursivelyResolve(ReferenceableDefinitions[def.SrcFile], ReferenceableDefinitions[""], ReferenceableDefinitions);
+					}
+					catch (Exception ex)
+					{
+						Message.Show("Failed to resolve references in definition '" + def.Name + "'!\n\n" + ex.Message, "Resolve Definition Failed", "Ok");
+					}
+				}
+			}
+
+			foreach (var scope in ReferenceableDefinitions.Values)
+			{
+				foreach (var def in scope.Values.Where(e => !(e is ReferenceDefinition)))
 				{
 					try
 					{

StructuredXmlEditor/Definition/CollectionDefinition.cs

@@ -324,7 +324,16 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 				if (defs != null)
 				{
 					var def = defs[key] as ReferenceDefinition;
-					DefKeys = def.Keys;
+					
+					foreach (var keydef in def.Keys)
+					{
+						var childDef = def.Definitions[keydef.Item1];
+						var childWrapperDef = new CollectionChildDefinition();
+						childWrapperDef.WrappedDefinition = childDef;
+
+						ChildDefinitions.Add(childWrapperDef);
+						Keys.Add(new Tuple<CollectionChildDefinition, string>(childWrapperDef, keydef.Item2));
+					}
 				}
 				else
 				{

StructuredXmlEditor/Definition/ReferenceDefinition.cs

@@ -154,6 +154,7 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 				{
 					var def = defs[key] as ReferenceDefinition;
 					Keys = def.Keys;
+					Definitions = def.Definitions;
 
 					ListCollectionView lcv = new ListCollectionView(Keys);
 					lcv.GroupDescriptions.Add(new PropertyGroupDescription("Item2"));
@@ -164,32 +165,34 @@ public override void RecursivelyResolve(Dictionary<string, DataDefinition> local
 					Message.Show("Failed to find key " + DefKey + "!", "Reference Resolve Failed", "Ok");
 				}
 			}
-
-			foreach (var key in Keys)
+			else
 			{
-				Dictionary<string, DataDefinition> defs = null;
-				if (local.ContainsKey(key.Item1.ToLower())) defs = local;
-				else if (global.ContainsKey(key.Item1.ToLower())) defs = global;
-
-				if (defs != null)
+				foreach (var key in Keys)
 				{
-					Definitions[key.Item1] = defs[key.Item1.ToLower()];
-				}
-				else if (key.Item1 != "---")
-				{
-					Message.Show("Failed to find key " + key.Item1 + "!", "Reference Resolve Failed", "Ok");
+					Dictionary<string, DataDefinition> defs = null;
+					if (local.ContainsKey(key.Item1.ToLower())) defs = local;
+					else if (global.ContainsKey(key.Item1.ToLower())) defs = global;
+
+					if (defs != null)
+					{
+						Definitions[key.Item1] = defs[key.Item1.ToLower()];
+					}
+					else if (key.Item1 != "---")
+					{
+						Message.Show("Failed to find key " + key.Item1 + "!", "Reference Resolve Failed", "Ok");
+					}
 				}
-			}
 
-			if (Keys.Count == 0)
-			{
-				Keys.Add(new Tuple<string, string>("---", "---"));
+				if (Keys.Count == 0)
+				{
+					Keys.Add(new Tuple<string, string>("---", "---"));
 
-				ListCollectionView lcv = new ListCollectionView(Keys);
-				lcv.GroupDescriptions.Add(new PropertyGroupDescription("Item2"));
-				ItemsSource = lcv;
+					ListCollectionView lcv = new ListCollectionView(Keys);
+					lcv.GroupDescriptions.Add(new PropertyGroupDescription("Item2"));
+					ItemsSource = lcv;
 
-				Definitions["---"] = new DummyDefinition();
+					Definitions["---"] = new DummyDefinition();
+				}
 			}
 		}