github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix autocomplete to sort case insensitive issue 

Fix #12495, close #12703
pull/13027/head
mpheath 2022-12-26 23:29:17 +10:00 committed by Don Ho
parent afacc8338e
commit 62a23a8dc7
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PowerEditor/src/ScintillaComponent/AutoCompletion.cpp
View File

@ -268,6 +268,25 @@ static bool isAllDigits(const generic_string &str)
return true; return true;
} }
void sortInsensitive(vector<generic_string> &wordArray)
{
sort(
wordArray.begin(),
wordArray.end(),
[](const generic_string &a, const generic_string &b)
{
return lexicographical_compare(
a.begin(), a.end(),
b.begin(), b.end(),
[](const wchar_t &ch1, const wchar_t &ch2)
{
return toupper(ch1) < toupper(ch2);
}
);
}
);
}
bool AutoCompletion::showApiComplete() bool AutoCompletion::showApiComplete()
{ {
@ -311,6 +330,7 @@ bool AutoCompletion::showApiComplete()
_pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E')); _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E'));
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' ')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' '));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase); _pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase);
_pEditView->execute(SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, _ignoreCase);
_pEditView->showAutoComletion(curPos - startPos, _keyWords.c_str()); _pEditView->showAutoComletion(curPos - startPos, _keyWords.c_str());
return true; return true;
@ -376,6 +396,9 @@ bool AutoCompletion::showApiAndWordComplete()
// Sort word array and convert it to a single string with space-separated words // Sort word array and convert it to a single string with space-separated words
if (_ignoreCase)
sortInsensitive(wordArray);
else
sort(wordArray.begin(), wordArray.end()); sort(wordArray.begin(), wordArray.end());
generic_string words; generic_string words;
@ -415,6 +438,7 @@ bool AutoCompletion::showApiAndWordComplete()
_pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E')); _pEditView->execute(SCI_AUTOCSETTYPESEPARATOR, WPARAM('\x1E'));
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' ')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' '));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase); _pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase);
_pEditView->execute(SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, _ignoreCase);
_pEditView->showAutoComletion(curPos - startPos, words.c_str()); _pEditView->showAutoComletion(curPos - startPos, words.c_str());
return true; return true;
} }
@ -610,6 +634,7 @@ void AutoCompletion::showPathCompletion()
// Show autocompletion box. // Show autocompletion box.
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM('\n')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM('\n'));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, true); _pEditView->execute(SCI_AUTOCSETIGNORECASE, true);
_pEditView->execute(SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, true);
_pEditView->showAutoComletion(rawPath.length(), autoCompleteEntries.c_str()); _pEditView->showAutoComletion(rawPath.length(), autoCompleteEntries.c_str());
return; return;
} }
@ -658,6 +683,9 @@ bool AutoCompletion::showWordComplete(bool autoInsert)
// Sort word array and convert it to a single string with space-separated words // Sort word array and convert it to a single string with space-separated words
if (_ignoreCase)
sortInsensitive(wordArray);
else
sort(wordArray.begin(), wordArray.end()); sort(wordArray.begin(), wordArray.end());
generic_string words(TEXT("")); generic_string words(TEXT(""));
@ -673,6 +701,7 @@ bool AutoCompletion::showWordComplete(bool autoInsert)
_pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' ')); _pEditView->execute(SCI_AUTOCSETSEPARATOR, WPARAM(' '));
_pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase); _pEditView->execute(SCI_AUTOCSETIGNORECASE, _ignoreCase);
_pEditView->execute(SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, _ignoreCase);
_pEditView->showAutoComletion(curPos - startPos, words.c_str()); _pEditView->showAutoComletion(curPos - startPos, words.c_str());
return true; return true;
} }
@ -1193,6 +1222,9 @@ bool AutoCompletion::setLanguage(LangType language)
} }
} }
if (_ignoreCase)
sortInsensitive(_keyWordArray);
else
sort(_keyWordArray.begin(), _keyWordArray.end()); sort(_keyWordArray.begin(), _keyWordArray.end());
for (size_t i = 0, len = _keyWordArray.size(); i < len; ++i) for (size_t i = 0, len = _keyWordArray.size(); i < len; ++i)