From c5dee6c89f778c4fc2598cfce5e361985a13abb8 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 29 Jul 2022 13:37:35 +0300
Subject: =?UTF-8?q?fixes=20#3128=20(tabSRMM:=20=D0=B0=D0=B2=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0=20(Tab)=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=BB,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B2=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=20=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=83=20=D0=B4=D0=B2=D0=BE=D0=B5=D1=82=D0=BE=D1=87?=
 =?UTF-8?q?=D0=B8=D1=8F/=D0=B7=D0=B0=D0=BF=D1=8F=D1=82=D0=BE=D0=B9,=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D1=82,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D1=8B?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/TabSRMM/src/msgdlgother.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 6387d37a2c..a7b9823c25 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -1870,16 +1870,12 @@ bool CMsgDialog::TabAutoComplete()
 		return false;
 
 	bool isTopic = false, isRoom = false;
-	wchar_t *pszName = nullptr;
 	wchar_t *pszText = (wchar_t *)mir_calloc((iLen + 10) * sizeof(wchar_t));
 
 	gt.flags = GT_DEFAULT;
 	gt.cb = (iLen + 9) * sizeof(wchar_t);
 	m_message.SendMsg(EM_GETTEXTEX, (WPARAM)& gt, (LPARAM)pszText);
 
-	if (start > 1 && pszText[start - 1] == ' ' && pszText[start - 2] == ':')
-		start -= 2;
-
 	if (m_wszSearchResult != nullptr) {
 		int cbResult = (int)mir_wstrlen(m_wszSearchResult);
 		if (start >= cbResult && !wcsnicmp(m_wszSearchResult, pszText + start - cbResult, cbResult)) {
@@ -1904,11 +1900,14 @@ LBL_SkipEnd:
 		if (topicStart > 5 && wcsstr(&pszText[topicStart - 6], L"/topic") == &pszText[topicStart - 6])
 			isTopic = true;
 	}
+	
 	if (m_wszSearchQuery == nullptr) {
 		m_wszSearchQuery = mir_wstrndup(pszText + start, end - start);
 		m_wszSearchResult = mir_wstrdup(m_wszSearchQuery);
 		m_pLastSession = nullptr;
 	}
+
+	const wchar_t *pszName = nullptr;
 	if (isTopic)
 		pszName = m_si->ptszTopic;
 	else if (isRoom) {
@@ -1921,18 +1920,25 @@ LBL_SkipEnd:
 	replaceStrW(m_wszSearchResult, nullptr);
 
 	if (pszName != nullptr) {
-		m_wszSearchResult = mir_wstrdup(pszName);
 		if (end != start) {
-			ptrW szReplace;
-			if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) {
-				szReplace = (wchar_t *)mir_alloc((mir_wstrlen(pszName) + 4) * sizeof(wchar_t));
-				mir_wstrcpy(szReplace, pszName);
-				mir_wstrcat(szReplace, g_Settings.bUseCommaAsColon ? L", " : L": ");
-				pszName = szReplace;
+			CMStringW szReplace;
+			if (!isRoom && !isTopic && start == 0) {
+				szReplace = pszName;
+				if (g_Settings.bUseCommaAsColon)
+					szReplace.AppendChar(',');
+				else if (g_Settings.bAddColonToAutoComplete)
+					szReplace.AppendChar(':');
+				szReplace.AppendChar(' ');
+				m_wszSearchResult = szReplace.Detach();
+				pszName = m_wszSearchResult;
 			}
+			else m_wszSearchResult = mir_wstrdup(pszName);
+
 			m_message.SendMsg(EM_SETSEL, start, end);
 			m_message.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)pszName);
 		}
+		else m_wszSearchResult = mir_wstrdup(pszName);
+
 		return true;
 	}
 
-- 
cgit v1.2.3