github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.ide: improved include assist

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3557 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-06-25 18:12:01 +00:00
parent 05e6fc0b20
commit d5a64e34e3
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ide/Assist.cpp
View file

@ -316,7 +316,7 @@ void AssistEditor::SyncAssist()
(p ? memcmp_i(name, m.name, name.GetCount()) == 0
&& memcmp(name, m.name, name.GetCount())
: memcmp(name, m.name, name.GetCount()) == 0)) {
int q = over.Find(m.name);
int q = include_assist ? -1 : over.Find(m.name);
if(q < 0 || over[q] == m.typei && m.scope.GetCount()) {
assist.Add(RawToValue(m));
if(q < 0)
@ -382,7 +382,8 @@ bool AssistEditor::IncludeAssist()
}
else {
static Index<String> ext(Split(".h;.hpp;.hh;.hxx;.i;.lay;.iml;.t;.dli", ';'));
if(ext.Find(ToLower(GetFileExt(fn))) >= 0) {
String fext = GetFileExt(fn);
if(fext.GetCount() == 0 || ext.Find(ToLower(fext)) >= 0) {
file.Add(fn);
upper_file.Add(ToUpper(fn));
}
@ -401,12 +402,13 @@ bool AssistEditor::IncludeAssist()
IndexSort(upper_file, file);
for(int i = 0; i < file.GetCount(); i++) {
String fn = file[i];
CppItemInfo& f = assist_item.GetAdd(fn);
CppItemInfo& f = assist_item.Add(fn);
f.name = f.natural = fn;
f.access = 0;
static Index<String> hdr(Split(".h;.hpp;.hh;.hxx", ';'));
f.kind = hdr.Find(ToLower(GetFileExt(fn))) >= 0 ? KIND_INCLUDEFILE
: KIND_INCLUDEFILE_ANY;
String fext = GetFileExt(fn);
f.kind = hdr.Find(ToLower(GetFileExt(fn))) >= 0 || fext.GetCount() == 0 ? KIND_INCLUDEFILE
: KIND_INCLUDEFILE_ANY;
}
include_assist = true;
if(include_path.GetCount())