Browse Source

Prevent ArgumentOutOfRangeException in PaintDocumentLine when there are invalid folding markers.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2612 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
326db119e1
  1. 4
      src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
  2. 3
      src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs

4
src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs

@ -226,6 +226,10 @@ namespace ICSharpCode.TextEditor @@ -226,6 +226,10 @@ namespace ICSharpCode.TextEditor
physicalXPos = PaintLinePart(g, lineNumber, column, firstFolding.StartColumn, lineRectangle, physicalXPos);
column = firstFolding.EndColumn;
lineNumber = firstFolding.EndLine;
if (lineNumber >= textArea.Document.TotalNumberOfLines) {
Debug.Assert(false, "Folding ends after document end");
break;
}
ColumnRange selectionRange2 = textArea.SelectionManager.GetSelectionAtLine(lineNumber);
bool drawSelected = ColumnRange.WholeColumn.Equals(selectionRange2) || firstFolding.StartColumn >= selectionRange2.StartColumn && firstFolding.EndColumn <= selectionRange2.EndColumn;

3
src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs

@ -245,7 +245,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -245,7 +245,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
}
}
[Conditional("DEBUG")]
internal static void WarnObsoleteNode(XmlElement element, string message)
{
MessageService.ShowWarning("Obsolete node <" + element.Name +
@ -253,7 +252,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -253,7 +252,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
"':\n" + message);
}
[Conditional("DEBUG")]
internal static void WarnObsoleteAttribute(XmlElement element, string attribute, string message)
{
MessageService.ShowWarning("Obsolete attribute <" + element.Name +
@ -262,7 +260,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -262,7 +260,6 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
"':\n" + message);
}
[Conditional("DEBUG")]
internal static void WarnAttributeMissing(XmlElement element, string attribute)
{
MessageService.ShowWarning("Missing attribute <" + element.Name +

Loading…
Cancel
Save