Added support for storing breakpoints as relative paths via optional baseDir parameter in BreakpointStore Save/Load methods

David Karlaš · David Karlaš · commit 8ca826b7f7b7 · 2016-08-24T14:39:01.000+02:00
diff --git a/Mono.Debugging/Mono.Debugging.Client/BreakEvent.cs b/Mono.Debugging/Mono.Debugging.Client/BreakEvent.cs
@@ -50,7 +50,7 @@ public BreakEvent ()
 		{
 		}
 		
-		internal BreakEvent (XmlElement elem)
+		internal BreakEvent (XmlElement elem, string baseDir)
 		{
 			string s = elem.GetAttribute ("enabled");
 			if (s.Length > 0)
@@ -85,7 +85,7 @@ internal BreakEvent (XmlElement elem)
 				breakIfConditionChanges = false;
 		}
 		
-		internal virtual XmlElement ToXml (XmlDocument doc)
+		internal virtual XmlElement ToXml (XmlDocument doc, string baseDir)
 		{
 			XmlElement elem = doc.CreateElement (GetType().Name);
 			if (!enabled)
@@ -108,14 +108,14 @@ internal virtual XmlElement ToXml (XmlDocument doc)
 			return elem;
 		}
 		
-		internal static BreakEvent FromXml (XmlElement elem)
+		internal static BreakEvent FromXml (XmlElement elem, string baseDir)
 		{
 			if (elem.Name == "FunctionBreakpoint")
-				return new FunctionBreakpoint (elem);
+				return new FunctionBreakpoint (elem, baseDir);
 			if (elem.Name == "Breakpoint")
-				return new Breakpoint (elem);
+				return new Breakpoint (elem, baseDir);
 			if (elem.Name == "Catchpoint")
-				return new Catchpoint (elem);
+				return new Catchpoint (elem, baseDir);
 
 			return null;
 		}
diff --git a/Mono.Debugging/Mono.Debugging.Client/Breakpoint.cs b/Mono.Debugging/Mono.Debugging.Client/Breakpoint.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Xml;
+using System.IO;
 
 namespace Mono.Debugging.Client
 {
@@ -50,11 +51,16 @@ public Breakpoint (string fileName, int line) : this (fileName, line, 1)
 		{
 		}
 		
-		internal Breakpoint (XmlElement elem): base (elem)
+		internal Breakpoint (XmlElement elem, string baseDir) : base (elem, baseDir)
 		{
-			string s = elem.GetAttribute ("file");
-			if (!string.IsNullOrEmpty (s))
-				fileName = s;
+			string s = elem.GetAttribute ("relfile");
+			if (!string.IsNullOrEmpty (s) && baseDir != null) {
+				fileName = Path.Combine (baseDir, s);
+			} else {
+				s = elem.GetAttribute ("file");
+				if (!string.IsNullOrEmpty (s))
+					fileName = s;
+			}
 			
 			s = elem.GetAttribute ("line");
 			if (string.IsNullOrEmpty (s) || !int.TryParse (s, out line))
@@ -64,17 +70,22 @@ internal Breakpoint (XmlElement elem): base (elem)
 			if (string.IsNullOrEmpty (s) || !int.TryParse (s, out column))
 				column = 1;
 		}
-		
-		internal override XmlElement ToXml (XmlDocument doc)
+
+		internal override XmlElement ToXml (XmlDocument doc, string baseDir)
 		{
-			XmlElement elem = base.ToXml (doc);
-			
-			if (!string.IsNullOrEmpty (fileName))
+			XmlElement elem = base.ToXml (doc, baseDir);
+
+			if (!string.IsNullOrEmpty (fileName)) {
 				elem.SetAttribute ("file", fileName);
-			
+				if (baseDir != null) {
+					if (fileName.StartsWith (baseDir, StringComparison.Ordinal))
+						elem.SetAttribute ("relfile", fileName.Substring (baseDir.Length).TrimStart (Path.DirectorySeparatorChar));
+				}
+			}
+
 			elem.SetAttribute ("line", line.ToString ());
 			elem.SetAttribute ("column", column.ToString ());
-			
+
 			return elem;
 		}
 		
diff --git a/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs b/Mono.Debugging/Mono.Debugging.Client/BreakpointStore.cs
@@ -393,27 +393,27 @@ internal void ResetBreakpoints ()
 			}
 		}
 		
-		public XmlElement Save ()
+		public XmlElement Save (string baseDir = null)
 		{
 			XmlDocument doc = new XmlDocument ();
 			XmlElement elem = doc.CreateElement ("BreakpointStore");
 			foreach (BreakEvent ev in this) {
 				if (ev.NonUserBreakpoint)
 					continue;
-				XmlElement be = ev.ToXml (doc);
+				XmlElement be = ev.ToXml (doc, baseDir);
 				elem.AppendChild (be);
 			}
 			return elem;
 		}
 		
-		public void Load (XmlElement rootElem)
+		public void Load (XmlElement rootElem, string baseDir = null)
 		{
 			Clear ();
 			foreach (XmlNode n in rootElem.ChildNodes) {
 				XmlElement elem = n as XmlElement;
 				if (elem == null)
 					continue;
-				BreakEvent ev = BreakEvent.FromXml (elem);
+				BreakEvent ev = BreakEvent.FromXml (elem, baseDir);
 				if (ev != null)
 					Add (ev);
 			}
diff --git a/Mono.Debugging/Mono.Debugging.Client/Catchpoint.cs b/Mono.Debugging/Mono.Debugging.Client/Catchpoint.cs
@@ -46,7 +46,7 @@ public Catchpoint (string exceptionName, bool includeSubclasses)
 			this.includeSubclasses = includeSubclasses;
 		}
 		
-		internal Catchpoint (XmlElement elem): base (elem)
+		internal Catchpoint (XmlElement elem, string baseDir): base (elem, baseDir)
 		{
 			exceptionName = elem.GetAttribute ("exceptionName");
 
@@ -57,9 +57,9 @@ internal Catchpoint (XmlElement elem): base (elem)
 			}
 		}
 
-		internal override XmlElement ToXml (XmlDocument doc)
+		internal override XmlElement ToXml (XmlDocument doc, string baseDir)
 		{
-			XmlElement elem = base.ToXml (doc);
+			XmlElement elem = base.ToXml (doc, baseDir);
 			elem.SetAttribute ("exceptionName", exceptionName);
 			elem.SetAttribute ("includeSubclasses", includeSubclasses.ToString ());
 			return elem;
diff --git a/Mono.Debugging/Mono.Debugging.Client/FunctionBreakpoint.cs b/Mono.Debugging/Mono.Debugging.Client/FunctionBreakpoint.cs
@@ -129,7 +129,7 @@ public static bool TryParseParameters (string text, int startIndex, int endIndex
 			return true;
 		}
 		
-		internal FunctionBreakpoint (XmlElement elem) : base (elem)
+		internal FunctionBreakpoint (XmlElement elem, string baseDir) : base (elem, baseDir)
 		{
 			FunctionName = elem.GetAttribute ("function");
 			
@@ -152,9 +152,9 @@ internal FunctionBreakpoint (XmlElement elem) : base (elem)
 			FileName = null;
 		}
 		
-		internal override XmlElement ToXml (XmlDocument doc)
+		internal override XmlElement ToXml (XmlDocument doc, string baseDir)
 		{
-			XmlElement elem = base.ToXml (doc);
+			XmlElement elem = base.ToXml (doc, baseDir);
 			
 			elem.SetAttribute ("function", FunctionName);
 			elem.SetAttribute ("language", Language);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public BreakEvent ()`
`50`	`50`	`{`
`51`	`51`	`}`
`52`	`52`
`53`		`- internal BreakEvent (XmlElement elem)`
	`53`	`+ internal BreakEvent (XmlElement elem, string baseDir)`
`54`	`54`	`{`
`55`	`55`	`string s = elem.GetAttribute ("enabled");`
`56`	`56`	`if (s.Length > 0)`
`@@ -85,7 +85,7 @@ internal BreakEvent (XmlElement elem)`
`85`	`85`	`breakIfConditionChanges = false;`
`86`	`86`	`}`
`87`	`87`
`88`		`- internal virtual XmlElement ToXml (XmlDocument doc)`
	`88`	`+ internal virtual XmlElement ToXml (XmlDocument doc, string baseDir)`
`89`	`89`	`{`
`90`	`90`	`XmlElement elem = doc.CreateElement (GetType().Name);`
`91`	`91`	`if (!enabled)`
`@@ -108,14 +108,14 @@ internal virtual XmlElement ToXml (XmlDocument doc)`
`108`	`108`	`return elem;`
`109`	`109`	`}`
`110`	`110`
`111`		`- internal static BreakEvent FromXml (XmlElement elem)`
	`111`	`+ internal static BreakEvent FromXml (XmlElement elem, string baseDir)`
`112`	`112`	`{`
`113`	`113`	`if (elem.Name == "FunctionBreakpoint")`
`114`		`- return new FunctionBreakpoint (elem);`
	`114`	`+ return new FunctionBreakpoint (elem, baseDir);`
`115`	`115`	`if (elem.Name == "Breakpoint")`
`116`		`- return new Breakpoint (elem);`
	`116`	`+ return new Breakpoint (elem, baseDir);`
`117`	`117`	`if (elem.Name == "Catchpoint")`
`118`		`- return new Catchpoint (elem);`
	`118`	`+ return new Catchpoint (elem, baseDir);`
`119`	`119`
`120`	`120`	`return null;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,27 +393,27 @@ internal void ResetBreakpoints ()`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`- public XmlElement Save ()`
	`396`	`+ public XmlElement Save (string baseDir = null)`
`397`	`397`	`{`
`398`	`398`	`XmlDocument doc = new XmlDocument ();`
`399`	`399`	`XmlElement elem = doc.CreateElement ("BreakpointStore");`
`400`	`400`	`foreach (BreakEvent ev in this) {`
`401`	`401`	`if (ev.NonUserBreakpoint)`
`402`	`402`	`continue;`
`403`		`- XmlElement be = ev.ToXml (doc);`
	`403`	`+ XmlElement be = ev.ToXml (doc, baseDir);`
`404`	`404`	`elem.AppendChild (be);`
`405`	`405`	`}`
`406`	`406`	`return elem;`
`407`	`407`	`}`
`408`	`408`
`409`		`- public void Load (XmlElement rootElem)`
	`409`	`+ public void Load (XmlElement rootElem, string baseDir = null)`
`410`	`410`	`{`
`411`	`411`	`Clear ();`
`412`	`412`	`foreach (XmlNode n in rootElem.ChildNodes) {`
`413`	`413`	`XmlElement elem = n as XmlElement;`
`414`	`414`	`if (elem == null)`
`415`	`415`	`continue;`
`416`		`- BreakEvent ev = BreakEvent.FromXml (elem);`
	`416`	`+ BreakEvent ev = BreakEvent.FromXml (elem, baseDir);`
`417`	`417`	`if (ev != null)`
`418`	`418`	`Add (ev);`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Catchpoint (string exceptionName, bool includeSubclasses)`
`46`	`46`	`this.includeSubclasses = includeSubclasses;`
`47`	`47`	`}`
`48`	`48`
`49`		`- internal Catchpoint (XmlElement elem): base (elem)`
	`49`	`+ internal Catchpoint (XmlElement elem, string baseDir): base (elem, baseDir)`
`50`	`50`	`{`
`51`	`51`	`exceptionName = elem.GetAttribute ("exceptionName");`
`52`	`52`
`@@ -57,9 +57,9 @@ internal Catchpoint (XmlElement elem): base (elem)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- internal override XmlElement ToXml (XmlDocument doc)`
	`60`	`+ internal override XmlElement ToXml (XmlDocument doc, string baseDir)`
`61`	`61`	`{`
`62`		`- XmlElement elem = base.ToXml (doc);`
	`62`	`+ XmlElement elem = base.ToXml (doc, baseDir);`
`63`	`63`	`elem.SetAttribute ("exceptionName", exceptionName);`
`64`	`64`	`elem.SetAttribute ("includeSubclasses", includeSubclasses.ToString ());`
`65`	`65`	`return elem;`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public static bool TryParseParameters (string text, int startIndex, int endIndex`
`129`	`129`	`return true;`
`130`	`130`	`}`
`131`	`131`
`132`		`- internal FunctionBreakpoint (XmlElement elem) : base (elem)`
	`132`	`+ internal FunctionBreakpoint (XmlElement elem, string baseDir) : base (elem, baseDir)`
`133`	`133`	`{`
`134`	`134`	`FunctionName = elem.GetAttribute ("function");`
`135`	`135`
`@@ -152,9 +152,9 @@ internal FunctionBreakpoint (XmlElement elem) : base (elem)`
`152`	`152`	`FileName = null;`
`153`	`153`	`}`
`154`	`154`
`155`		`- internal override XmlElement ToXml (XmlDocument doc)`
	`155`	`+ internal override XmlElement ToXml (XmlDocument doc, string baseDir)`
`156`	`156`	`{`
`157`		`- XmlElement elem = base.ToXml (doc);`
	`157`	`+ XmlElement elem = base.ToXml (doc, baseDir);`
`158`	`158`
`159`	`159`	`elem.SetAttribute ("function", FunctionName);`
`160`	`160`	`elem.SetAttribute ("language", Language);`