From a17f57f4c61cf6d934da71b23bfe9906de366164 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sun, 31 Oct 2021 09:48:04 -0700 Subject: [PATCH] Fixed deferred mouseover hoverwatch mismatch --- IDE/src/ui/SourceViewPanel.bf | 2 +- IDEHelper/Compiler/BfAutoComplete.cpp | 8 ++++---- IDEHelper/Compiler/BfCompiler.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf index c91e3775..e94ca7d2 100644 --- a/IDE/src/ui/SourceViewPanel.bf +++ b/IDE/src/ui/SourceViewPanel.bf @@ -4951,7 +4951,7 @@ namespace IDE.ui if ((!String.IsNullOrEmpty(mHoverResolveTask?.mResult))) { origDebugExpr = scope:: String(); - origDebugExpr.Set(debugExpr); + origDebugExpr.Set(""); debugExpr.Set(mHoverResolveTask.mResult); diff --git a/IDEHelper/Compiler/BfAutoComplete.cpp b/IDEHelper/Compiler/BfAutoComplete.cpp index 616a258e..8a5d6c89 100644 --- a/IDEHelper/Compiler/BfAutoComplete.cpp +++ b/IDEHelper/Compiler/BfAutoComplete.cpp @@ -570,7 +570,7 @@ void BfAutoComplete::AddTypeDef(BfTypeDef* typeDef, const StringImpl& filter, bo auto typeInst = mModule->ResolveTypeDef(typeDef, BfPopulateType_IdentityNoRemapAlias); StringT<1024> str; if (typeInst != NULL) - str = mModule->TypeToString(typeInst, BfTypeNameFlag_ExtendedInfo); + str = mModule->TypeToString(typeInst, (BfTypeNameFlags)(BfTypeNameFlag_ExtendedInfo | BfTypeNameFlag_ResolveGenericParamNames)); if (typeDef->mTypeDeclaration->mDocumentation != NULL) { if (!str.IsEmpty()) @@ -2627,7 +2627,7 @@ void BfAutoComplete::CheckVarResolution(BfAstNode* varTypeRef, BfType* resolvedT if (mResolveType == BfResolveType_GetResultString) { mResultString = ":"; - mResultString += mModule->TypeToString(resolvedType); + mResultString += mModule->TypeToString(resolvedType, (BfTypeNameFlags)(BfTypeNameFlag_ExtendedInfo | BfTypeNameFlag_ResolveGenericParamNames)); } } } @@ -2651,11 +2651,11 @@ void BfAutoComplete::CheckResult(BfAstNode* node, const BfTypedValue& typedValue auto constant = mModule->mBfIRBuilder->GetConstant(typedValue.mValue); if (BfIRConstHolder::IsInt(constant->mTypeCode)) { - mResultString = StrFormat("%lld", constant->mInt64); + mResultString = StrFormat(":%lld", constant->mInt64); } else if (BfIRConstHolder::IsFloat(constant->mTypeCode)) { - mResultString = StrFormat("%f", constant->mDouble); + mResultString = StrFormat(":%f", constant->mDouble); } } diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp index 338b1375..fd9acff9 100644 --- a/IDEHelper/Compiler/BfCompiler.cpp +++ b/IDEHelper/Compiler/BfCompiler.cpp @@ -4304,7 +4304,7 @@ void BfCompiler::ProcessAutocompleteTempType() if (autoComplete->mResolveType == BfResolveType_GetResultString) { autoComplete->mResultString = ":"; - autoComplete->mResultString += module->TypeToString(typeInst); + autoComplete->mResultString += module->TypeToString(typeInst, (BfTypeNameFlags)(BfTypeNameFlag_ExtendedInfo | BfTypeNameFlag_ResolveGenericParamNames)); } } }