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

Made 'override' work for internal overrides

Browse source
This commit is contained in:
Brian Fiete 2020-10-25 10:40:40 -07:00
parent 2c8b14ebed
commit ae40f99cb4
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfAutoComplete.cpp
View file

@ -2376,6 +2376,7 @@ void BfAutoComplete::AddOverrides(const StringImpl& filter)
if (methodDef->mIsNoShow) if (methodDef->mIsNoShow)
continue; continue;
bool allowInternalOverride = false;
if (curType == mModule->mCurTypeInstance) if (curType == mModule->mCurTypeInstance)
{ {
// The "normal" case, and only case for types without extensions // The "normal" case, and only case for types without extensions
@ -2387,6 +2388,9 @@ void BfAutoComplete::AddOverrides(const StringImpl& filter)
if (!curType->IsTypeMemberAccessible(methodDef->mDeclaringType, activeTypeDef)) if (!curType->IsTypeMemberAccessible(methodDef->mDeclaringType, activeTypeDef))
continue; continue;
if (methodDef->mIsExtern)
allowInternalOverride = true;
} }
auto& methodGroup = curType->mMethodInstanceGroups[methodDef->mIdx]; auto& methodGroup = curType->mMethodInstanceGroups[methodDef->mIdx];
@ -2396,7 +2400,11 @@ void BfAutoComplete::AddOverrides(const StringImpl& filter)
} }
auto methodInst = methodGroup.mDefault; auto methodInst = methodGroup.mDefault;
if ((!methodDef->mIsVirtual) || (methodDef->mIsOverride)) if (allowInternalOverride)
{
//
}
else if ((!methodDef->mIsVirtual) || (methodDef->mIsOverride))
continue; continue;
if ((methodDef->mMethodType != BfMethodType_Normal) && if ((methodDef->mMethodType != BfMethodType_Normal) &&