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

Fixed fixit location for usings when file has scoped usings

Browse source
This commit is contained in:
Brian Fiete 2022-06-01 16:36:58 -07:00
parent c523a73860
commit 1cb91c304b
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
IDEHelper/Compiler/BfAutoComplete.cpp
View file

@ -3671,6 +3671,7 @@ void BfAutoComplete::FixitAddNamespace(BfAstNode* refNode, const StringImpl& nam
auto parserData = refNode->GetParserData(); auto parserData = refNode->GetParserData();
BfUsingFinder usingFinder; BfUsingFinder usingFinder;
usingFinder.mFromIdx = refNode->mSrcStart;
usingFinder.VisitMembers(refNode->GetSourceData()->mRootNode); usingFinder.VisitMembers(refNode->GetSourceData()->mRootNode);
AddEntry(AutoCompleteEntry("fixit", StrFormat("using %s;\t.using|%s|%d||using %s;", namespaceStr.c_str(), parserData->mFileName.c_str(), AddEntry(AutoCompleteEntry("fixit", StrFormat("using %s;\t.using|%s|%d||using %s;", namespaceStr.c_str(), parserData->mFileName.c_str(),
usingFinder.mLastIdx, namespaceStr.c_str()).c_str())); usingFinder.mLastIdx, namespaceStr.c_str()).c_str()));

17
IDEHelper/Compiler/BfFixits.h
View file

@ -55,17 +55,34 @@ public:
class BfUsingFinder : public BfFixitFinder class BfUsingFinder : public BfFixitFinder
{ {
public: public:
int mFromIdx;
int mLastIdx; int mLastIdx;
public: public:
BfUsingFinder() BfUsingFinder()
{ {
mLastIdx = 0; mLastIdx = 0;
mFromIdx = -1;
} }
virtual void Visit(BfUsingDirective* usingDirective) override virtual void Visit(BfUsingDirective* usingDirective) override
{ {
mLastIdx = FindLineStartAfter(usingDirective->GetSourceData(), usingDirective->GetSrcEnd()); mLastIdx = FindLineStartAfter(usingDirective->GetSourceData(), usingDirective->GetSrcEnd());
} }
virtual void Visit(BfNamespaceDeclaration* namespaceDecl) override
{
if (mFromIdx != -1)
{
if ((mFromIdx < namespaceDecl->mSrcStart) || (mFromIdx >= namespaceDecl->mSrcEnd))
{
// Not inside
return;
}
}
BfFixitFinder::Visit(namespaceDecl);
}
}; };
NS_BF_END NS_BF_END

1
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -9931,6 +9931,7 @@ void BfModule::CheckTypeRefFixit(BfAstNode* typeRef, const char* appendName)
int insertLoc = 0; int insertLoc = 0;
BfUsingFinder usingFinder; BfUsingFinder usingFinder;
usingFinder.mFromIdx = typeRef->mSrcStart;
usingFinder.VisitMembers(typeRef->GetSourceData()->mRootNode); usingFinder.VisitMembers(typeRef->GetSourceData()->mRootNode);
for (auto& namespaceStr : fixitNamespaces) for (auto& namespaceStr : fixitNamespaces)