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: Find in files, Errors fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7465 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-24 10:04:03 +00:00
parent f418c22f46
commit bb3f778a20
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
uppsrc/ide/Errors.cpp
View file

@ -168,7 +168,7 @@ bool Ide::Next(int tab, ArrayCtrl& a, int d)
void Ide::FindNextError()
{
if(Next(BCONSOLE, error, 1) || Next(BFINDINFILES, ffound, 1))
if(Next(BERRORS, error, 1) || Next(BFINDINFILES, ffound, 1))
return;
int ln = console.GetLine(console.GetCursor());
int l = ln;
@ -179,7 +179,7 @@ void Ide::FindNextError()
}
void Ide::FindPrevError() {
if(Next(BCONSOLE, error, -1) || Next(BFINDINFILES, ffound, -1))
if(Next(BERRORS, error, -1) || Next(BFINDINFILES, ffound, -1))
return;
int ln = console.GetLine(console.GetCursor());
int l = ln;
@ -274,6 +274,13 @@ void Ide::GoToError(const ErrorInfo& f)
Sync();
}
void Ide::GoToError(ArrayCtrl& a)
{
Value v = a.Get("INFO");
if(v.Is<ErrorInfo>())
GoToError(ValueTo<ErrorInfo>(v));
}
bool Ide::FindLineError(int l) {
ErrorInfo f;
FindLineErrorCache cache;
@ -321,13 +328,13 @@ void Ide::AddNote(const ErrorInfo& f)
void Ide::ShowNote()
{
if(notes.IsCursor())
GoToError(ValueTo<ErrorInfo>(notes.Get("INFO")));
GoToError(notes);
}
void Ide::ShowFound()
{
if(ffound.IsCursor())
GoToError(ValueTo<ErrorInfo>(ffound.Get("INFO")));
GoToError(ffound);
}
void Ide::ShowError()
@ -339,7 +346,7 @@ void Ide::ShowError()
const ErrorInfo& f = ValueTo<ErrorInfo>(n[i]);
notes.Add(GetFileName(f.file), f.lineno, f.message, n[i]);
}
GoToError(ValueTo<ErrorInfo>(error.Get("INFO")));
GoToError(error);
}
}

1
uppsrc/ide/ide.h
View file

@ -1043,6 +1043,7 @@ public:
bool FindLineError(int l);
void GoToError(const ErrorInfo& f);
void GoToError(ArrayCtrl& a);
bool FindLineError(const String& ln, FindLineErrorCache& cache, ErrorInfo& f);
void FindError();