Browse Source

SD2-856. When indenting xml that is not well formed SharpDevelop no longer displays an error message showing the XmlException.

XmlDoc.Load now does not throw an exception for invalid XML files.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1706 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
Daniel Grunwald 19 years ago
parent
commit
2b6d1139b6
  1. 18
      src/Main/Base/Project/Src/Dom/XmlDoc.cs
  2. 2
      src/Main/Base/Project/Src/TextEditor/XmlFormattingStrategy.cs

18
src/Main/Base/Project/Src/Dom/XmlDoc.cs

@ -230,16 +230,20 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -230,16 +230,20 @@ namespace ICSharpCode.SharpDevelop.Dom
public static XmlDoc Load(TextReader textReader)
{
XmlDoc newXmlDoc = new XmlDoc();
using (XmlTextReader reader = new XmlTextReader(textReader)) {
while (reader.Read()) {
if (reader.IsStartElement()) {
switch (reader.LocalName) {
case "members":
newXmlDoc.ReadMembersSection(reader);
break;
try {
using (XmlTextReader reader = new XmlTextReader(textReader)) {
while (reader.Read()) {
if (reader.IsStartElement()) {
switch (reader.LocalName) {
case "members":
newXmlDoc.ReadMembersSection(reader);
break;
}
}
}
}
} catch (XmlException ex) {
LoggingService.Warn("Error reading XML documentation file", ex);
}
return newXmlDoc;
}

2
src/Main/Base/Project/Src/TextEditor/XmlFormattingStrategy.cs

@ -95,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor @@ -95,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor
try {
TryIndent(textArea, begin, end);
} catch (XmlException ex) {
MessageService.ShowError(ex);
LoggingService.Debug(ex);
}
}

Loading…
Cancel
Save