Browse Source

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

This reverts commit cede650728.
pull/14/head
Daniel Grunwald 15 years ago
parent
commit
32c1efaf0f
  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
if (documentIterator.MoveForward()) { if (documentIterator.MoveForward()) {
info = documentIterator.Current; info = documentIterator.Current;
// document is valid for searching -> set iterator & fileName // 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); textIterator = textIteratorBuilder.BuildTextIterator(info);
} else { } else {
textIterator = null; textIterator = null;

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

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

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

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

Loading…
Cancel
Save