Fixed autocomplete issues with nested calls

IDEHelper/Compiler/BfAutoComplete.cpp

@@ -1794,18 +1794,9 @@ void BfAutoComplete::CheckInvocation(BfAstNode* invocationNode, BfTokenNode* ope
 	if (doCapture)
 	{				
 		mIsCapturingMethodMatchInfo = true;
-		if (mMethodMatchInfo == NULL)
+		
-			mMethodMatchInfo = new MethodMatchInfo();			
+		delete mMethodMatchInfo;
-		else
+		mMethodMatchInfo = new MethodMatchInfo();
-		{
-			if (wasCapturingMethodMatchInfo)
-			{
-				// We're actually in an inner invocation now
-				delete mMethodMatchInfo;
-				mMethodMatchInfo = new MethodMatchInfo();
-				mMethodMatchInfo->mSrcPositions.Clear();
-			}
-		}
 
 		mMethodMatchInfo->mInvocationSrcIdx = target->GetSrcStart();
 		mMethodMatchInfo->mCurMethodInstance = mModule->mCurMethodInstance;

IDEHelper/Compiler/BfExprEvaluator.cpp

@@ -833,7 +833,7 @@ void BfMethodMatcher::CompareMethods(BfMethodInstance* prevMethodInstance, BfTyp
 	RETURN_RESULTS;
 }
 
-BfTypedValue BfMethodMatcher::ResolveArgTypedValue(BfResolvedArg& resolvedArg, BfType* checkType)
+BfTypedValue BfMethodMatcher::ResolveArgTypedValue(BfResolvedArg& resolvedArg, BfType* checkType, BfTypeVector* genericArgumentsSubstitute)
 {
 	BfTypedValue argTypedValue = resolvedArg.mTypedValue;
 	if ((resolvedArg.mArgFlags & BfArgFlag_DelegateBindAttempt) != 0)
@@ -910,7 +910,6 @@ BfTypedValue BfMethodMatcher::ResolveArgTypedValue(BfResolvedArg& resolvedArg, B
 			{
 				SetAndRestoreValue<bool> prevIgnoreWrites(mModule->mBfIRBuilder->mIgnoreWrites, true);
 				SetAndRestoreValue<bool> prevIgnoreError(mModule->mIgnoreErrors, true);				
-				//SetAndRestoreValue<bool> prevNoBind(mModule->mCurMethodState->mNoBind, true);
 				
 				bool prevNoBind = false;
 				if (mModule->mCurMethodState != NULL)
@@ -921,11 +920,27 @@ BfTypedValue BfMethodMatcher::ResolveArgTypedValue(BfResolvedArg& resolvedArg, B
 
 				auto prevBlock = mModule->mBfIRBuilder->GetInsertBlock();
 
+				
 				BfExprEvaluator exprEvaluator(mModule);									
-				exprEvaluator.mExpectingType = checkType;				
+				exprEvaluator.mBfEvalExprFlags = (BfEvalExprFlags)(exprEvaluator.mBfEvalExprFlags | BfEvalExprFlags_AllowIntUnknown | BfEvalExprFlags_NoAutoComplete);
-				exprEvaluator.mBfEvalExprFlags = (BfEvalExprFlags)(exprEvaluator.mBfEvalExprFlags | BfEvalExprFlags_AllowIntUnknown);
 				if ((resolvedArg.mArgFlags & BfArgFlag_ParamsExpr) != 0)
 					exprEvaluator.mBfEvalExprFlags = (BfEvalExprFlags)(exprEvaluator.mBfEvalExprFlags | BfEvalExprFlags_AllowParamsExpr);
+
+				auto expectType = checkType;
+				if (expectType != NULL)
+				{
+					if (expectType->IsRef())
+					{
+						auto refType = (BfRefType*)expectType;
+						expectType = refType->mElementType;
+					}
+
+					if (genericArgumentsSubstitute != NULL)
+						expectType = mModule->ResolveGenericType(expectType, *genericArgumentsSubstitute, true);
+				}
+				
+				exprEvaluator.mExpectingType = expectType;
+
 				exprEvaluator.Evaluate(resolvedArg.mExpression);				
 				argTypedValue = exprEvaluator.GetResult();
 				
@@ -1046,6 +1061,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 
 	BfTypeVector* genericArgumentsSubstitute = NULL;
 	int argIdx = 0;
+	int argMatchCount = 0;
 	
 	bool needInferGenericParams = (checkMethod->mGenericParams.size() != 0) && (!mHadExplicitGenericArguments);
 	int paramIdx = 0;
@@ -1140,7 +1156,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 
 			if (wantType->IsUnspecializedType())
 			{
-				BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], checkType);				
+				BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], checkType, genericArgumentsSubstitute);
 				if (!argTypedValue.IsUntypedValue())
 				{
 					auto type = argTypedValue.mType;
@@ -1209,7 +1225,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 			if (paramIdx >= (int) mArguments.size())
 				break; // No params			
 
-			BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], NULL);
+			BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], NULL, genericArgumentsSubstitute);
 			if (!argTypedValue)
 				goto NoMatch;
 
@@ -1224,6 +1240,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 				if ((argTypedValue.IsUntypedValue()) || (mModule->CanImplicitlyCast(argTypedValue, paramsArrayType)))
 				{
 					argIdx++;
+					argMatchCount++;
 					paramIdx++;					
 					break;
 				}
@@ -1238,12 +1255,13 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 
 				while (argIdx < (int)mArguments.size())
 				{
-					argTypedValue = ResolveArgTypedValue(mArguments[argIdx], paramsElementType);
+					argTypedValue = ResolveArgTypedValue(mArguments[argIdx], paramsElementType, genericArgumentsSubstitute);
 					if (!argTypedValue.HasType())
 						goto NoMatch;
 					if (!mModule->CanImplicitlyCast(argTypedValue, paramsElementType))
 						goto NoMatch;
 					argIdx++;
+					argMatchCount++;
 				}
 			}			
 			else
@@ -1283,7 +1301,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 			// We had a 'params' expression but this method didn't have a params slot in this parameter
 			goto NoMatch;
 		}
-		BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], wantType);
+		BfTypedValue argTypedValue = ResolveArgTypedValue(mArguments[argIdx], wantType, genericArgumentsSubstitute);
 
 		if (!argTypedValue.IsUntypedValue())
 		{
@@ -1297,6 +1315,7 @@ bool BfMethodMatcher::CheckMethod(BfTypeInstance* typeInstance, BfMethodDef* che
 		
 		paramIdx++;
 		argIdx++;
+		argMatchCount++;
 
 		if ((autoComplete != NULL) && (autoComplete->mIsCapturingMethodMatchInfo))
 		{
@@ -1430,9 +1449,17 @@ NoMatch:
 			if ((prevParamDiff >= 0) && ((paramDiff < 0) || (prevParamDiff < paramDiff)))
 				return false;
 			
-			// We search from the most specific type, so don't prefer a less specific type
+			if (paramDiff == prevParamDiff)
-			if ((paramDiff == prevParamDiff) && (mBestMethodTypeInstance != typeInstance))
+			{
-				return false;
+				if (argMatchCount < mBackupArgMatchCount)
+					return false;
+				else if (argMatchCount == mBackupArgMatchCount)
+				{
+					// We search from the most specific type, so don't prefer a less specific type
+					if (mBestMethodTypeInstance != typeInstance)
+						return false;
+				}
+			}			
 		}
 
 		if ((autoComplete != NULL) && (autoComplete->mIsCapturingMethodMatchInfo))
@@ -1445,6 +1472,7 @@ NoMatch:
 		}
 
 		mBackupMethodDef = checkMethod;
+		mBackupArgMatchCount = argMatchCount;
 		// Lie temporarily to store at least one candidate (but mBestMethodDef is still NULL)
 		hadMatch = true;
 	}
@@ -1950,6 +1978,8 @@ BfAutoComplete* BfExprEvaluator::GetAutoComplete()
 {
 	if (mModule->mCompiler->mResolvePassData == NULL)
 		return NULL;
+	if ((mBfEvalExprFlags & BfEvalExprFlags_NoAutoComplete) != 0)
+		return NULL;
 
 	// For local methods- only process autocomplete on capture phase
 	if ((mModule->mCurMethodState != NULL) && (mModule->mCurMethodState->mClosureState != NULL) && (!mModule->mCurMethodState->mClosureState->mCapturing))
@@ -7826,9 +7856,17 @@ void BfExprEvaluator::Visit(BfDefaultExpression* defaultExpr)
 		type = mModule->ResolveTypeRef(defaultExpr->mTypeRef);
 	if (type == NULL)
 		return;	
+
+	BfDefaultValueKind defaultKind = BfDefaultValueKind_Const;
+	if (type->IsRef())
+	{
+		mModule->Fail(StrFormat("There is no default value for type '%s'", mModule->TypeToString(type).c_str()), defaultExpr);
+		defaultKind = BfDefaultValueKind_Addr;
+	}
+
 	mModule->ValidateAllocation(type, defaultExpr->mTypeRef);
 	mModule->AddDependency(type, mModule->mCurTypeInstance, BfDependencyMap::DependencyFlag_ExprTypeReference);
-	mResult = mModule->GetDefaultTypedValue(type);
+	mResult = mModule->GetDefaultTypedValue(type, true, defaultKind);
 }
 
 void BfExprEvaluator::Visit(BfUninitializedExpression* uninitialziedExpr)

IDEHelper/Compiler/BfExprEvaluator.h

@@ -142,6 +142,7 @@ public:
 
 	BfType* mSelfType; // Only when matching interfaces when 'Self' needs to refer back to the implementing type
 	BfMethodDef* mBackupMethodDef;
+	int mBackupArgMatchCount;
 	BfMethodDef* mBestMethodDef;
 	BfTypeInstance* mBestMethodTypeInstance;		
 	BfModuleMethodInstance mBestMethodInstance;
@@ -152,7 +153,7 @@ public:
 	Array<BfAmbiguousEntry> mAmbiguousEntries;
 
 public:
-	BfTypedValue ResolveArgTypedValue(BfResolvedArg& resolvedArg, BfType* checkType);
+	BfTypedValue ResolveArgTypedValue(BfResolvedArg& resolvedArg, BfType* checkType, BfTypeVector* genericArgumentsSubstitute);
 	bool InferGenericArgument(BfMethodInstance* methodInstance, BfType* argType, BfType* wantType, BfIRValue argValue);
 	void CompareMethods(BfMethodInstance* prevMethodInstance, BfTypeVector* prevGenericArgumentsSubstitute,
 		BfMethodInstance* newMethodInstance, BfTypeVector* genericArgumentsSubstitute, 

IDEHelper/Compiler/BfModule.h

@@ -64,7 +64,8 @@ enum BfEvalExprFlags
 	BfEvalExprFlags_AllowRefExpr = 0x800,
 	BfEvalExprFlags_AllowOutExpr = 0x1000,
 	BfEvalExprFlags_FieldInitializer = 0x2000,
-	BfEvalExprFlags_VariableDeclaration = 0x4000
+	BfEvalExprFlags_VariableDeclaration = 0x4000,
+	BfEvalExprFlags_NoAutoComplete = 0x8000
 };
 
 enum BfCastFlags
@@ -1340,7 +1341,6 @@ public:
 	bool mWroteToLib;
 	bool mHadBuildError;
 	bool mHadBuildWarning;	
-	bool mHadVarUsage;
 	bool mIgnoreErrors;
 	bool mIgnoreWarnings;	
 	bool mSetIllegalSrcPosition;
@@ -1363,7 +1363,6 @@ public:
 	void GetAccessAllowed(BfTypeInstance* checkType, bool& allowProtected, bool& allowPrivate);
 	bool CheckProtection(BfProtectionCheckFlags& flags, BfTypeInstance* memberOwner, BfProtection memberProtection, BfTypeInstance* lookupStartType);
 	void SetElementType(BfAstNode* astNode, BfSourceElementType elementType);	
-	void SetHadVarUsage();
 	BfError* Fail(const StringImpl& error, BfAstNode* refNode = NULL, bool isPersistent = false);
 	BfError* FailAfter(const StringImpl& error, BfAstNode* refNode);	
 	BfError* Warn(int warningNum, const StringImpl& warning, BfAstNode* refNode = NULL, bool isPersistent = false);