From eee6389f9820f7b43a912d5c22072b518d033c9d Mon Sep 17 00:00:00 2001 From: Fusion Date: Thu, 4 Mar 2021 21:41:05 +0100 Subject: [PATCH 1/2] Fix indexer autocomplete. --- IDEHelper/Compiler/BfAutoComplete.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/IDEHelper/Compiler/BfAutoComplete.cpp b/IDEHelper/Compiler/BfAutoComplete.cpp index 9cf8f3da..5a1621ea 100644 --- a/IDEHelper/Compiler/BfAutoComplete.cpp +++ b/IDEHelper/Compiler/BfAutoComplete.cpp @@ -2306,18 +2306,40 @@ bool BfAutoComplete::GetMethodInfo(BfMethodInstance* methodInst, StringImpl* sho StringT<128> propName; StringT<256> impl; - propDeclaration->mNameNode->ToString(propName); + if (propDeclaration->mNameNode != NULL) + propDeclaration->mNameNode->ToString(propName); + else + { + StringT<128> args; + + propName += "this["; + for (size_t paramIdx = 0, count = methodInst->GetParamCount(); paramIdx < count; ++paramIdx) + { + if (paramIdx > 0) + args += ", "; + + args += mModule->TypeToString(methodInst->GetParamType(paramIdx), nameFlags); + args += " "; + args += methodDef->mParams[paramIdx]->mName; + } + propName += args; + propName += "]"; + } bool isAbstract = methodDef->mIsAbstract; if (propDeclaration->mProtectionSpecifier != NULL) impl += propDeclaration->mProtectionSpecifier->ToString() + " "; + else if (isInterface && !isExplicitInterface) + impl += "public "; + if (!isInterface) impl += "override "; BfType* propType = methodInst->mReturnType; if (methodDef->mMethodType == BfMethodType_PropertySetter) propType = methodInst->GetParamType(0); + impl += mModule->TypeToString(propType, nameFlags); impl += " "; if (isExplicitInterface) From dbbe64633b97f025e168f1c4faced144945346a0 Mon Sep 17 00:00:00 2001 From: C34A Date: Tue, 9 Mar 2021 19:28:45 -0800 Subject: [PATCH 2/2] fixed typo in hunspell CMakeLists --- extern/hunspell/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extern/hunspell/CMakeLists.txt b/extern/hunspell/CMakeLists.txt index 21d663bf..3364d64f 100644 --- a/extern/hunspell/CMakeLists.txt +++ b/extern/hunspell/CMakeLists.txt @@ -48,9 +48,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}") else() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}") - set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") + set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}") endif() ################### Dependencies ##################