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 handling of compiler messages

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7448 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-16 14:04:01 +00:00
parent 1949348b4b
commit 1d3eae8bcd
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/ide/Console.cpp
View file

@ -56,7 +56,7 @@ void Console::Append(const String& s) {
SetEditable();
MoveTextEnd();
WString t = Filter(FromSystemCharset(s), sAppf).ToWString();
int l0 = GetLineCount();
int l0 = GetLineCount() - 1;
int mg = sb.GetReducedViewSize().cx / GetFont().Info().GetAveWidth();
if(wrap_text && mg > 4) {
int x = GetColumnLine(GetCursor()).x;
@ -82,7 +82,7 @@ void Console::Append(const String& s) {
SetEditPos(p);
SetSelection(l, h);
}
while(l0 < GetLineCount())
while(l0 >= 0 && l0 < GetLineCount() - 1)
WhenLine(GetUtf8Line(l0++));
}

5
uppsrc/ide/Errors.cpp
View file

@ -27,8 +27,8 @@ bool Ide::FindLineError(const String& ln, FindLineErrorCache& cache, ErrorInfo&
f.file = TrimLeft(f.file);
String upp = GetUppDir();
#ifdef PLATFORM_WIN32
if(file[0] == '\\' || file[0] == '/')
file = String(upp[0], 1) + ':' + file;
if(f.file[0] == '\\' || f.file[0] == '/')
f.file = String(upp[0], 1) + ':' + f.file;
#endif
if(!IsFullPath(f.file) && *f.file != '\\' && *f.file != '/') {
if(cache.wspc_paths.IsEmpty()) {
@ -257,6 +257,7 @@ void Ide::SetErrorEditor()
void Ide::ConsoleLine(const String& line)
{
DDUMP(line);
ErrorInfo f;
if(FindLineError(line, error_cache, f)) {
int cnt = error.GetCount();