github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-15 22:02:51 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Alt+J now works with #if, #ifdef, #else, #elif, #endif

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@466 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-09-20 08:39:45 +00:00
parent 0aa87ae7d6
commit ac654639eb
1 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

54
uppsrc/ide/Assist.cpp
View file

@ -911,16 +911,66 @@ String GetIdNest(const String& nest, const String& id, Index<String>& done)
return Null;
}
bool IsPif(const String& l)
{
return l.Find("#if") >= 0;
}
bool IsPelse(const String& l)
{
return l.Find("#el") >= 0;
}
bool IsPendif(const String& l)
{
return l.Find("#endif") >= 0;
}
void Ide::JumpS()
{
if(designer)
return;
String l = editor.GetUtf8Line(editor.GetCursorLine());
int li = editor.GetCursorLine();
String l = editor.GetUtf8Line(li);
if(IsPif(l) || IsPelse(l)) {
int lvl = 0;
while(li + 1 < editor.GetLineCount()) {
l = editor.GetUtf8Line(++li);
if(IsPif(l))
lvl++;
if(IsPelse(l) && lvl == 0)
break;
if(IsPendif(l)) {
if(lvl == 0) break;
lvl--;
}
}
AddHistory();
editor.SetCursor(editor.GetPos(li));
return;
}
if(IsPendif(l)) {
int lvl = 0;
while(li - 1 >= 0) {
l = editor.GetUtf8Line(--li);
if(IsPif(l)) {
if(lvl == 0) break;
lvl--;
}
if(IsPendif(l))
lvl++;
}
AddHistory();
editor.SetCursor(editor.GetPos(li));
return;
}
int q = l.Find("#include");
if(q >= 0) {
String path = FindIncludeFile(~l + q + 8, GetFileFolder(editfile));
if(!IsNull(path))
if(!IsNull(path)) {
AddHistory();
EditFile(path);
}
return;
}
if(!editor.assist_active)