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

Better handling of autocomplete with tokens

Browse source
This commit is contained in:
Brian Fiete 2020-05-26 06:10:51 -07:00
parent 74f3ef4e43
commit e16e4613b6
14 changed files with 108 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

65
IDEHelper/Compiler/BfReducer.cpp
View file

@ -1402,16 +1402,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
AssertCurrentNode(node);
/*if (auto block = BfNodeDynCast<BfBlock>(node))
{
HandleBlock(block, true);
return block;
}*/
auto rhsCreateExprFlags = (CreateExprFlags)(createExprFlags & CreateExprFlags_BreakOnRChevron);
node = ReplaceTokenStarter(node);
auto exprLeft = BfNodeDynCast<BfExpression>(node);
AssertCurrentNode(node);
@ -2431,6 +2423,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
{
if (nextTokenNode->GetToken() == BfToken_Dot)
{
TryIdentifierConvert(checkIdx + 2);
auto nextNextCheckNode = mVisitorPos.Get(checkIdx + 2);
if (auto identifierNode = BfNodeDynCast<BfIdentifierNode>(nextNextCheckNode))
@ -4265,8 +4259,6 @@ BfAstNode* BfReducer::CreateStatement(BfAstNode* node, CreateStmtFlags createStm
{
AssertCurrentNode(node);
node = ReplaceTokenStarter(node);
if ((createStmtFlags & CreateStmtFlags_AllowUnterminatedExpression) != 0)
{
if (IsTerminatingExpression(node))
@ -5033,11 +5025,6 @@ BfTypeReference* BfReducer::CreateTypeRef(BfAstNode* firstNode, CreateTypeRefFla
}
return CreateRefTypeRef(typeRef, tokenNode);
}
else if ((token == BfToken_In) || (token == BfToken_As))
{
// This is mostly to allow a partially typed 'int' to be parsed as 'in' to make autocomplete nicer
return CreateTypeRef(ReplaceTokenStarter(firstNode), createTypeRefFlags);
}
}
return DoCreateTypeRef(firstNode, createTypeRefFlags);
}
@ -5108,7 +5095,19 @@ BfIdentifierNode* BfReducer::CompactQualifiedName(BfAstNode* leftNode)
auto nextNextToken = mVisitorPos.Get(mVisitorPos.mReadPos + 2);
auto rightIdentifier = BfNodeDynCast<BfIdentifierNode>(nextNextToken);
if (rightIdentifier == NULL)
return leftIdentifier;
{
if (auto rightToken = BfNodeDynCast<BfTokenNode>(nextNextToken))
{
if (BfTokenIsKeyword(rightToken->mToken))
{
rightIdentifier = mAlloc->Alloc<BfIdentifierNode>();
ReplaceNode(rightToken, rightIdentifier);
}
}
if (rightIdentifier == NULL)
return leftIdentifier;
}
// If the previous dotted span failed (IE: had chevrons) then don't insert qualified names in the middle of it
auto prevNodeToken = BfNodeDynCast<BfTokenNode>(prevNode);
@ -5131,6 +5130,20 @@ BfIdentifierNode* BfReducer::CompactQualifiedName(BfAstNode* leftNode)
return leftIdentifier;
}
void BfReducer::TryIdentifierConvert(int readPos)
{
auto node = mVisitorPos.Get(readPos);
if (auto tokenNode = BfNodeDynCast<BfTokenNode>(node))
{
if (BfTokenIsKeyword(tokenNode->mToken))
{
auto identifierNode = mAlloc->Alloc<BfIdentifierNode>();
ReplaceNode(tokenNode, identifierNode);
mVisitorPos.Set(readPos, identifierNode);
}
}
}
void BfReducer::CreateQualifiedNames(BfAstNode* node)
{
auto block = BfNodeDynCast<BfBlock>(node);
@ -6266,8 +6279,6 @@ BfAstNode* BfReducer::ReadTypeMember(BfAstNode* node, int depth)
AssertCurrentNode(node);
node = ReplaceTokenStarter(node);
BfTokenNode* refToken = NULL;
if (auto tokenNode = BfNodeDynCast<BfTokenNode>(node))
@ -7583,7 +7594,7 @@ BfAstNode* BfReducer::HandleTopLevel(BfBlock* node)
isDone = !mVisitorPos.MoveNext();
if (newNode != NULL)
mVisitorPos.Write(newNode);
mVisitorPos.Write(newNode);
}
mVisitorPos.Trim();
return node;
@ -9296,21 +9307,7 @@ void BfReducer::HandleBlock(BfBlock* block, bool allowEndingExpression)
auto statement = CreateStatement(node, flags);
if (statement == NULL)
{
auto nextNode = mVisitorPos.GetNext();
isDone = !mVisitorPos.MoveNext();
#ifdef BF_AST_HAS_PARENT_MEMBER
BF_ASSERT(node->mParent != NULL);
#endif
node->RemoveSelf();
BF_ASSERT(node->GetSourceData() == mSource->mSourceData);
mSource->AddErrorNode(node);
if (nextNode == NULL)
break;
continue;
}
statement = mSource->CreateErrorNode(node);
isDone = !mVisitorPos.MoveNext();
mVisitorPos.Write(statement);