CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5087 from RaiKoHoff/Dev_Master

Browse Source 
Fix grepWinNP3: Search results context menu: fix Open with Editor
This commit is contained in:
Pairi Daiza 2024-01-11 09:36:13 +01:00 committed by GitHub
commit 9357af7b11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grepWinNP3/src/ShellContextMenu.cpp
View File

@ -331,17 +331,19 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
break;
case 5:
{
if (!m_lineVector.empty())
if (m_lineVector.size() > 1)
{
for (auto it = m_lineVector.cbegin(); it != m_lineVector.cend(); ++it)
{
for (auto it2 = it->lines.cbegin(); it2 != it->lines.cend(); ++it2)
{
std::wstring cmd = editorCmd;
SearchReplace(cmd, L"%path%", it->path.c_str());
SearchReplace(cmd, L"/%mode%", L"");
SearchReplace(cmd, L"\"%pattern%\"", L"");
wchar_t buf[40] = {0};
swprintf_s(buf, L"%ld", it2->number);
SearchReplace(cmd, L"%line%", buf);
SearchReplace(cmd, L"%path%", it->path.c_str());
STARTUPINFO startupInfo;
PROCESS_INFORMATION processInfo;
@ -359,7 +361,8 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
for (auto it = m_strVector.begin(); it != m_strVector.end(); ++it)
{
std::wstring cmd = editorCmd;
SearchReplace(cmd, L"%path%", it->filePath.c_str());
SearchReplace(cmd, L"/%mode%", L"");
SearchReplace(cmd, L"\"%pattern%\"", L"");
if (!it->matchLinesNumbers.empty())
{
wchar_t buf[40] = {0};
@ -368,6 +371,7 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
}
else
SearchReplace(cmd, L"%line%", L"0");
SearchReplace(cmd, L"%path%", it->filePath.c_str());
STARTUPINFO startupInfo;
PROCESS_INFORMATION processInfo;