From 09577bbc9b84bd9eeb58bf1fa641b5c7e189fb9e Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Fri, 23 Mar 2012 14:45:30 +0100
Subject: [PATCH] apply Matt's suggestion on readability

---
 .../Project/Src/XmlCodeCompletionBinding.cs         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCodeCompletionBinding.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCodeCompletionBinding.cs
index d229e99e83..56c786f773 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCodeCompletionBinding.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlCodeCompletionBinding.cs
@@ -5,7 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+
+using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
 
@@ -73,9 +76,9 @@ namespace ICSharpCode.XmlEditor
 			int elementStartIndex = XmlParser.GetActiveElementStartIndex(editor.Document.Text, editor.Caret.Offset);
 			if (elementStartIndex <= -1)
 				return false;
-			if (editor.Document.GetText(elementStartIndex, editor.Document.TextLength >= elementStartIndex + "<!".Length ? "<!".Length : editor.Document.TextLength - elementStartIndex).Equals("<!", StringComparison.OrdinalIgnoreCase))
+			if (ElementStartsWith("<!", elementStartIndex, editor.Document))
 				return false;
-			if (editor.Document.GetText(elementStartIndex, editor.Document.TextLength >= elementStartIndex + "<?".Length ? "<?".Length : editor.Document.TextLength - elementStartIndex).Equals("<?", StringComparison.OrdinalIgnoreCase))
+			if (ElementStartsWith("<?", elementStartIndex, editor.Document))
 				return false;
 			
 			XmlSchemaCompletion defaultSchema = schemaFileAssociations.GetSchemaCompletion(editor.FileName);
@@ -93,5 +96,11 @@ namespace ICSharpCode.XmlEditor
 			}
 			return false;
 		}
+		
+		bool ElementStartsWith(string text, int elementStartIndex, ITextBuffer document)
+		{
+			int textLength = Math.Min(text.Length, document.TextLength - elementStartIndex);
+			return document.GetText(elementStartIndex, textLength).Equals(text, StringComparison.OrdinalIgnoreCase);
+		}
 	}
 }