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

Added more informational mouseovers

Browse source
This commit is contained in:
Brian Fiete 2020-05-17 06:10:56 -07:00
parent 9499c727ab
commit d11c79e43e
7 changed files with 183 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

85
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -3414,7 +3414,7 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
auto fieldInstance = &curCheckType->mFieldInstances[field->mIdx];
bool isResolvingFields = curCheckType->mResolvingConstField || curCheckType->mResolvingVarField;
if (field->mIsVolatile)
mIsVolatileReference = true;
@ -3473,7 +3473,31 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
auto autoComplete = GetAutoComplete();
if (autoComplete != NULL)
{
autoComplete->CheckFieldRef(BfNodeDynCast<BfIdentifierNode>(targetSrc), fieldInstance);
if ((autoComplete->mResolveType == BfResolveType_GetResultString) && (autoComplete->IsAutocompleteNode(targetSrc)))
{
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->TypeToString(fieldInstance->mResolvedType);
autoComplete->mResultString += " ";
autoComplete->mResultString += mModule->TypeToString(curCheckType);
autoComplete->mResultString += ".";
autoComplete->mResultString += field->mName;
if (fieldInstance->mConstIdx != -1)
{
String constStr = autoComplete->ConstantToString(curCheckType->mConstHolder, BfIRValue(BfIRValueFlags_Const, fieldInstance->mConstIdx));
if (!constStr.IsEmpty())
{
autoComplete->mResultString += " = ";
if (constStr.StartsWith(':'))
autoComplete->mResultString.Append(StringView(constStr, 1, constStr.mLength - 1));
else
autoComplete->mResultString += constStr;
}
}
}
}
if (field->mIsStatic)
{
@ -3879,6 +3903,18 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
}
}
if ((autoComplete != NULL) && (autoComplete->mResolveType == BfResolveType_GetResultString) && (autoComplete->IsAutocompleteNode(targetSrc)))
{
BfPropertyDef* basePropDef = mPropDef;
BfTypeInstance* baseTypeInst = curCheckType;
mModule->GetBasePropertyDef(basePropDef, baseTypeInst);
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->TypeToString(baseTypeInst);
autoComplete->mResultString += ".";
autoComplete->mResultString += basePropDef->mName;
}
// Check for direct auto-property access
if (startCheckType == mModule->mCurTypeInstance)
{
@ -5763,6 +5799,11 @@ BfTypedValue BfExprEvaluator::MatchConstructor(BfAstNode* targetSrc, BfMethodBou
if (mModule->mCompiler->mResolvePassData != NULL)
mModule->mCompiler->mResolvePassData->HandleMethodReference(targetSrc, curTypeInst->mTypeDef, methodDef);
// There should always be a constructor
BF_ASSERT(methodMatcher.mBestMethodDef != NULL);
auto moduleMethodInstance = mModule->GetMethodInstance(methodMatcher.mBestMethodTypeInstance, methodMatcher.mBestMethodDef, methodMatcher.mBestMethodGenericArguments);
BfAutoComplete* autoComplete = GetAutoComplete();
if (autoComplete != NULL)
{
@ -5781,15 +5822,15 @@ BfTypedValue BfExprEvaluator::MatchConstructor(BfAstNode* targetSrc, BfMethodBou
else if (resolvedTypeInstance->mTypeDef->mTypeDeclaration != NULL)
autoComplete->SetDefinitionLocation(resolvedTypeInstance->mTypeDef->mTypeDeclaration->mNameNode, true);
}
}
}
else if ((autoComplete->mResolveType == BfResolveType_GetResultString) && (autoComplete->IsAutocompleteNode(targetSrc)) &&
(moduleMethodInstance.mMethodInstance != NULL))
{
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->MethodToString(moduleMethodInstance.mMethodInstance);
}
}
// There should always be a constructor
BF_ASSERT(methodMatcher.mBestMethodDef != NULL);
auto moduleMethodInstance = mModule->GetMethodInstance(methodMatcher.mBestMethodTypeInstance, methodMatcher.mBestMethodDef, methodMatcher.mBestMethodGenericArguments);
BfConstructorDeclaration* ctorDecl = (BfConstructorDeclaration*)methodMatcher.mBestMethodDef->mMethodDeclaration;
if ((methodMatcher.mBestMethodDef->mHasAppend) && (targetType->IsObject()))
{
@ -7114,6 +7155,12 @@ BfTypedValue BfExprEvaluator::MatchMethod(BfAstNode* targetSrc, BfMethodBoundExp
autoComplete->mDefMethod = methodDef;
autoComplete->mDefType = curTypeInst->mTypeDef;
}
if (autoComplete->mResolveType == BfResolveType_GetResultString)
{
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->MethodToString(moduleMethodInstance.mMethodInstance);
}
}
}
}
@ -14228,6 +14275,17 @@ BfTypedValue BfExprEvaluator::GetResult(bool clearResult, bool resolveGenericTyp
if (mPropSrc != NULL)
mModule->UpdateExprSrcPos(mPropSrc);
auto autoComplete = GetAutoComplete();
if ((autoComplete != NULL) && (autoComplete->IsAutocompleteNode(mPropSrc)) && (autoComplete->mResolveType == BfResolveType_GetResultString))
{
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->TypeToString(methodInstance.mMethodInstance->mReturnType);
autoComplete->mResultString += " ";
autoComplete->mResultString += mModule->TypeToString(methodInstance.mMethodInstance->GetOwner());
autoComplete->mResultString += ".";
autoComplete->mResultString += mPropDef->mName;
}
CheckPropFail(matchedMethod, methodInstance.mMethodInstance, (mPropGetMethodFlags & BfGetMethodInstanceFlag_Friend) == 0);
PerformCallChecks(methodInstance.mMethodInstance, mPropSrc);
@ -15078,6 +15136,17 @@ void BfExprEvaluator::PerformAssignment(BfAssignmentExpression* assignExpr, bool
BF_ASSERT(methodInstance.mMethodInstance->mMethodDef == setMethod);
CheckPropFail(setMethod, methodInstance.mMethodInstance, (mPropGetMethodFlags & BfGetMethodInstanceFlag_Friend) == 0);
auto autoComplete = GetAutoComplete();
if ((autoComplete != NULL) && (autoComplete->IsAutocompleteNode(mPropSrc)) && (autoComplete->mResolveType == BfResolveType_GetResultString))
{
autoComplete->mResultString = ":";
autoComplete->mResultString += mModule->TypeToString(methodInstance.mMethodInstance->GetParamType(0));
autoComplete->mResultString += " ";
autoComplete->mResultString += mModule->TypeToString(methodInstance.mMethodInstance->GetOwner());
autoComplete->mResultString += ".";
autoComplete->mResultString += mPropDef->mName;
}
BfTypedValue convVal;
if (binaryOp != BfBinaryOp_None)
{