diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-07-18 22:11:57 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-07-18 22:11:57 +0400 |
| commit | c6c4a9590af52a632a08619c2157329f2f08d790 (patch) | |
| tree | 204b605f7b80c724df18bafad5554560eee9876d /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles | |
| parent | e71ff5ff9f233b0265ccf1c4f957a502407632f8 (diff) | |
* 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
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs | 9 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs index 3dcb293322..b4cafad51e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs @@ -78,7 +78,7 @@ namespace MonoDevelop.Ide.FindInFiles return new StringReader (buffer.ToString ()); Document doc = SearchDocument (); if (doc != null) - return new StringReader (doc.TextEditor.Text); + return new StringReader (doc.Editor.Text); return new StreamReader (FileName); } @@ -106,7 +106,7 @@ namespace MonoDevelop.Ide.FindInFiles this.document = SearchDocument (); if (this.document != null) { Gtk.Application.Invoke (delegate { - document.TextEditor.BeginAtomicUndo (); + document.Editor.Document.BeginAtomicUndo (); }); return; } @@ -119,8 +119,7 @@ namespace MonoDevelop.Ide.FindInFiles buffer.Insert (offset, replacement); if (this.document != null) { Gtk.Application.Invoke (delegate { - document.TextEditor.DeleteText (offset, length); - document.TextEditor.InsertText (offset, replacement); + document.Editor.Replace (offset, length, replacement); }); return; } @@ -129,7 +128,7 @@ namespace MonoDevelop.Ide.FindInFiles public void EndReplace () { if (this.document != null) { - Gtk.Application.Invoke (delegate { document.TextEditor.EndAtomicUndo (); }); + Gtk.Application.Invoke (delegate { document.Editor.Document.EndAtomicUndo (); }); return; } if (buffer != null && somethingReplaced) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs index 6c6bcfef20..5857875410 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs @@ -82,8 +82,8 @@ namespace MonoDevelop.Ide.FindInFiles public override IEnumerable<FileProvider> GetFiles (IProgressMonitor monitor, FilterOptions filterOptions) { yield return new FileProvider(IdeApp.Workbench.ActiveDocument.FileName, null, - IdeApp.Workbench.ActiveDocument.TextEditor.SelectionStartPosition, - IdeApp.Workbench.ActiveDocument.TextEditor.SelectionEndPosition); + IdeApp.Workbench.ActiveDocument.Editor.SelectionRange.Offset, + IdeApp.Workbench.ActiveDocument.Editor.SelectionRange.EndOffset); } public override string GetDescription(FilterOptions filterOptions, string pattern, string replacePattern) |