pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

code cleanup

pull/23/head
Siegfried Pammer 14 years ago
parent
79a5c54f73
commit
11dc1c4df7
1 changed files with 101 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 181
      src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs

181
src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchManager.cs
Unescape View File

@ -195,80 +195,123 @@ namespace SearchAndReplace @@ -195,80 +195,123 @@ namespace SearchAndReplace
{
if (string.IsNullOrEmpty(pattern))
return null;
var tmp = GenerateFileList(target, baseDirectory, filter, searchSubdirs).ToList();
var active = GetActiveTextEditor();
if (active != null) {
int index = tmp.FindIndex(fn => fn.Equals(active.FileName));
if (index > 0) {
var item = tmp[index];
tmp.RemoveAt(index);
tmp.Insert(0, item);
}
}
var files = tmp.ToArray();
bool isNewSearch = currentSearchRegion == null || !currentSearchRegion.IsSameState(files, pattern, ignoreCase, matchWholeWords, mode, target, baseDirectory, filter, searchSubdirs);
if (isNewSearch)
currentSearchRegion = CreateSearchRegion(files, pattern, ignoreCase, matchWholeWords, mode, target, baseDirectory, filter, searchSubdirs);
var files = GenerateFileList(target, baseDirectory, filter, searchSubdirs).ToArray();
if (currentSearchRegion == null || !currentSearchRegion.IsSameState(files, pattern, ignoreCase, matchWholeWords, mode,
target, baseDirectory, filter, searchSubdirs))
currentSearchRegion = SearchRegion.CreateSearchRegion(files, pattern, ignoreCase, matchWholeWords, mode,
target, baseDirectory, filter, searchSubdirs);
if (currentSearchRegion == null)
return null;
if (currentSearchRegion.Files.Length == 0)
return null;
if (currentSearchRegion.CurrentFile < 0 || currentSearchRegion.CurrentFile >= currentSearchRegion.Files.Length)
currentSearchRegion.CurrentFile = 0;
var result = currentSearchRegion.FindNext();
if (result == null)
currentSearchRegion = null;
return result;
}
class SearchRegion
{
FileName[] files;
AnchorSegment selection;
public AnchorSegment Selection {
get { return selection; }
}
PermanentAnchor searchStart;
public PermanentAnchor SearchStart {
get { return searchStart; }
}
ISearchStrategy strategy;
public ISearchStrategy Strategy {
get {
if (strategy == null)
strategy = SearchStrategyFactory.Create(pattern, ignoreCase, matchWholeWords, mode);
return strategy;
}
}
IEnumerator<SearchResultMatch> enumerator;
ParseableFileContentFinder finder = new ParseableFileContentFinder();
while (currentSearchRegion.CurrentFile < currentSearchRegion.Files.Length) {
FileName currentFile = currentSearchRegion.Files[currentSearchRegion.CurrentFile];
var buffer = finder.Create(currentFile);
public SearchResultMatch FindNext()
{
if (enumerator == null)
enumerator = RunSearch();
if (enumerator.MoveNext())
return enumerator.Current;
return null;
}
IEnumerator<SearchResultMatch> RunSearch()
{
int startIndex = files.FindIndex(file => file.Equals(searchStart.FileName));
int endIndex = files.Length - 1;
int index = startIndex;
bool processSecondPart = false;
while (index <= endIndex) {
FileName file = files[index];
ITextBuffer buffer = finder.Create(file);
if (buffer == null) {
currentSearchRegion.Repeat = false;
currentSearchRegion.CurrentFile++;
processSecondPart = false;
index++;
continue;
}
int offset, length;
if (currentSearchRegion.LastSearchOffset < 0) {
if (currentSearchRegion.Selection == null)
offset = currentSearchRegion.SearchStart.Offset;
else
offset = Math.Max(currentSearchRegion.Selection.Offset, currentSearchRegion.SearchStart.Offset);
} else
offset = currentSearchRegion.LastSearchOffset;
if (currentSearchRegion.Selection == null)
length = buffer.TextLength - offset;
else
length = currentSearchRegion.Selection.EndOffset - offset;
var document = new TextDocument(DocumentUtilitites.GetTextSource(buffer));
var result = currentSearchRegion.Strategy.FindNext(DocumentUtilitites.GetTextSource(buffer), offset, length);
ICSharpCode.AvalonEdit.Search.ISearchResult result;
var editor = GetActiveTextEditor();
int searchOffset = 0;
if (!processSecondPart && file.Equals(searchStart.FileName))
searchOffset = searchStart.Offset;
if (editor != null && files.Equals(editor.FileName))
searchOffset = editor.Caret.Offset;
do {
int length;
if (Selection != null && file.Equals(searchStart.FileName)) {
searchOffset = Math.Max(Selection.Offset, searchOffset);
length = Selection.EndOffset - searchOffset;
} else {
length = buffer.TextLength - searchOffset;
}
if (length > 0 && (searchOffset + length) <= buffer.TextLength)
result = currentSearchRegion.Strategy.FindNext(DocumentUtilitites.GetTextSource(buffer), searchOffset, length);
else
result = null;
if (result != null)
currentSearchRegion.LastSearchOffset = result.EndOffset;
searchOffset = result.EndOffset;
if (currentSearchRegion.Repeat && currentFile.Equals(currentSearchRegion.SearchStart.FileName) && currentSearchRegion.LastSearchOffset >= currentSearchRegion.SearchStart.Offset) {
currentSearchRegion = null;
return null;
if (processSecondPart && file.Equals(SearchStart.FileName) && searchOffset >= SearchStart.Offset) {
yield break;
}
if (result != null) {
var start = document.GetLocation(result.Offset).ToLocation();
var end = document.GetLocation(result.EndOffset).ToLocation();
return new SearchResultMatch(currentFile, start, end, SearchResultsPad.CreateInlineBuilder(start, end, document, Path.GetExtension(currentFile)));
yield return new SearchResultMatch(file, start, end, null);
}
currentSearchRegion.CurrentFile++;
currentSearchRegion.LastSearchOffset = 0;
} while (result != null);
if (currentSearchRegion.CurrentFile >= currentSearchRegion.Files.Length) {
currentSearchRegion.Repeat = true;
currentSearchRegion.CurrentFile = 0;
index++;
if (!processSecondPart && index > endIndex) {
processSecondPart = true;
index = 0;
endIndex = startIndex;
}
}
return null;
}
static SearchRegion CreateSearchRegion(FileName[] files, string pattern, bool ignoreCase, bool matchWholeWords, SearchMode mode, SearchTarget target, string baseDirectory, string filter, bool searchSubdirs)
public static SearchRegion CreateSearchRegion(FileName[] files, string pattern, bool ignoreCase, bool matchWholeWords, SearchMode mode, SearchTarget target, string baseDirectory, string filter, bool searchSubdirs)
{
ITextEditor editor = GetActiveTextEditor();
if (editor != null) {
@ -282,49 +325,13 @@ namespace SearchAndReplace @@ -282,49 +325,13 @@ namespace SearchAndReplace
return null;
}
class SearchRegion
{
FileName[] files;
public int CurrentFile { get; set; }
public int LastSearchOffset { get; set; }
public bool Repeat { get; set; }
public FileName[] Files {
get { return files; }
}
AnchorSegment selection;
public AnchorSegment Selection {
get { return selection; }
}
PermanentAnchor searchStart;
public PermanentAnchor SearchStart {
get { return searchStart; }
}
ISearchStrategy strategy;
public ISearchStrategy Strategy {
get {
if (strategy == null)
strategy = SearchStrategyFactory.Create(pattern, ignoreCase, matchWholeWords, mode);
return strategy;
}
}
public SearchRegion(FileName[] files, AnchorSegment selection, PermanentAnchor searchStart, string pattern, bool ignoreCase, bool matchWholeWords, SearchMode mode, SearchTarget target, string baseDirectory, string filter, bool searchSubdirs)
SearchRegion(FileName[] files, AnchorSegment selection, PermanentAnchor searchStart, string pattern, bool ignoreCase, bool matchWholeWords, SearchMode mode, SearchTarget target, string baseDirectory, string filter, bool searchSubdirs)
{
if (files == null)
throw new ArgumentNullException("files");
this.files = files;
this.selection = selection;
this.searchStart = searchStart;
this.LastSearchOffset = -1;
this.pattern = pattern;
this.ignoreCase = ignoreCase;
this.matchWholeWords = matchWholeWords;

Write Preview
Loading…
Cancel
Save