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

Fixed documentation issues

Browse source
This commit is contained in:
Brian Fiete 2020-10-21 09:56:22 -07:00
parent bf5e689029
commit 6a9cb287f8
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
IDEHelper/Compiler/BfAutoComplete.cpp
View file

@ -560,18 +560,13 @@ void BfAutoComplete::AddTypeDef(BfTypeDef* typeDef, const StringImpl& filter, bo
if (entryAdded != NULL) if (entryAdded != NULL)
{ {
if (CheckDocumentation(entryAdded, NULL)) if ((CheckDocumentation(entryAdded, NULL)) && (entryAdded->mDocumentation == NULL))
{ {
auto typeInst = mModule->ResolveTypeDef(typeDef, BfPopulateType_IdentityNoRemapAlias); auto typeInst = mModule->ResolveTypeDef(typeDef, BfPopulateType_IdentityNoRemapAlias);
String str; StringT<1024> str;
if (typeInst != NULL) if (typeInst != NULL)
str = mModule->TypeToString(typeInst, BfTypeNameFlag_ExtendedInfo); str = mModule->TypeToString(typeInst, BfTypeNameFlag_ExtendedInfo);
if (entryAdded->mDocumentation != NULL) if (typeDef->mTypeDeclaration->mDocumentation != NULL)
{
str += "\x04";
str.Append(entryAdded->mDocumentation);
}
else if (typeDef->mTypeDeclaration->mDocumentation != NULL)
{ {
if (!str.IsEmpty()) if (!str.IsEmpty())
str += "\x05"; str += "\x05";

20
IDEHelper/Compiler/BfReducer.cpp
View file

@ -5722,12 +5722,8 @@ BfAstNode* BfReducer::ReadTypeMember(BfTokenNode* tokenNode, int depth, BfAstNod
return NULL; return NULL;
} }
SetAndRestoreValue<BfAstNode*> prevTypeMemberNodeStart(mTypeMemberNodeStart, attributes, false);
if (depth == 0)
prevTypeMemberNodeStart.Set();
mVisitorPos.MoveNext(); mVisitorPos.MoveNext();
auto memberNode = ReadTypeMember(nextNode, depth + 1, (deferredHeadNode != NULL) ? deferredHeadNode : attributes); auto memberNode = ReadTypeMember(nextNode, 0, (deferredHeadNode != NULL) ? deferredHeadNode : attributes);
if (memberNode == NULL) if (memberNode == NULL)
return NULL; return NULL;
auto member = BfNodeDynCast<BfMemberDeclaration>(memberNode); auto member = BfNodeDynCast<BfMemberDeclaration>(memberNode);
@ -6418,9 +6414,9 @@ void BfReducer::ReadPropertyBlock(BfPropertyDeclaration* propertyDeclaration, Bf
BfAstNode* BfReducer::ReadTypeMember(BfAstNode* node, int depth, BfAstNode* deferredHeadNode) BfAstNode* BfReducer::ReadTypeMember(BfAstNode* node, int depth, BfAstNode* deferredHeadNode)
{ {
SetAndRestoreValue<BfAstNode*> prevTypeMemberNodeStart(mTypeMemberNodeStart, node, false); // SetAndRestoreValue<BfAstNode*> prevTypeMemberNodeStart(mTypeMemberNodeStart, node, false);
if (depth == 0) // if (depth == 0)
prevTypeMemberNodeStart.Set(); // prevTypeMemberNodeStart.Set();
AssertCurrentNode(node); AssertCurrentNode(node);
@ -6461,8 +6457,13 @@ BfAstNode* BfReducer::ReadTypeMember(BfAstNode* node, int depth, BfAstNode* defe
// Read type member // Read type member
} }
else else
{
SetAndRestoreValue<BfAstNode*> prevTypeMemberNodeStart(mTypeMemberNodeStart, tokenNode, false);
if (depth == 0)
prevTypeMemberNodeStart.Set();
return ReadTypeMember(tokenNode, depth, deferredHeadNode); return ReadTypeMember(tokenNode, depth, deferredHeadNode);
} }
}
else if (auto block = BfNodeDynCast<BfBlock>(node)) else if (auto block = BfNodeDynCast<BfBlock>(node))
{ {
Fail("Expected method declaration", node); Fail("Expected method declaration", node);
@ -9591,7 +9592,10 @@ void BfReducer::HandleTypeDeclaration(BfTypeDeclaration* typeDecl, BfAttributeDi
prevNode = node; prevNode = node;
BfAstNode* typeMember = BfNodeDynCast<BfMemberDeclaration>(node); BfAstNode* typeMember = BfNodeDynCast<BfMemberDeclaration>(node);
if (typeMember == NULL) if (typeMember == NULL)
{
SetAndRestoreValue<BfAstNode*> prevTypeMemberNodeStart(mTypeMemberNodeStart, node);
typeMember = ReadTypeMember(node); typeMember = ReadTypeMember(node);
}
//methodDeclaration->mDocumentation = FindDocumentation(methodDeclaration); //methodDeclaration->mDocumentation = FindDocumentation(methodDeclaration);