* Makefile.am:

* MonoDevelop.Ide.csproj:
* MonoDevelop.Ide.Gui/Document.cs:
* MonoDevelop.Ide.Gui/Workbench.cs:
* MonoDevelop.Ide.Gui/TextEditor.cs:
* MonoDevelop.Ide.FindInFiles/Scope.cs:
* MonoDevelop.Ide.Commands/EditCommands.cs:
* MonoDevelop.Ide.Commands/ViewCommands.cs:
* MonoDevelop.Ide.Tasks/CommentTasksView.cs:
* MonoDevelop.Ide.Gui/ViewCommandHandlers.cs:
* MonoDevelop.Ide.FindInFiles/FileProvider.cs:
* MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs:
* MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs:
* MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs:
* MonoDevelop.Ide.Commands/CustomStringTagProvider.cs:
* MonoDevelop.Ide.Navigation/NavigationHistoryService.cs:
* MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs:
* MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs:
* MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs:
  Replaced old text editor reminders with mono.texteditor & renamed
  the texteditordata property to editor.

svn path=/trunk/monodevelop/; revision=160541

2 files changed, 7 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
index d6b8e7b020..53b6c2592b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
@@ -354,7 +354,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 		{
 			ProjectDom dom = document.Dom;
 			ParsedDocument doc = document.ParsedDocument ?? MonoDevelop.Projects.Dom.Parser.ProjectDomService.GetParsedDocument (dom, document.FileName);
-			Mono.TextEditor.TextEditorData data = document.TextEditorData;
+			Mono.TextEditor.TextEditorData data = document.Editor;
 
 			int offset = data.Caret.Offset;
 //			string leadingWhiteSpace = GetLeadingWhiteSpace (editor, editor.CursorLine);
@@ -366,7 +366,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 				ParsedDocument = doc,
 				InsertPosition = new DomLocation (data.Caret.Line + 1, data.Caret.Column + 1),
 				LineIndent = data.Document.GetLineIndent (data.Caret.Line),
-				TemplateCode = IndentCode (Code, document.TextEditorData.EolMarker, data.Document.GetLineIndent (data.Caret.Line))
+				TemplateCode = IndentCode (Code, document.Editor.EolMarker, data.Document.GetLineIndent (data.Caret.Line))
 			};
 
 			if (data.IsSomethingSelected) {
@@ -390,12 +390,12 @@ namespace MonoDevelop.Ide.CodeTemplates
 			
 			TemplateResult template = FillVariables (context);
 			template.InsertPosition = offset;
-			document.TextEditorData.Insert (offset, template.Code);
+			document.Editor.Insert (offset, template.Code);
 			
 			if (template.CaretEndOffset >= 0) {
-				document.TextEditorData.Caret.Offset = offset + template.CaretEndOffset; 
+				document.Editor.Caret.Offset = offset + template.CaretEndOffset; 
 			} else {
-				document.TextEditorData.Caret.Offset= offset + template.Code.Length; 
+				document.Editor.Caret.Offset= offset + template.Code.Length; 
 			}
 			return template;
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
index b453288932..47063eee26 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs
@@ -105,7 +105,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			
 			ITextEditorResolver textEditorResolver = CurrentContext.Document.GetContent <ITextEditorResolver> ();
 			if (textEditorResolver != null) {
-				ResolveResult result = textEditorResolver.GetLanguageItem (CurrentContext.Document.TextEditor.GetPositionFromLineColumn (CurrentContext.InsertPosition.Line, CurrentContext.InsertPosition.Column), var);
+				ResolveResult result = textEditorResolver.GetLanguageItem (CurrentContext.Document.Editor.Document.LocationToOffset (CurrentContext.InsertPosition.Line -1, CurrentContext.InsertPosition.Column - 1), var);
 				if (result != null && (result.ResolvedType.ArrayDimensions > 0 || result.ResolvedType.FullName == DomReturnType.String.FullName))
 					return "Length";
 			}
@@ -120,7 +120,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			string var = callback (varName);
 			ITextEditorResolver textEditorResolver = CurrentContext.Document.GetContent <ITextEditorResolver> ();
 			if (textEditorResolver != null) {
-				ResolveResult result =  textEditorResolver.GetLanguageItem (CurrentContext.Document.TextEditor.CursorPosition, var);
+				ResolveResult result =  textEditorResolver.GetLanguageItem (CurrentContext.Document.Editor.Caret.Offset, var);
 				if (result != null) {
 					IReturnType componentType =  DomType.GetComponentType (CurrentContext.ProjectDom, result.ResolvedType);
 					if (componentType != null) {