github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Minor current file errors fixes (matching '{', debugger more)

Browse source
This commit is contained in:
Mirek Fidler 2022-11-14 10:54:23 +01:00
parent 59f900c204
commit 488f6674a7
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/ide/Assist.cpp
View file

@ -422,9 +422,9 @@ void AssistEditor::SetAnnotations(const CppFileInfo& f)
SyncTip();
}
bool InFileIncludedFrom(const String& s)
bool IgnoredError(const String& s)
{
return s.Find("in file included from") >= 0;
return s.Find("in file included from") >= 0 || s.Find("to match this '{'") >= 0;
}
void AssistEditor::SyncCurrentFile(const CurrentFileContext& cfx)
@ -445,7 +445,7 @@ void AssistEditor::SyncCurrentFile(const CurrentFileContext& cfx)
int k = ds[di].kind;
bool group_valid = false;
auto Do = [&](const Diagnostic& d) {
if(d.pos.y < 0 || InFileIncludedFrom(d.text) || path != d.path)
if(d.pos.y < 0 || IgnoredError(d.text) || path != d.path)
return;
Point pos = d.pos;
FromUtf8x(pos);
@ -577,11 +577,11 @@ bool AssistEditor::AssistTip(CodeEditor::MouseTip& mt)
int ii0 = di;
bool found = false;
if(IsWarning(k) || IsError(k)) {
if(errors[di].path == path && errors[di].pos == pos && !InFileIncludedFrom(errors[di].text))
if(errors[di].path == path && errors[di].pos == pos && !IgnoredError(errors[di].text))
found = true;
di++;
while(di < errors.GetCount() && errors[di].detail) {
if(errors[di].path == path && errors[di].pos == pos && !InFileIncludedFrom(errors[di].text))
if(errors[di].path == path && errors[di].pos == pos && !IgnoredError(errors[di].text))
found = true;
di++;
}
@ -590,10 +590,12 @@ bool AssistEditor::AssistTip(CodeEditor::MouseTip& mt)
String qtf = "[g ";
for(int i = ii0; i < di; i++) {
Diagnostic& d = errors[i];
if(d.pos.y < 0 || IgnoredError(d.text))
continue;
if(i > ii0)
qtf << "&";
qtf << "[";
if(d.path == path && d.pos == pos && !InFileIncludedFrom(d.text))
if(d.path == path && d.pos == pos)
qtf << "*";
qtf << " ";
qtf << "[@B \1" << GetFileName(d.path) << "\1] " << d.pos.y << ": ";

4
uppsrc/ide/Debug.cpp
View file

@ -471,6 +471,8 @@ void Ide::StopDebug()
bool Ide::EditorTip(CodeEditor::MouseTip& mt)
{
DR_LOG("EditorTip");
if(editor.AssistTip(mt))
return true;
if(debugger) {
int pos = mt.pos;
String e;
@ -501,5 +503,5 @@ bool Ide::EditorTip(CodeEditor::MouseTip& mt)
DR_LOG("debugger->Tip");
return debugger->Tip(e, mt);
}
return editor.AssistTip(mt);
return false;
}