github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Find in files now ignores .svn folders

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@467 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-09-20 09:04:46 +00:00
parent ac654639eb
commit 242c12a938
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/ide/Assist.cpp
View file

@ -1,6 +1,6 @@
#include "ide.h" #include "ide.h"
#define LDUMP(x) //DUMP(x) #define LDUMP(x) //DDUMP(x)
#define LDUMPC(x) //DUMPC(x) #define LDUMPC(x) //DUMPC(x)
#define LLOG(x) //DLOG(x) #define LLOG(x) //DLOG(x)
@ -189,7 +189,7 @@ void AssistEditor::TypeOf(const String& id, Vector<String>& r, bool& code)
String dummy; String dummy;
if(q >= 0 && NestId(BrowserBase()[q], id, r, code, dummy)) if(q >= 0 && NestId(BrowserBase()[q], id, r, code, dummy))
return; return;
q = BrowserBase().Find("::"); // Better namespace support needed !!! q = BrowserBase().Find("::");
if(q >= 0) if(q >= 0)
NestId(BrowserBase()[q], id, r, code, dummy); NestId(BrowserBase()[q], id, r, code, dummy);
} }

2
uppsrc/ide/FindInFiles.cpp
View file

@ -39,7 +39,7 @@ void Ide::SerializeFindInFiles(Stream& s) {
void SearchForFiles(Vector<String>& files, String dir, String mask, Progress& pi) { void SearchForFiles(Vector<String>& files, String dir, String mask, Progress& pi) {
FindFile ff(AppendFileName(dir, "*.*")); FindFile ff(AppendFileName(dir, "*.*"));
while(ff) { while(ff) {
if(ff.IsFolder()) if(ff.IsFolder() && *ff.GetName() != '.')
SearchForFiles(files, AppendFileName(dir, ff.GetName()), mask, pi); SearchForFiles(files, AppendFileName(dir, ff.GetName()), mask, pi);
else else
if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) { if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) {

2
uppsrc/ide/version.h
View file

@ -1 +1 @@
#define IDE_VERSION "809.r140" #define IDE_VERSION "809.r145"