forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Asynchronously search for text. 

Initial implementation. Still need to update result log.
This commit is contained in:
Hans-Albert Maritz 2015-03-23 10:06:01 +11:00
parent 0c987fa894
commit 61e54f55f0
1 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/dlangide/ui/searchPanel.d
View File

@ -124,6 +124,18 @@ class SearchLogWidget : LogWidget {
} }
} }
struct SearchMatch {
int line;
long col;
dstring lineContent;
}
struct SearchMatchList {
string filename;
SearchMatch[] matches;
}
class SearchWidget : TabWidget { class SearchWidget : TabWidget {
HorizontalLayout _layout; HorizontalLayout _layout;
EditLine _findText; EditLine _findText;
@ -133,16 +145,7 @@ class SearchWidget : TabWidget {
protected IDEFrame _frame; protected IDEFrame _frame;
protected SearchMatchList[] _matchedList; protected SearchMatchList[] _matchedList;
struct SearchMatch {
int line;
long col;
dstring lineContent;
}
struct SearchMatchList {
string filename;
SearchMatch[] matches;
}
bool onFindButtonPressed(Widget source) { bool onFindButtonPressed(Widget source) {
dstring txt = _findText.text; dstring txt = _findText.text;
@ -195,26 +198,18 @@ class SearchWidget : TabWidget {
void searchInProject(ProjectItem project, dstring text) { void searchInProject(ProjectItem project, dstring text) {
if (project.isFolder == true) { if (project.isFolder == true) {
ProjectFolder projFolder = cast(ProjectFolder) project; ProjectFolder projFolder = cast(ProjectFolder) project;
import std.parallelism;
for (int i = 0; i < projFolder.childCount; i++) { for (int i = 0; i < projFolder.childCount; i++) {
searchInProject(projFolder.child(i), text); taskPool.put(task(&searchInProject, projFolder.child(i), text));
} }
} }
else { else {
Log.d("Searching in: " ~ project.filename); Log.d("Searching in: " ~ project.filename);
EditableContent content = new EditableContent(true); SearchMatchList match = findMatches(project.filename, text);
content.load(project.filename);
SearchMatchList match;
match.filename = project.filename;
foreach(int lineIndex, dstring line; content.lines) {
auto colIndex = line.indexOf(text);
if (colIndex != -1) {
match.matches ~= SearchMatch(lineIndex, colIndex, line);
}
}
if(match.matches.length > 0) { if(match.matches.length > 0) {
_matchedList ~= match; synchronized {
_matchedList ~= match;
}
} }
} }
} }
@ -226,33 +221,39 @@ class SearchWidget : TabWidget {
_resultLog.text = ""d; _resultLog.text = ""d;
_matchedList = []; _matchedList = [];
import std.parallelism;
switch (_searchScope.text) { switch (_searchScope.text) {
case "File": //File case "File":
auto currentFileItem = _frame._wsPanel.workspace.findSourceFileItem(_frame.currentEditor.filename); auto currentFileItem = _frame._wsPanel.workspace.findSourceFileItem(_frame.currentEditor.filename);
if(currentFileItem !is null) if(currentFileItem !is null)
searchInProject(currentFileItem, source); taskPool.put(task(&searchInProject, currentFileItem, source));
break; break;
case "Project": //Project case "Project":
foreach(Project project; _frame._wsPanel.workspace.projects) { foreach(Project project; _frame._wsPanel.workspace.projects) {
if(!project.isDependency) if(!project.isDependency)
searchInProject(project.items, source); taskPool.put(task(&searchInProject, project.items, source));
} }
break; break;
case "Dependencies": //Dependencies case "Dependencies":
foreach(Project project; _frame._wsPanel.workspace.projects) { foreach(Project project; _frame._wsPanel.workspace.projects) {
if(project.isDependency) if(project.isDependency)
searchInProject(project.items, source); taskPool.put(task(&searchInProject, project.items, source));
} }
break; break;
case "Everywhere": //Everywhere case "Everywhere":
foreach(Project project; _frame._wsPanel.workspace.projects) { foreach(Project project; _frame._wsPanel.workspace.projects) {
searchInProject(project.items, source); taskPool.put(task(&searchInProject, project.items, source));
} }
break; break;
default: default:
assert(0); assert(0);
} }
import core.thread;
Thread.sleep( dur!("msecs")(10) );
if (_matchedList.length == 0) { if (_matchedList.length == 0) {
_resultLog.appendText(to!dstring("No matches found.\n")); _resultLog.appendText(to!dstring("No matches found.\n"));
} }
@ -291,3 +292,20 @@ class SearchWidget : TabWidget {
return false; return false;
} }
} }
SearchMatchList findMatches(immutable string filename, immutable dstring searchString) {
EditableContent content = new EditableContent(true);
content.load(filename);
SearchMatchList match;
match.filename = filename;
foreach(int lineIndex, dstring line; content.lines) {
auto colIndex = line.indexOf(searchString);
if (colIndex != -1) {
Log.d("Match at: ", colIndex, " text: ", searchString);
match.matches ~= SearchMatch(lineIndex, colIndex, line);
}
}
return match;
}