diff --git a/IDE/src/ui/AutoComplete.bf b/IDE/src/ui/AutoComplete.bf index cb006304..69ea742a 100644 --- a/IDE/src/ui/AutoComplete.bf +++ b/IDE/src/ui/AutoComplete.bf @@ -1582,7 +1582,7 @@ namespace IDE.ui mInsertStartIdx--; }*/ - if ((mInvokeWidget != null) && (mInvokeWidget.mEntryList.Count > 0)) + if ((mInvokeWidget != null) && (mInvokeSrcPositions != null) && (mInvokeWidget.mEntryList.Count > 0)) { var data = mTargetEditWidget.Content.mData; @@ -2042,7 +2042,7 @@ namespace IDE.ui if (mInvokeWidget != null) { prevInvokeSelect = mInvokeWidget.mSelectIdx; - if ((mInvokeWidget.mEntryList.Count > 0) && (!mInvokeSrcPositions.IsEmpty) && (mInvokeWidget.mSelectIdx >= 0)) + if ((mInvokeWidget.mEntryList.Count > 0) && (mInvokeSrcPositions != null) && (!mInvokeSrcPositions.IsEmpty) && (mInvokeWidget.mSelectIdx >= 0)) { if (IsInPanel()) { diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp index 9a6c88c9..9d754d17 100644 --- a/IDEHelper/Compiler/BfCompiler.cpp +++ b/IDEHelper/Compiler/BfCompiler.cpp @@ -8346,7 +8346,7 @@ void BfCompiler::GenerateAutocompleteInfo() auto methodMatchInfo = autoComplete->mMethodMatchInfo; if ((methodMatchInfo != NULL) && (wantsDocEntry == NULL)) { - if (methodMatchInfo->mInstanceList.size() > 0) + if ((methodMatchInfo->mInstanceList.size() > 0) && (methodMatchInfo->mBestIdx >= 0)) { if (autoComplete->mIdentifierUsed != NULL) {