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

TheIDE: ConverToOverrides fix (#375)

Browse source
This commit is contained in:
İsmail Yılmaz 2026-03-18 12:18:22 +00:00 • committed by GitHub
parent 2761cbf60e
commit 3776bcd89c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

62
uppsrc/ide/Virtuals.cpp
View file

@ -6,7 +6,7 @@ struct VirtualMethod : AnnotationItem {
};
void GatherVirtuals(ArrayMap<String, VirtualMethod>& virtuals, const String& cls,
Index<String>& visited, bool first)
Index<String>& visited, bool first)
{
if(IsNull(cls) || visited.Find(cls) >= 0)
return;
@ -108,7 +108,7 @@ struct VirtualsDlg : public WithVirtualsLayout<TopWindow> {
}
}
}
for(VirtualMethod& m : virtuals) { // remove unneeded qualifications
String r;
const char *s = m.pretty;
@ -140,7 +140,7 @@ struct VirtualsDlg : public WithVirtualsLayout<TopWindow> {
r.Cat(b, s);
m.pretty = r;
}
CtrlLayoutOKCancel(*this, "Virtual methods");
list.AddColumn("Virtual function").SetDisplay(Single<VirtualsDisplay>());
list.AddColumn("Defined in");
@ -205,7 +205,7 @@ void AssistEditor::Virtuals()
if(IsStruct(m.kind))
q = m;
}
Index<String> namespaces; // These namespaces cannot be ignored
@ -268,7 +268,45 @@ void AssistEditor::Virtuals()
void AssistEditor::ConvertToOverrides()
{
Make([](String& out) {
// Returns insertion point after trailing qualifiers and sets has_final
auto SkipTrailingQualifiers = [](const char *start, bool& hasfinal) -> const char* {
const char *ins = start;
hasfinal = false;
for(;;) {
const char *q = ins;
while(*q == ' ' || *q == '\t' || *q == '\n' || *q == '\r') // Multiline support
q++;
if(memcmp(q, "const", 5) == 0 && !iscid(q[5]))
ins = q + 5;
else
if(memcmp(q, "noexcept", 8) == 0 && !iscid(q[8]))
ins = q + 8;
else
if(memcmp(q, "final", 5) == 0 && !iscid(q[5])) {
ins = q + 5;
hasfinal = true;
}
else
if(*q == '&' || *q == '*')
ins = q + 1;
else
if(*q == '[') { // attributes [[...]]
int depth = 1;
q++;
while(*q && depth) {
if(*q == '[') depth++;
else if(*q == ']') depth--;
q++;
}
ins = q;
}
else
break;
}
return ins;
};
Make([&](String& out) {
String r;
const char *s = out;
bool virt = false;
@ -281,7 +319,7 @@ void AssistEditor::ConvertToOverrides()
if(len == 7 && memcmp(b, "virtual", 7) == 0) {
virt = true;
lvl = 0;
while(*s == ' ' || *s == '\t')
while(*s == ' ' || *s == '\t' || *s == '\n' || *s == '\r') // Multiline support
s++;
}
else {
@ -292,15 +330,21 @@ void AssistEditor::ConvertToOverrides()
if(*s == ')') {
lvl = max(lvl - 1, 0);
if(lvl == 0 && virt) {
r << " override";
bool hasfinal = false;
const char *q = SkipTrailingQualifiers(s + 1, hasfinal);
// Append everything up to insertion point
r.Cat(s + 1, q - (s + 1));
// Insert override if not final
if(!hasfinal)
r.Cat(" override");
s = q;
virt = false;
continue;
}
}
s++;
}
}
out = r;
});
}