Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 20:12:21 +02:00
Code Activity

Improved classview handling of generic methods

Browse source
This commit is contained in:
Brian Fiete 2022-06-01 15:44:41 -07:00
parent 3dadbc3506
commit 428a2eb026
1 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

44
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -8705,7 +8705,22 @@ public:
mResult += "\n"; mResult += "\n";
} }
void GetMethodDefString(BfMethodDef* methodDef, StringImpl& result) void GetGenericStr(BfMethodDef* methodDef, StringImpl& result)
{
if (methodDef->mGenericParams.IsEmpty())
return;
result += "<";
for (int i = 0; i < methodDef->mGenericParams.mSize; i++)
{
if (i > 0)
result += ", ";
result += methodDef->mGenericParams[i]->mName;
}
result += ">";
}
void GetMethodDefString(BfMethodDef* methodDef, StringImpl& result, int* genericStrIdx = NULL)
{ {
if (methodDef->mMethodType == BfMethodType_Ctor) if (methodDef->mMethodType == BfMethodType_Ctor)
{ {
@ -8723,6 +8738,19 @@ public:
result += methodDef->mName; result += methodDef->mName;
if (methodDef->mMethodType == BfMethodType_Mixin) if (methodDef->mMethodType == BfMethodType_Mixin)
result += "!"; result += "!";
if (!methodDef->mGenericParams.IsEmpty())
{
if (genericStrIdx != NULL)
{
*genericStrIdx = result.mLength;
}
else
{
GetGenericStr(methodDef, result);
}
}
result += "("; result += "(";
AddParams(methodDef, result); AddParams(methodDef, result);
result += ")"; result += ")";
@ -8986,6 +9014,7 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
bool matches = matchHelper.CheckMemberMatch(typeDef, methodDef->mName); bool matches = matchHelper.CheckMemberMatch(typeDef, methodDef->mName);
bool hasTypeString = false; bool hasTypeString = false;
bool hasMethodString = false; bool hasMethodString = false;
int genericMethodParamIdx = -1;
if ((!matches) && (openParenIdx != -1)) if ((!matches) && (openParenIdx != -1))
{ {
@ -8997,7 +9026,7 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
if (BfTypeUtils::TypeToString(tempStr, typeDef, (BfTypeNameFlags)(BfTypeNameFlag_HideGlobalName | BfTypeNameFlag_InternalName))) if (BfTypeUtils::TypeToString(tempStr, typeDef, (BfTypeNameFlags)(BfTypeNameFlag_HideGlobalName | BfTypeNameFlag_InternalName)))
tempStr += "."; tempStr += ".";
} }
matchHelper.GetMethodDefString(methodDef, tempStr); matchHelper.GetMethodDefString(methodDef, tempStr, &genericMethodParamIdx);
matchHelper.CheckMatch(tempStr, openParenIdx); matchHelper.CheckMatch(tempStr, openParenIdx);
matches = matchHelper.IsFullMatch(); matches = matchHelper.IsFullMatch();
} }
@ -9014,7 +9043,18 @@ String BfCompiler::GetTypeDefMatches(const StringImpl& searchStr)
result += "."; result += ".";
} }
if (hasMethodString) if (hasMethodString)
{
if (genericMethodParamIdx != -1)
{
result += StringView(tempStr, 0, genericMethodParamIdx);
matchHelper.GetGenericStr(methodDef, result);
result += StringView(tempStr, genericMethodParamIdx);
tempStr.Clear();
matchHelper.AddMethodDef(methodDef, &tempStr); matchHelper.AddMethodDef(methodDef, &tempStr);
}
else
matchHelper.AddMethodDef(methodDef, &tempStr);
}
else else
matchHelper.AddMethodDef(methodDef); matchHelper.AddMethodDef(methodDef);
} }