From 7691c414c3787cc097d4d8084ae2d4eb3be647cd Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 28 Nov 2021 10:59:25 -0800 Subject: [PATCH] Fixed symbol hiliting with comptime emissions --- IDEHelper/Compiler/BfCompiler.cpp | 5 +++-- IDEHelper/Compiler/BfContext.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp index 31bc2c97..3aeb891e 100644 --- a/IDEHelper/Compiler/BfCompiler.cpp +++ b/IDEHelper/Compiler/BfCompiler.cpp @@ -4579,7 +4579,8 @@ void BfCompiler::ProcessAutocompleteTempType() } } - if ((mResolvePassData->mAutoComplete->mDefType == actualTypeDef) && (mResolvePassData->mAutoComplete->mDefMethod != NULL)) + if ((mResolvePassData->mAutoComplete->mDefType != NULL) && (mResolvePassData->mAutoComplete->mDefType->GetDefinition() == actualTypeDef) && + (mResolvePassData->mAutoComplete->mDefMethod != NULL)) { BfMethodDef* tempDefMethod = NULL; for (auto checkMethod : tempTypeDef->mMethods) @@ -4672,7 +4673,7 @@ void BfCompiler::AddToRebuildTypeList(BfTypeInstance* typeInst, HashSetmParser != NULL) { // Only find references within the current file - if (!typeInst->mTypeDef->HasSource(mResolvePassData->mParser)) + if (!typeInst->mTypeDef->GetDefinition()->HasSource(mResolvePassData->mParser)) return; } diff --git a/IDEHelper/Compiler/BfContext.cpp b/IDEHelper/Compiler/BfContext.cpp index c0319530..2de7a71a 100644 --- a/IDEHelper/Compiler/BfContext.cpp +++ b/IDEHelper/Compiler/BfContext.cpp @@ -519,7 +519,7 @@ bool BfContext::ProcessWorkList(bool onlyReifiedTypes, bool onlyReifiedMethods) auto owner = methodInstance->mMethodInstanceGroup->mOwner; BF_ASSERT(!module->mAwaitingFinish); - if ((resolveParser != NULL) && (methodInstance->mMethodDef->mDeclaringType != NULL) && (methodInstance->mMethodDef->mDeclaringType->mSource != resolveParser)) + if ((resolveParser != NULL) && (methodInstance->mMethodDef->mDeclaringType != NULL) && (methodInstance->mMethodDef->mDeclaringType->GetDefinition()->mSource != resolveParser)) { continue; }