Browse Source

fix SD-1743 - Replace all in selection - standard search

pull/5/head
Eusebiu Marcu 15 years ago
parent
commit
177338d47d
  1. 2
      src/AddIns/Misc/SearchAndReplace/Project/Engine/Search.cs
  2. 3
      src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplacePanel.cs
  3. 7
      src/Main/Base/Project/Src/Editor/Search/ProvidedDocumentInformation.cs

2
src/AddIns/Misc/SearchAndReplace/Project/Engine/Search.cs

@ -145,7 +145,7 @@ namespace SearchAndReplace @@ -145,7 +145,7 @@ namespace SearchAndReplace
if (documentIterator.MoveForward()) {
info = documentIterator.Current;
// document is valid for searching -> set iterator & fileName
if (info != null && info.EndOffset >= 0 && info.EndOffset < info.Document.TextLength) {
if (info != null && info.EndOffset >= 0 && info.EndOffset <= info.Document.TextLength) {
textIterator = textIteratorBuilder.BuildTextIterator(info);
} else {
textIterator = null;

3
src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplacePanel.cs

@ -432,7 +432,8 @@ namespace SearchAndReplace @@ -432,7 +432,8 @@ namespace SearchAndReplace
SearchReplaceManager.MarkAll(startOffset, endOffset - startOffset, monitor);
else if (action == 2)
SearchReplaceManager.ReplaceAll(startOffset, endOffset - startOffset, monitor);
textEditor.Select(startOffset, endOffset - startOffset);
textEditor.Select(startOffset, textEditor.SelectionLength);
} finally {
ignoreSelectionChanges = false;
}

7
src/Main/Base/Project/Src/Editor/Search/ProvidedDocumentInformation.cs

@ -40,9 +40,12 @@ namespace ICSharpCode.SharpDevelop.Editor.Search @@ -40,9 +40,12 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
}
public int CurrentOffset {
get {
get {
if (textEditor != null) {
return textEditor.Caret.Offset;
if (textEditor.SelectionLength > 0)
currentOffset = textEditor.SelectionStart;
else
currentOffset = textEditor.Caret.Offset;
}
return currentOffset;
}

Loading…
Cancel
Save