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

Fixed duplicate attribute issue in properties

Browse source
This commit is contained in:
Brian Fiete 2021-01-21 08:34:34 -08:00
parent c8f42a0bfc
commit fd1d9644f7
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfModule.cpp
View file

@ -12946,8 +12946,10 @@ BfModuleMethodInstance BfModule::GetMethodInstance(BfTypeInstance* typeInst, BfM
if ((methodInstance->mRequestedByAutocomplete) && (!mCompiler->IsAutocomplete())) if ((methodInstance->mRequestedByAutocomplete) && (!mCompiler->IsAutocomplete()))
{ {
BfLogSysM("Setting mRequestedByAutocomplete=false for method instance %p\n", methodInstance);
// We didn't want to process this message yet if it was autocomplete-specific, but now we will // We didn't want to process this message yet if it was autocomplete-specific, but now we will
AddMethodToWorkList(methodInstance); if (methodInstance->mMethodProcessRequest == NULL)
AddMethodToWorkList(methodInstance);
methodInstance->mRequestedByAutocomplete = false; methodInstance->mRequestedByAutocomplete = false;
} }
@ -20893,16 +20895,16 @@ void BfModule::GetMethodCustomAttributes(BfMethodInstance* methodInstance)
methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes = GetCustomAttributes(attributeDirective, attrTarget); methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes = GetCustomAttributes(attributeDirective, attrTarget);
} }
if ((propertyMethodDeclaration != NULL) && (propertyMethodDeclaration->mPropertyDeclaration->mAttributes != NULL)) if ((propertyMethodDeclaration != NULL) && (propertyMethodDeclaration->mPropertyDeclaration->mAttributes != NULL) && ((attrTarget & BfAttributeTargets_Property) == 0))
{ {
if (methodInstance->GetMethodInfoEx()->mMethodCustomAttributes != NULL) if (methodInstance->GetMethodInfoEx()->mMethodCustomAttributes != NULL)
{ {
GetCustomAttributes(methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes, propertyMethodDeclaration->mPropertyDeclaration->mAttributes, attrTarget); GetCustomAttributes(methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes, propertyMethodDeclaration->mPropertyDeclaration->mAttributes, BfAttributeTargets_Property);
} }
else else
{ {
methodInstance->GetMethodInfoEx()->mMethodCustomAttributes = new BfMethodCustomAttributes(); methodInstance->GetMethodInfoEx()->mMethodCustomAttributes = new BfMethodCustomAttributes();
methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes = GetCustomAttributes(propertyMethodDeclaration->mPropertyDeclaration->mAttributes, attrTarget); methodInstance->mMethodInfoEx->mMethodCustomAttributes->mCustomAttributes = GetCustomAttributes(propertyMethodDeclaration->mPropertyDeclaration->mAttributes, BfAttributeTargets_Property);
} }
} }