From 80ba58773d2e4de511e0fde6f30e5bd5e98cec13 Mon Sep 17 00:00:00 2001 From: VinsWorldcom Date: Thu, 17 Feb 2022 15:19:18 -0500 Subject: [PATCH] Fix auto-completion sort order problem due to fx icon Fix #11233, close #11234 --- PowerEditor/src/ScintillaComponent/AutoCompletion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp b/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp index 16ab59dae..28858db40 100644 --- a/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp +++ b/PowerEditor/src/ScintillaComponent/AutoCompletion.cpp @@ -119,10 +119,10 @@ bool AutoCompletion::showApiComplete() if (!_isFxImageRegistered) { - _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('?')); _pEditView->execute(SCI_REGISTERIMAGE, FUNC_IMG_ID, LPARAM(xpmfn)); _isFxImageRegistered = true; } + _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' ')); _pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase); _pEditView->showAutoComletion(curPos - startPos, _keyWords.c_str()); @@ -201,10 +201,10 @@ bool AutoCompletion::showApiAndWordComplete() // Make Scintilla show the autocompletion menu if (!_isFxImageRegistered) { - _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('?')); _pEditView->execute(SCI_REGISTERIMAGE, FUNC_IMG_ID, LPARAM(xpmfn)); _isFxImageRegistered = true; } + _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' ')); _pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase); _pEditView->showAutoComletion(curPos - startPos, words.c_str()); @@ -965,7 +965,7 @@ bool AutoCompletion::setLanguage(LangType language) for (; funcNode; funcNode = funcNode->NextSiblingElement(TEXT("KeyWord")) ) { const TCHAR *name = funcNode->Attribute(TEXT("name")); - generic_string imgid = TEXT("?") + intToString(FUNC_IMG_ID); + generic_string imgid = TEXT("\x1E") + intToString(FUNC_IMG_ID); if (name) { size_t len = lstrlen(name);