diff options
41 files changed, 114 insertions, 114 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Gui/RazorCSharpEditorExtension.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Gui/RazorCSharpEditorExtension.cs index 139f5f449c..d41084c236 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Gui/RazorCSharpEditorExtension.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Gui/RazorCSharpEditorExtension.cs @@ -125,13 +125,13 @@ namespace MonoDevelop.AspNet.Mvc.Gui int removalLength = e.RemovalLength;
if (off + removalLength > HiddenDoc.Editor.Length)
removalLength = HiddenDoc.Editor.Length - off;
- HiddenDoc.Editor.Remove (off, removalLength);
+ HiddenDoc.Editor.RemoveText (off, removalLength);
}
if (e.InsertionLength > 0) {
if (isInCSharpContext)
- HiddenDoc.Editor.Insert (off, e.InsertedText.Text);
+ HiddenDoc.Editor.InsertText (off, e.InsertedText.Text);
else // Insert spaces to correctly calculate offsets until next reparse
- HiddenDoc.Editor.Insert (off, new String (' ', e.InsertionLength));
+ HiddenDoc.Editor.InsertText (off, new String (' ', e.InsertionLength));
}
if (codeFragment != null)
codeFragment.EndOffset += (e.InsertionLength - e.RemovalLength);
@@ -353,7 +353,7 @@ namespace MonoDevelop.AspNet.Mvc.Gui // If it's first line of code, create a default temp mapping, and use it until next reparse
if (currentMappings.Count == 0) {
string newLine = "\r\n#line 0 \r\n ";
- HiddenDoc.Editor.Insert (defaultPosition, newLine);
+ HiddenDoc.Editor.InsertText (defaultPosition, newLine);
map = new KeyValuePair<int, GeneratedCodeMapping> (0, new GeneratedCodeMapping (currentOffset - 1, 0, 0, 0, 0));
currentMappings.Add (map);
} else {
@@ -391,8 +391,8 @@ namespace MonoDevelop.AspNet.Mvc.Gui // We start a new mapping right after the preceding one, but need to include the difference
// between mapping's start and the current offset
- HiddenDoc.Editor.Insert (newOff, newLine);
- HiddenDoc.Editor.Insert (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");
+ HiddenDoc.Editor.InsertText (newOff, newLine);
+ HiddenDoc.Editor.InsertText (newOff + newLine.Length, new String (' ', offDifference) + " \r\n");
var newMap = new KeyValuePair<int, GeneratedCodeMapping> (key, new GeneratedCodeMapping (
startRealOff + map.Value.CodeLength, 0, 0, 0, offDifference));
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs index 5685b9d302..d61075d6f6 100755..100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs @@ -372,7 +372,7 @@ namespace MonoDevelop.AspNet.Parser using (var undo = editor.OpenUndoGroup ()) { var oldCaret = editor.CaretOffset; var str = editor.GetEolMarker () + directive.ToString (); - editor.Insert (pos, str); + editor.InsertText (pos, str); var inserted = str.Length; if (preserveCaretPosition) { editor.CaretOffset = (pos < oldCaret)? oldCaret + inserted : oldCaret; diff --git a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs index 6c072300ee..9d251756ac 100644 --- a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs +++ b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs @@ -170,7 +170,7 @@ namespace CBinding int braceOpeningLine; if(GetClosingBraceForLine(Editor, line, out braceOpeningLine) >= 0) { - Editor.Replace (line.Offset, line.Length, GetIndent(Editor, braceOpeningLine, 0) + "}" + lineText.Substring(lineCursorIndex)); + Editor.ReplaceText (line.Offset, line.Length, GetIndent(Editor, braceOpeningLine, 0) + "}" + lineText.Substring(lineCursorIndex)); return false; } } @@ -185,7 +185,7 @@ namespace CBinding if (!String.IsNullOrEmpty (Editor.SelectedText)) { int cursorPos = Editor.SelectionRange.Offset; - Editor.Remove (Editor.SelectionRange); + Editor.RemoveText (Editor.SelectionRange); Editor.CaretOffset = cursorPos; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs index e7b3e130d0..d57fed505a 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/EventCreationCompletionData.cs @@ -80,7 +80,7 @@ namespace MonoDevelop.CSharp.Completion public override void InsertCompletionText (CompletionListWindow window, ref KeyActions ka, Gdk.Key closeChar, char keyChar, Gdk.ModifierType modifier) { // insert add/remove event handler code after +=/-= - editor.Replace (initialOffset, editor.CaretOffset - initialOffset, this.DisplayText + (AddSemicolon ? ";" : "")); + editor.ReplaceText (initialOffset, editor.CaretOffset - initialOffset, this.DisplayText + (AddSemicolon ? ";" : "")); // Search opening bracket of member int pos = callingMember != null && !callingMember.BodyRegion.Begin.IsEmpty ? editor.LocationToOffset (callingMember.BodyRegion.BeginLine, callingMember.BodyRegion.BeginColumn) : initialOffset; @@ -118,7 +118,7 @@ namespace MonoDevelop.CSharp.Completion sb.Append (editor.EolMarker); sb.Append (indent); sb.Append ("}"); - editor.Insert (pos, sb.ToString ()); + editor.InsertText (pos, sb.ToString ()); editor.CaretOffset = cursorPos; // start text link mode after insert diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs index 081d1bd58a..70ce64c9fa 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs @@ -321,7 +321,7 @@ namespace MonoDevelop.CSharp.Completion if (keyChar == '(') { var skipChar = Editor.SkipChars.LastOrDefault (); if (skipChar != null && skipChar.Offset == (window.CodeCompletionContext.TriggerOffset + partialWord.Length) && skipChar.Char == ')') - Editor.Remove (skipChar.Offset, 1); + Editor.RemoveText (skipChar.Offset, 1); } } ka |= KeyActions.Ignore; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs index a76574fa5e..a626098750 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs @@ -106,7 +106,7 @@ namespace MonoDevelop.CSharp.Completion targetCaretPosition = declarationBegin + sb.Length; } - editor.Replace (declarationBegin, editor.CaretOffset - declarationBegin, sb); + editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb); if (selectionEndPosition > 0) { editor.CaretOffset = selectionEndPosition; editor.SetSelection (targetCaretPosition, selectionEndPosition); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs index 669cd08694..b54f198185 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ProtocolCompletionData.cs @@ -75,7 +75,7 @@ namespace MonoDevelop.CSharp.Completion int targetCaretPosition = sb.LastIndexOf ("throw", StringComparison.Ordinal); int selectionEndPosition = sb.LastIndexOf (";", StringComparison.Ordinal); - editor.Replace (declarationBegin, editor.CaretOffset - declarationBegin, sb); + editor.ReplaceText (declarationBegin, editor.CaretOffset - declarationBegin, sb); if (selectionEndPosition > 0) { targetCaretPosition += declarationBegin; selectionEndPosition += declarationBegin; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs index c09ec07441..a04048962e 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.CSharp.Formatting // Possibly replace the indent string newIndent = tracker.ThisLineIndent; if (newIndent != curIndent) - data.Replace (lineSegment.Offset, nlwsp, newIndent); + data.ReplaceText (lineSegment.Offset, nlwsp, newIndent); } } catch (Exception e) { LoggingService.LogError ("Error while indenting", e); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs index 9344aa84b5..7d8c204151 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs @@ -261,7 +261,7 @@ namespace MonoDevelop.CSharp.Formatting return; var plainText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Decode (textEditorData.GetTextAt (offset, endOffset - offset)); var newText = TextPasteUtils.VerbatimStringStrategy.Encode (plainText); - textEditorData.Replace (offset, endOffset - offset, newText); + textEditorData.ReplaceText (offset, endOffset - offset, newText); } static void ConvertVerbatimStringToNormal (ITextDocument textEditorData, int offset) @@ -280,7 +280,7 @@ namespace MonoDevelop.CSharp.Formatting } var plainText = TextPasteUtils.VerbatimStringStrategy.Decode (textEditorData.GetTextAt (offset, endOffset - offset)); var newText = TextPasteUtils.StringLiteralPasteStrategy.Instance.Encode (plainText); - textEditorData.Replace (offset, endOffset - offset, newText); + textEditorData.ReplaceText (offset, endOffset - offset, newText); } internal IStateMachineIndentEngine StateTracker { get { return stateTracker; } } @@ -319,7 +319,7 @@ namespace MonoDevelop.CSharp.Formatting string tag = endIndex - startIndex > 0 ? lineText.Substring (startIndex + 1, endIndex - startIndex - 1) : null; if (!string.IsNullOrEmpty (tag) && CSharpCompletionEngine.CommentTags.Any (t => t == tag)) { var caretOffset = Editor.CaretOffset; - Editor.Insert (caretOffset, "</" + tag + ">"); + Editor.InsertText (caretOffset, "</" + tag + ">"); Editor.CaretOffset = caretOffset; } } @@ -337,7 +337,7 @@ namespace MonoDevelop.CSharp.Formatting Editor.SelectedText = "\t"; } else { - Editor.Insert (cursor, "\t"); + Editor.InsertText (cursor, "\t"); } // textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine); } @@ -345,7 +345,7 @@ namespace MonoDevelop.CSharp.Formatting if (Editor.CaretColumn > 1) { int delta = cursor - cursorPositionBeforeKeyPress; if (delta < 2 && delta > 0) { - Editor.Remove (cursor - delta, delta); + Editor.RemoveText (cursor - delta, delta); Editor.CaretOffset = cursor - delta; // textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine); } @@ -379,7 +379,7 @@ namespace MonoDevelop.CSharp.Formatting if (GuessSemicolonInsertionOffset (Editor, curLine, Editor.CaretOffset, out guessedOffset)) { using (var undo = Editor.OpenUndoGroup ()) { - Editor.Remove (Editor.CaretOffset - 1, 1); + Editor.RemoveText (Editor.CaretOffset - 1, 1); Editor.CaretOffset = guessedOffset; lastInsertedSemicolon = Editor.CaretOffset + 1; retval = base.KeyPress (key, keyChar, modifier); @@ -663,10 +663,10 @@ namespace MonoDevelop.CSharp.Formatting if (!foundPlus) break; if (sgn < 0) { - Editor.Remove (max, start - max); + Editor.RemoveText (max, start - max); Editor.CaretOffset = max + 1; } else { - Editor.Remove (start + sgn, max - start); + Editor.RemoveText (start + sgn, max - start); Editor.CaretOffset = start; } break; @@ -736,7 +736,7 @@ namespace MonoDevelop.CSharp.Formatting if (trimmedPreviousLine.Length > "///".Length || nextLine.StartsWith ("///", StringComparison.Ordinal)) { var insertionPoint = textEditorData.CaretOffset; - textEditorData.Insert (insertionPoint, "/// "); + textEditorData.InsertText (insertionPoint, "/// "); textEditorData.CaretOffset = insertionPoint + "/// ".Length; return true; } @@ -756,7 +756,7 @@ namespace MonoDevelop.CSharp.Formatting int indentSize = line.GetIndentation (textEditorData).Length; var insertedText = prevLine.GetIndentation (textEditorData) + commentPrefix; - textEditorData.Replace (line.Offset, indentSize, insertedText); + textEditorData.ReplaceText (line.Offset, indentSize, insertedText); textEditorData.CaretOffset = line.Offset + insertedText.Length; return true; } else if (wasInStringLiteral) { @@ -765,11 +765,11 @@ namespace MonoDevelop.CSharp.Formatting if (!lexer.IsInString) return false; textEditorData.EnsureCaretIsNotVirtual (); - textEditorData.Insert (prevLine.Offset + prevLine.Length, "\" +"); + textEditorData.InsertText (prevLine.Offset + prevLine.Length, "\" +"); int indentSize = textEditorData.CaretOffset - line.Offset; var insertedText = prevLine.GetIndentation (textEditorData) + (trimmedPreviousLine.StartsWith ("\"", StringComparison.Ordinal) ? "" : "\t") + "\""; - textEditorData.Replace (line.Offset, indentSize, insertedText); + textEditorData.ReplaceText (line.Offset, indentSize, insertedText); return true; } } @@ -816,7 +816,7 @@ namespace MonoDevelop.CSharp.Formatting CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp; } newIndentLength = newIndent.Length; - Editor.Replace (pos, nlwsp, newIndent); + Editor.ReplaceText (pos, nlwsp, newIndent); //textEditorData.CommitLineUpdate (textEditorData.CaretLine); CompletionWindowManager.HideWindow (); } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs index 43fd4d4460..3cccb1913e 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs @@ -105,7 +105,7 @@ namespace MonoDevelop.CSharp.Formatting if (pos < CompletionWindowManager.CodeCompletionContext.TriggerOffset) CompletionWindowManager.CodeCompletionContext.TriggerOffset -= nlwsp; } - indent.Editor.Replace (pos, nlwsp, newIndent); + indent.Editor.ReplaceText (pos, nlwsp, newIndent); // textEditorData.Document.CommitLineUpdate (textEditorData.CaretLine); } } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs index 386fa40251..eafc1623dd 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormatter.cs @@ -247,7 +247,7 @@ namespace MonoDevelop.CSharp.Formatting changes.ApplyChanges (formatStartOffset + startDelta, Math.Max (0, formatLength - startDelta - 1), delegate (int replaceOffset, int replaceLength, string insertText) { int translatedOffset = realTextDelta + replaceOffset; //data.Editor.Document.CommitLineUpdate (data.Editor.OffsetToLineNumber (translatedOffset)); - editor.Replace (translatedOffset, replaceLength, insertText); + editor.ReplaceText (translatedOffset, replaceLength, insertText); }, (replaceOffset, replaceLength, insertText) => { int translatedOffset = realTextDelta + replaceOffset; if (translatedOffset < 0 || translatedOffset + replaceLength > editor.Length || replaceLength < 0) diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs index a14eacc890..5183666496 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSelectionSurroundingProvider.cs @@ -97,9 +97,9 @@ namespace MonoDevelop.CSharp.Highlighting var lineSegment = editor.GetLine (lineNumber); if (lineSegment.Offset + startCol < lineSegment.EndOffset) - editor.Insert (lineSegment.Offset + startCol, start); + editor.InsertText (lineSegment.Offset + startCol, start); if (lineSegment.Offset + endCol < lineSegment.EndOffset) - editor.Insert (lineSegment.Offset + endCol, end); + editor.InsertText (lineSegment.Offset + endCol, end); } // textEditorData.MainSelection = new Selection ( @@ -111,8 +111,8 @@ namespace MonoDevelop.CSharp.Highlighting int anchorOffset = selectionRange.Offset; int leadOffset = selectionRange.EndOffset; - editor.Insert (anchorOffset, start); - editor.Insert (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end); + editor.InsertText (anchorOffset, start); + editor.InsertText (leadOffset >= anchorOffset ? leadOffset + start.Length : leadOffset, end); // textEditorData.SetSelection (anchorOffset + start.Length, leadOffset + start.Length); if (CSharpTextEditorIndentation.OnTheFlyFormatting) { var l1 = editor.GetLineByOffset (anchorOffset); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.NRefactoryWrapper/DocumentWrapper.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.NRefactoryWrapper/DocumentWrapper.cs index aef9e05c46..182e33512e 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.NRefactoryWrapper/DocumentWrapper.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.NRefactoryWrapper/DocumentWrapper.cs @@ -113,37 +113,37 @@ namespace MonoDevelop.CSharp.NRefactoryWrapper void IDocument.Insert (int offset, string text) { - document.Insert (offset, text); + document.InsertText (offset, text); } void IDocument.Insert (int offset, ITextSource text) { - document.Insert (offset, text.Text); + document.InsertText (offset, text.Text); } void IDocument.Insert (int offset, string text, AnchorMovementType defaultAnchorMovementType) { - document.Insert (offset, text); + document.InsertText (offset, text); } void IDocument.Insert (int offset, ITextSource text, AnchorMovementType defaultAnchorMovementType) { - document.Insert (offset, text.Text); + document.InsertText (offset, text.Text); } void IDocument.Remove (int offset, int length) { - document.Remove (offset, length); + document.RemoveText (offset, length); } void IDocument.Replace (int offset, int length, string newText) { - document.Replace (offset, length, newText); + document.ReplaceText (offset, length, newText); } void IDocument.Replace (int offset, int length, ITextSource newText) { - document.Replace (offset, length, newText.Text); + document.ReplaceText (offset, length, newText.Text); } void IDocument.StartUndoableAction () diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs index e973fb78a7..91a4ec4b50 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/Actions/MoveTypeToFile.cs @@ -118,7 +118,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeActions var doc = DocumentFactory.CreateNewDocument (new StringTextSource (content), "a.cs"); for (int i = 1; i + 1 <= doc.LineCount; i++) { if (IsBlankLine (doc, i) && IsBlankLine (doc, i + 1)) { - doc.Remove (doc.GetLine (i).SegmentIncludingDelimiter); + doc.RemoveText (doc.GetLine (i).SegmentIncludingDelimiter); i--; continue; } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs index 2badb9e1a1..a86727197b 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringScript.cs @@ -66,7 +66,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeActions { DisposeOnClose (true); foreach (var ver in context.TextEditor.Version.GetChangesTo (startVersion)) { - context.TextEditor.Replace (ver.Offset, ver.RemovalLength, ver.InsertedText.Text); + context.TextEditor.ReplaceText (ver.Offset, ver.RemovalLength, ver.InsertedText.Text); } } diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs index c1c2bedba9..727f122a79 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NRefactoryIssueProvider.cs @@ -173,7 +173,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues public override void DisableOnce (TextEditor editor, EditContext context, DocumentRegion loc) { - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (loc.BeginLine, 1), editor.GetVirtualIndentationString (loc.BeginLine) + "// " + analysisDisableTag + "disable once " + attr.AnalysisDisableKeyword + editor.EolMarker ); @@ -182,11 +182,11 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues public override void DisableAndRestore (TextEditor editor, EditContext context, DocumentRegion loc) { using (editor.OpenUndoGroup ()) { - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (loc.EndLine + 1, 1), editor.GetVirtualIndentationString (loc.EndLine) + "// " + analysisDisableTag + "restore " + attr.AnalysisDisableKeyword + editor.EolMarker ); - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (loc.BeginLine, 1), editor.GetVirtualIndentationString (loc.BeginLine) + "// " + analysisDisableTag + "disable " + attr.AnalysisDisableKeyword + editor.EolMarker ); @@ -196,11 +196,11 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues public override void DisableWithPragma (TextEditor editor, EditContext context, DocumentRegion loc) { using (editor.OpenUndoGroup ()) { - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (loc.EndLine + 1, 1), editor.GetVirtualIndentationString (loc.EndLine) + "#pragma warning restore " + attr.PragmaWarning + editor.EolMarker ); - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (loc.BeginLine, 1), editor.GetVirtualIndentationString (loc.BeginLine) + "#pragma warning disable " + attr.PragmaWarning + editor.EolMarker ); @@ -210,7 +210,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues public override void SuppressWithAttribute (TextEditor editor, EditContext context, DocumentRegion loc) { var member = context.ParsedDocument.GetMember (loc.End); - editor.Insert ( + editor.InsertText ( editor.LocationToOffset (member.Region.BeginLine, 1), editor.GetVirtualIndentationString (loc.BeginLine) + string.Format ("[SuppressMessage(\"{0}\", \"{1}\")]" + editor.EolMarker, attr.SuppressMessageCategory, attr.SuppressMessageCheckId) ); diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs index 69299cdc30..a78688a9f4 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs @@ -956,7 +956,7 @@ namespace MonoDevelop.CSharp.Refactoring while (lines-- > 0) { text.Append (editor.EolMarker); } - editor.Insert (offset, text.ToString ()); + editor.InsertText (offset, text.ToString ()); //doc.Editor.Document.CommitUpdateAll (); } @@ -1013,7 +1013,7 @@ namespace MonoDevelop.CSharp.Refactoring text.Append (editor.EolMarker); } - editor.Insert (offset, text.ToString ()); + editor.InsertText (offset, text.ToString ()); } public override string GetShortTypeString (TextEditor editor, EditContext doc, IType type) diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs index 387e160ea2..643ce952c1 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/HelperMethods.cs @@ -78,13 +78,13 @@ namespace MonoDevelop.CSharp.Refactoring public static void RemoveNode (this ITextDocument editor, AstNode n) { var change = editor.GetRemoveNodeChange (n); - editor.Remove (change.Offset, change.RemovedChars); + editor.RemoveText (change.Offset, change.RemovedChars); } public static void Replace (this ITextDocument editor, AstNode n, AstNode replaceWith) { var change = editor.GetRemoveNodeChange (n); - editor.Replace (change.Offset, change.RemovedChars, replaceWith.ToString ()); + editor.ReplaceText (change.Offset, change.RemovedChars, replaceWith.ToString ()); } } } diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs index 051ff15f30..5bfcd63773 100644 --- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs +++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs @@ -96,7 +96,7 @@ namespace MonoDevelop.ChangeLogAddIn + selectedFileName.Substring(changeLogFileNameDirectory.Length + 1) + ": " + eol + eol; int insertPos = Math.Min (pos + 2, textBuffer.Length); - textBuffer.Insert (insertPos, text); + textBuffer.InsertText (insertPos, text); insertPos += text.Length; textBuffer.CaretOffset = insertPos; @@ -128,7 +128,7 @@ namespace MonoDevelop.ChangeLogAddIn // the same don't insert a new header. int pos = GetHeaderEndPosition(document); if (pos < 0 || (pos + 2 > textBuffer.Length) || textBuffer.GetTextAt (0, pos + 2) != text) - textBuffer.Insert (0, text); + textBuffer.InsertText (0, text); return true; } diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs index db0190ee16..38d418c4f8 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DisassemblyView.cs @@ -308,7 +308,7 @@ namespace MonoDevelop.Debugger InsertAssemblerLine (sb, editorLine++, li); lineCount++; } - editor.Insert (offset, sb.ToString ()); + editor.InsertText (offset, sb.ToString ()); if (offset == 0) this.cachedLines.InsertRange (0, lines); else diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs index 2272150438..9dbe59d914 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/Commands.cs @@ -101,7 +101,7 @@ namespace MonoDevelop.DocFood } docs.Sort ((a, b) => b.Key.CompareTo (a.Key)); using (var undo = data.OpenUndoGroup ()) { - docs.ForEach (doc => data.Insert (doc.Key, doc.Value)); + docs.ForEach (doc => data.InsertText (doc.Key, doc.Value)); } } diff --git a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs index 3b30619513..6098ff3a69 100644 --- a/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs +++ b/main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs @@ -92,18 +92,18 @@ namespace MonoDevelop.DocFood int insertedLength; // Insert key (3rd undo step) - Editor.Insert (offset, "/"); + Editor.InsertText (offset, "/"); using (var undo = Editor.OpenUndoGroup ()) { documentationEmpty = Editor.FormatString (offset, documentationEmpty); insertedLength = documentationEmpty.Length; - Editor.Replace (offset, 1, documentationEmpty); + Editor.ReplaceText (offset, 1, documentationEmpty); // important to set the caret position here for the undo step Editor.CaretOffset = offset + insertedLength; } using (var undo = Editor.OpenUndoGroup ()) { documentation = Editor.FormatString (offset, documentation); - Editor.Replace (offset, insertedLength, documentation); + Editor.ReplaceText (offset, insertedLength, documentation); insertedLength = documentation.Length; if (SelectSummary (offset, insertedLength, documentation) == false) Editor.CaretOffset = offset + insertedLength; diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs index 2f0f852fd2..2b7e496d7d 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/Change.cs @@ -124,10 +124,10 @@ namespace MonoDevelop.Refactoring if (textEditorData == null) { bool open; var data = TextFileProvider.Instance.GetTextEditorData (FileName, out open); - data.Replace (Offset, RemovedChars, InsertedText); + data.ReplaceText (Offset, RemovedChars, InsertedText); data.Save (); } else { - textEditorData.Replace (Offset, RemovedChars, InsertedText); + textEditorData.ReplaceText (Offset, RemovedChars, InsertedText); } } diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs index 2544fae932..ab87e95dc3 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs @@ -149,7 +149,7 @@ namespace MonoDevelop.Refactoring changedDocument.FileName = replaceChange.FileName; changedDocument.Text = originalDocument.Text; - changedDocument.Replace (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText); + changedDocument.ReplaceText (replaceChange.Offset, replaceChange.RemovedChars, replaceChange.InsertedText); string diffString = Diff.GetDiffString (originalDocument, changedDocument); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs index 223c7352b8..6590062e00 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ResolveCommandHandler.cs @@ -557,7 +557,7 @@ namespace MonoDevelop.Refactoring if (!addUsing) { // var unit = doc.ParsedDocument.GetAst<SyntaxTree> (); int offset = editor.LocationToOffset (node.StartLocation); - editor.Insert (offset, ns + "."); + editor.InsertText (offset, ns + "."); //doc.Editor.Document.CommitLineUpdate (loc.Line); return; } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs index b81229a55a..c9ca51f9b1 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Wrappers/ITextDocumentWrapper.cs @@ -83,17 +83,17 @@ namespace MonoDevelop.SourceEditor.Wrappers } } - void ITextDocument.Insert (int offset, string text) + void ITextDocument.InsertText (int offset, string text) { document.Insert (offset, text); } - void ITextDocument.Remove (int offset, int length) + void ITextDocument.RemoveText (int offset, int length) { document.Remove (offset, length); } - void ITextDocument.Replace (int offset, int length, string value) + void ITextDocument.ReplaceText (int offset, int length, string value) { document.Replace (offset, length, value); } diff --git a/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs b/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs index fa3ca8e717..22e98dd3a2 100644 --- a/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs +++ b/main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs @@ -233,7 +233,7 @@ namespace MonoDevelop.XmlEditor.Gui newCaretOffset += (indent.Length - oldIndent.Length); } using (var undo = Editor.OpenUndoGroup ()) { - Editor.Replace (seg.Offset, oldIndent.Length, indent); + Editor.ReplaceText (seg.Offset, oldIndent.Length, indent); Editor.CaretOffset = newCaretOffset; } } @@ -416,7 +416,7 @@ namespace MonoDevelop.XmlEditor.Gui // this.Editor.Document.EndAtomicUndo (); using (var undo = buf.OpenUndoGroup ()) { - buf.Insert (buf.CaretOffset, tag); + buf.InsertText (buf.CaretOffset, tag); buf.CaretOffset -= tag.Length; } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs index 8952893b72..6604319b7d 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs @@ -627,7 +627,7 @@ namespace MonoDevelop.VersionControl.Views var data = dict [(TextDocument)sender]; localUpdate.Remove (data); var editor = info.Document.GetContent<MonoDevelop.Ide.Editor.ITextDocument> (); - editor.Replace (e.Offset, e.RemovalLength, e.InsertedText.Text); + editor.ReplaceText (e.Offset, e.RemovalLength, e.InsertedText.Text); localUpdate.Add (data); UpdateDiff (); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs index 853c82f5ba..ad1b4b5002 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingCommands.cs @@ -108,7 +108,7 @@ namespace MonoDevelop.Ide.CodeFormatting try { string text = formatter.FormatText (pol, editor.Text, selection.Offset, selection.EndOffset); if (text != null) { - editor.Replace (selection.Offset, selection.Length, text); + editor.ReplaceText (selection.Offset, selection.Length, text); } } catch (Exception e) { LoggingService.LogError ("Error during format.", e); 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 0aa987a8c0..443a245d2f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs @@ -155,7 +155,7 @@ namespace MonoDevelop.Ide.CodeTemplates { int offset = editor.CaretOffset; int start = FindPrevWordStart (editor, offset); - editor.Remove (start, offset - start); + editor.RemoveText (start, offset - start); return start; } @@ -326,7 +326,7 @@ namespace MonoDevelop.Ide.CodeTemplates for (int i = 1; i < data.LineCount; i++) { var line = data.GetLine (i + 1); if (line.Length > 0) - data.Insert (line.Offset, lineIndent); + data.InsertText (line.Offset, lineIndent); } } @@ -417,7 +417,7 @@ namespace MonoDevelop.Ide.CodeTemplates } templateCtx.LineIndent = data.GetLineIndent (data.OffsetToLineNumber (start)); templateCtx.SelectedText = RemoveIndent (data.GetTextBetween (start, end), templateCtx.LineIndent); - data.Remove (start, end - start); + data.RemoveText (start, end - start); offset = start; } else { string word = GetWordBeforeCaret (data).Trim (); @@ -427,7 +427,7 @@ namespace MonoDevelop.Ide.CodeTemplates TemplateResult template = FillVariables (templateCtx); template.InsertPosition = offset; - editor.Insert (offset, template.Code); + editor.InsertText (offset, template.Code); int newoffset; if (template.CaretEndOffset >= 0) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs index 8a1811a1e8..e99d807c84 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/EditCommands.cs @@ -251,7 +251,7 @@ namespace MonoDevelop.Ide.Commands { Document doc = IdeApp.Workbench.ActiveDocument; string header = MonoDevelop.Ide.StandardHeader.StandardHeaderService.GetHeader (doc.Project, doc.Name, false); - doc.Editor.Insert (0, header + "\n"); + doc.Editor.InsertText (0, header + "\n"); } protected override void Update (CommandInfo info) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs index 8864bd0ac4..03fc0cf8b3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/ITextDocument.cs @@ -71,11 +71,11 @@ namespace MonoDevelop.Ide.Editor new Encoding Encoding { get; set; } - void Insert (int offset, string text); + void InsertText (int offset, string text); - void Remove (int offset, int length); + void RemoveText (int offset, int length); - void Replace (int offset, int length, string value); + void ReplaceText (int offset, int length, string value); bool IsInAtomicUndo { get; @@ -276,18 +276,18 @@ namespace MonoDevelop.Ide.Editor return document.GetTextBetween (document.LocationToOffset (start), document.LocationToOffset (end)); } - public static void Remove (this ITextDocument document, ISegment segment) + public static void RemoveText (this ITextDocument document, ISegment segment) { if (document == null) throw new ArgumentNullException ("document"); - document.Remove (segment.Offset, segment.Length); + document.RemoveText (segment.Offset, segment.Length); } - public static void Replace (this ITextDocument document, ISegment segment, string value) + public static void ReplaceText (this ITextDocument document, ISegment segment, string value) { if (document == null) throw new ArgumentNullException ("document"); - document.Replace (segment.Offset, segment.Length, value); + document.ReplaceText (segment.Offset, segment.Length, value); } public static string GetEolMarker (this IReadonlyTextDocument document) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs index 4693da6df0..ebc13660eb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InsertionPoint.cs @@ -71,7 +71,7 @@ namespace MonoDevelop.Ide.Editor return; } - editor.Insert (offset, str); + editor.InsertText (offset, str); offset += str.Length; } @@ -89,7 +89,7 @@ namespace MonoDevelop.Ide.Editor InsertNewLine (editor, LineBefore, ref offset); int result = offset - insertionOffset; - editor.Insert (offset, text); + editor.InsertText (offset, text); offset += text.Length; InsertNewLine (editor, LineAfter, ref offset); return result; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs index 57da823606..366f37e060 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs @@ -214,7 +214,7 @@ namespace MonoDevelop.Ide.Editor } set { var selection = SelectionRange; - Replace (selection, value); + ReplaceText (selection, value); SelectionRange = new TextSegment (selection.Offset, value.Length); } } @@ -443,7 +443,7 @@ namespace MonoDevelop.Ide.Editor public void InsertAtCaret (string text) { - Insert (CaretOffset, text); + InsertText (CaretOffset, text); } public DocumentLocation PointToLocation (double xp, double yp, bool endAtEol = false) @@ -482,33 +482,33 @@ namespace MonoDevelop.Ide.Editor return ReadOnlyTextDocument.OffsetToLocation (offset); } - public void Insert (int offset, string text) + public void InsertText (int offset, string text) { - ReadWriteTextDocument.Insert (offset, text); + ReadWriteTextDocument.InsertText (offset, text); } - public void Remove (int offset, int count) + public void RemoveText (int offset, int count) { - Remove (new TextSegment (offset, count)); + RemoveText (new TextSegment (offset, count)); } - public void Remove (ISegment segment) + public void RemoveText (ISegment segment) { if (segment == null) throw new ArgumentNullException ("segment"); - ReadWriteTextDocument.Remove (segment); + ReadWriteTextDocument.RemoveText (segment); } - public void Replace (int offset, int count, string value) + public void ReplaceText (int offset, int count, string value) { - ReadWriteTextDocument.Replace (offset, count, value); + ReadWriteTextDocument.ReplaceText (offset, count, value); } - public void Replace (ISegment segment, string value) + public void ReplaceText (ISegment segment, string value) { if (segment == null) throw new ArgumentNullException ("segment"); - ReadWriteTextDocument.Replace (segment.Offset, segment.Length, value); + ReadWriteTextDocument.ReplaceText (segment.Offset, segment.Length, value); } public IDocumentLine GetLine (int lineNumber) 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 7fee9b05b3..67595e92d6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FileProvider.cs @@ -124,7 +124,7 @@ namespace MonoDevelop.Ide.FindInFiles buffer.Insert (offset, replacement); if (document != null) { Gtk.Application.Invoke (delegate { - document.Editor.Replace (offset, length, replacement); + document.Editor.ReplaceText (offset, length, replacement); }); return; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs index b1c06694fc..df8f35bcff 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HiddenTextEditorViewContent.cs @@ -84,13 +84,13 @@ namespace MonoDevelop.Ide.Gui public int InsertText (int position, string text) { - editor.Insert (position, text); + editor.InsertText (position, text); return text.Length; } public void DeleteText (int position, int length) { - editor.Replace (position, length, ""); + editor.ReplaceText (position, length, ""); } public int Length { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs index 0801af6e05..4d1b8659e9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs @@ -255,8 +255,8 @@ namespace MonoDevelop.Ide.Gui return; } using (var undo = buffer.OpenUndoGroup ()) { - buffer.Remove (pos, 1); - buffer.Insert (pos, upper); + buffer.RemoveText (pos, 1); + buffer.InsertText (pos, upper); buffer.CaretOffset = pos + 1; } } else { @@ -265,8 +265,8 @@ namespace MonoDevelop.Ide.Gui return; int startPos = buffer.SelectionRange.Offset; using (var undo = buffer.OpenUndoGroup ()) { - buffer.Remove (startPos, selectedText.Length); - buffer.Insert (startPos, newText); + buffer.RemoveText (startPos, selectedText.Length); + buffer.InsertText (startPos, newText); buffer.SetSelection (startPos, startPos + newText.Length); } } @@ -296,8 +296,8 @@ namespace MonoDevelop.Ide.Gui return; }; using (var undo = buffer.OpenUndoGroup ()) { - buffer.Remove (pos, 1); - buffer.Insert (pos, lower); + buffer.RemoveText (pos, 1); + buffer.InsertText (pos, lower); buffer.CaretOffset = pos + 1; } } else { @@ -306,8 +306,8 @@ namespace MonoDevelop.Ide.Gui return; int startPos = buffer.SelectionRange.Offset; using (var undo = buffer.OpenUndoGroup ()) { - buffer.Remove (startPos, selectedText.Length); - buffer.Insert (startPos, newText); + buffer.RemoveText (startPos, selectedText.Length); + buffer.InsertText (startPos, newText); buffer.SetSelection (startPos, startPos + newText.Length); } } @@ -408,7 +408,7 @@ namespace MonoDevelop.Ide.Gui protected void OnDeleteLine () { var line = doc.Editor.GetLine (doc.Editor.CaretLocation.Line); - doc.Editor.Remove (line.Offset, line.LengthIncludingDelimiter); + doc.Editor.RemoveText (line.Offset, line.LengthIncludingDelimiter); } struct RemoveInfo @@ -482,7 +482,7 @@ namespace MonoDevelop.Ide.Gui } using (var undo = data.OpenUndoGroup ()) { foreach (var info in removeList) { - data.Remove (info.Position, info.Length); + data.RemoveText (info.Position, info.Length); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs index 2de833b755..1186ae6d2e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs @@ -517,7 +517,7 @@ namespace MonoDevelop.Ide.Tasks doc.Editor.StartCaretPulseAnimation (); line = line.Substring (0, index); var ls = doc.Editor.GetLine (task.Line); - doc.Editor.Replace (ls.Offset, ls.Length, line); + doc.Editor.ReplaceText (ls.Offset, ls.Length, line); comments.Remove (task); } }); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs index 8154365944..9ec8549e93 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs @@ -108,7 +108,7 @@ namespace MonoDevelop.Ide.Templates for (int i = 1; i <= doc.LineCount; i++) { var line = doc.GetLine (i); if (IsBlankLine (doc, line) && line.LengthIncludingDelimiter > 0) { - doc.Remove (line.Offset, line.LengthIncludingDelimiter); + doc.RemoveText (line.Offset, line.LengthIncludingDelimiter); i--; continue; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs index ca16ee3a81..4fc269da38 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/CodeGenerationService.cs @@ -541,7 +541,7 @@ namespace MonoDevelop.Ide.TypeSystem int pos = buffer.LocationToOffset (cls.Region.BeginLine, cls.Region.BeginColumn); code = buffer.GetLineIndent (cls.Region.BeginLine) + code; - buffer.Insert (pos, code); + buffer.InsertText (pos, code); if (!isOpen) { File.WriteAllText (fileName, buffer.Text); } diff --git a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs index b2588e1993..1fbcdab786 100644 --- a/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs +++ b/main/tests/UnitTests/MonoDevelop.CSharpBinding.Refactoring/GenerateNewMemberTests.cs @@ -107,7 +107,7 @@ namespace MonoDevelop.CSharpBinding.Refactoring var vv = data.OffsetToLocation (data.Length); loc.Add (new InsertionPoint (new DocumentLocation (vv.Line, vv.Column), insertBefore, insertAfter)); } else { - data.Insert (data.Length, ch.ToString ()); + data.InsertText (data.Length, ch.ToString ()); } } |