adjust ShowContextMenu for %move%

and move `linePositions` from public into the function

Author: lifenjoiner

src/LineData.h

@@ -23,6 +23,7 @@
 struct LineDataLine
 {
     DWORD           number;
+    DWORD           move;
     std::wstring    text;
 };
 

src/SearchDlg.cpp

@@ -78,7 +78,6 @@ DWORD WINAPI            SearchThreadEntry(LPVOID lpParam);
 
 // ReSharper disable once CppInconsistentNaming
 UINT                    CSearchDlg::m_grepwinStartupmsg = RegisterWindowMessage(L"grepWin_StartupMessage");
-std::map<size_t, DWORD> linePositions;
 
 extern ULONGLONG        g_startTime;
 extern HANDLE           hInitProtection;
@@ -2278,7 +2277,10 @@ void CSearchDlg::ShowContextMenu(HWND hWnd, int x, int y)
             data.path       = info.filePath;
             LineDataLine dataLine;
             if (static_cast<int>(info.matchLinesNumbers.size()) > subIdx)
+            {
                 dataLine.number = info.matchLinesNumbers[subIdx];
+                dataLine.move   = info.matchMovesNumbers[subIdx];
+            }
             if (static_cast<int>(info.matchLines.size()) > subIdx)
                 dataLine.text = info.matchLines[subIdx];
             data.lines.push_back(dataLine);
@@ -4233,7 +4235,6 @@ void CSearchDlg::SearchFile(CSearchInfo sInfo, const std::wstring& searchRoot, b
                 {
                     if (!bLoadResult && (type != CTextFile::Binary) && !m_bNotSearch)
                     {
-                        linePositions.clear();
                         // open the file and set up a vector of all lines
                         CAutoFile hFile;
                         int       retryCounter = 0;
@@ -4247,9 +4248,10 @@ void CSearchDlg::SearchFile(CSearchInfo sInfo, const std::wstring& searchRoot, b
                         } while (!hFile && retryCounter < 5);
                         if (hFile)
                         {
-                            auto   fBuf      = std::make_unique<char[]>(4096);
-                            DWORD  bytesRead = 0;
-                            size_t pos       = 0;
+                            std::map<size_t, DWORD> linePositions;
+                            auto                    fBuf         = std::make_unique<char[]>(4096);
+                            DWORD                   bytesRead    = 0;
+                            size_t                  pos          = 0;
                             while (ReadFile(hFile, fBuf.get(), 4096, &bytesRead, nullptr))
                             {
                                 if (bytesRead == 0)

src/ShellContextMenu.cpp

@@ -342,6 +342,8 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
                             wchar_t buf[40] = {0};
                             swprintf_s(buf, L"%ld", it2->number);
                             SearchReplace(cmd, L"%line%", buf);
+                            swprintf_s(buf, L"%ld", it2->move);
+                            SearchReplace(cmd, L"%move%", buf);
 
                             STARTUPINFO         startupInfo;
                             PROCESS_INFORMATION processInfo;
@@ -365,9 +367,14 @@ UINT CShellContextMenu::ShowContextMenu(HWND hWnd, POINT pt)
                             wchar_t buf[40] = {0};
                             swprintf_s(buf, L"%ld", it->matchLinesNumbers[0]);
                             SearchReplace(cmd, L"%line%", buf);
+                            swprintf_s(buf, L"%ld", it->matchMovesNumbers[0]);
+                            SearchReplace(cmd, L"%move%", buf);
                         }
                         else
+                        {
                             SearchReplace(cmd, L"%line%", L"0");
+                            SearchReplace(cmd, L"%move%", L"0");
+                        }
 
                         STARTUPINFO         startupInfo;
                         PROCESS_INFORMATION processInfo;