Improve case insensitive auto-completion, issue #654.

zufuliu · May 1, 2023 · f66089f · f66089f
1 parent 5258246
commit f66089f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scintilla/src/AutoComplete.cxx b/scintilla/src/AutoComplete.cxx
@@ -103,6 +103,8 @@ char AutoComplete::GetTypesep() const noexcept {
 	return typesep;
 }
 
+namespace {
+
 struct Sorter {
 	const AutoComplete *ac;
 	const char *list;
@@ -155,6 +157,8 @@ struct Sorter {
 	}
 };
 
+}
+
 void AutoComplete::SetList(const char *list) {
 	if (autoSort == Ordering::PreSorted) {
 		lb->SetList(list, separator, typesep);

diff --git a/src/EditAutoC.c b/src/EditAutoC.c
@@ -289,7 +289,7 @@ void WordList_Init(struct WordList *pWList, LPCSTR pRoot, UINT iRootLen, bool bI
 	pWList->iStartLen = iRootLen;
 
 	if (bIgnoreCase) {
-		pWList->WL_strcmp = _stricmp;
+		pWList->WL_strcmp = strcmp;
 		pWList->WL_strncmp = _strnicmp;
 #if NP2_AUTOC_USE_STRING_ORDER
 		pWList->WL_OrderFunc = WordList_OrderCase;
@@ -1657,9 +1657,7 @@ static bool EditCompleteWordCore(int iCondition, bool autoInsert) {
 		SciCall_AutoCSetOptions(SC_AUTOCOMPLETE_FIXED_SIZE);
 		SciCall_AutoCSetOrder(SC_ORDER_PRESORTED); // pre-sorted
 		SciCall_AutoCSetIgnoreCase(bIgnoreCase); // case sensitivity
-		//if (bIgnoreCase) {
-		//	SciCall_AutoCSetCaseInsensitiveBehaviour(SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE);
-		//}
+		SciCall_AutoCSetCaseInsensitiveBehaviour(bIgnoreCase);
 		//SciCall_AutoCSetSeparator('\n');
 		//SciCall_AutoCSetTypeSeparator('\t');
 		SciCall_AutoCSetFillUps(autoCompletionConfig.szAutoCompleteFillUp);