diff --git a/uppsrc/ide/Errors.cpp b/uppsrc/ide/Errors.cpp index c1c1ea45a..fcbc64eba 100644 --- a/uppsrc/ide/Errors.cpp +++ b/uppsrc/ide/Errors.cpp @@ -5,7 +5,7 @@ bool Ide::FindLineError(const String& ln, FindLineErrorCache& cache, ErrorInfo& VectorMap bm = GetMethodVars(method); bool is_java = (bm.Get("BUILDER", Null) == "JDK"); const char *s = ln; - f.kind = ln.Find("error:", 0) > 0 ? 1 : (ln.Find("warning:", 0) > 0 ? 2 : ln.Find("note:") > 0 ? 3 : 4); + f.kind = ln.Find("error", 0) > 0 ? 1 : (ln.Find("warning", 0) > 0 ? 2 : ln.Find("note") > 0 ? 3 : 4); while(*s == ' ' || *s == '\t') s++; for(; s < ln.End(); s++) { @@ -260,17 +260,17 @@ void Ide::ConsoleLine(const String& line) if(FindLineError(line, error_cache, f)) { int cnt = error.GetCount(); Value rf = RawToValue(f); - if(f.kind == 3 && cnt) { - ValueArray n = error.Get(cnt - 1, "NOTES"); - n.Add(rf); - error.Set(cnt - 1, "NOTES", n); - } - else + if(findarg(f.kind, 1, 2) >= 0 || cnt == 0) error.Add(GetFileName(f.file), f.lineno, AttrText(f.message) .NormalPaper(HighlightSetup::GetHlStyle(f.kind == 1 ? HighlightSetup::PAPER_ERROR : HighlightSetup::PAPER_WARNING).color), rf); + else { + ValueArray n = error.Get(cnt - 1, "NOTES"); + n.Add(rf); + error.Set(cnt - 1, "NOTES", n); + } } } diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp index 1c8c2c9af..126b07517 100644 --- a/uppsrc/ide/idewin.cpp +++ b/uppsrc/ide/idewin.cpp @@ -309,7 +309,7 @@ void SetupError(ArrayCtrl& error, const char *s) error.AddColumn("Line"); error.AddColumn(s); error.AddIndex("INFO"); - error.ColumnWidths("150 119 800"); + error.ColumnWidths("200 119 800"); error.NoWantFocus(); }