From 242c12a938568854ed08e1a5ba0ac71c12787d37 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 20 Sep 2008 09:04:46 +0000
Subject: [PATCH] ide: Find in files now ignores .svn folders

git-svn-id: svn://ultimatepp.org/upp/trunk@467 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Assist.cpp      | 4 ++--
 uppsrc/ide/FindInFiles.cpp | 2 +-
 uppsrc/ide/version.h       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 53f2abc57..9b6f76005 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -1,6 +1,6 @@
 #include "ide.h"
 
-#define LDUMP(x)    //DUMP(x)
+#define LDUMP(x)    //DDUMP(x)
 #define LDUMPC(x)   //DUMPC(x)
 #define LLOG(x)     //DLOG(x)
 
@@ -189,7 +189,7 @@ void AssistEditor::TypeOf(const String& id, Vector<String>& r, bool& code)
 	String dummy;
 	if(q >= 0 && NestId(BrowserBase()[q], id, r, code, dummy))
 		return;
-	q = BrowserBase().Find("::"); // Better namespace support needed !!!
+	q = BrowserBase().Find("::");
 	if(q >= 0)
 		NestId(BrowserBase()[q], id, r, code, dummy);
 }
diff --git a/uppsrc/ide/FindInFiles.cpp b/uppsrc/ide/FindInFiles.cpp
index 2374b7f4a..59d1a852a 100644
--- a/uppsrc/ide/FindInFiles.cpp
+++ b/uppsrc/ide/FindInFiles.cpp
@@ -39,7 +39,7 @@ void Ide::SerializeFindInFiles(Stream& s) {
 void SearchForFiles(Vector<String>& files, String dir, String mask, Progress& pi) {
 	FindFile ff(AppendFileName(dir, "*.*"));
 	while(ff) {
-		if(ff.IsFolder())
+		if(ff.IsFolder() && *ff.GetName() != '.')
 			SearchForFiles(files, AppendFileName(dir, ff.GetName()), mask, pi);
 		else
 		if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) {
diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h
index 67425ca07..d266407de 100644
--- a/uppsrc/ide/version.h
+++ b/uppsrc/ide/version.h
@@ -1 +1 @@
-#define IDE_VERSION    "809.r140"
+#define IDE_VERSION    "809.r145"