Add support for specifying line number when opening a file in single …

…instance mode (#3384)
eranif · Jun 1, 2024 · c2ea981 · c2ea981
1 parent 341bd2e
commit c2ea981
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
@@ -842,6 +842,11 @@ bool CodeLiteApp::IsSingleInstance(const wxCmdLineParser& m_parser)
 
                 JSON json(cJSON_Object);
                 json.toElement().addProperty("args", files);
+
+                long lineNumber(0);
+                m_parser.Found(wxT("l"), &lineNumber);
+                json.toElement().addProperty("lineno", lineNumber);
+
                 client.WriteMessage(json.toElement().format());
                 return false;
 

diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
@@ -3954,7 +3954,13 @@ void clMainFrame::OnSingleInstanceOpenFiles(clCommandEvent& e)
             OnSwitchWorkspace(workspaceEvent);
 
         } else {
-            GetMainBook()->OpenFile(files.Item(i), wxEmptyString);
+            long lineNumber = e.GetLineNumber();
+            if (lineNumber > 0) {
+                lineNumber--;
+            } else {
+                lineNumber = 0;
+            }
+            GetMainBook()->OpenFile(files.Item(i), wxEmptyString, lineNumber);
         }
     }
 

diff --git a/LiteEditor/singleinstancethreadjob.cpp b/LiteEditor/singleinstancethreadjob.cpp
@@ -71,6 +71,8 @@ void* clSingleInstanceThread::Entry()
             } else {
                 clCommandEvent event(wxEVT_CMD_SINGLE_INSTANCE_THREAD_OPEN_FILES);
                 event.SetStrings(args);
+                long lineno = root.toElement().namedObject("lineno").toInt();
+                event.SetLineNumber(lineno);
                 EventNotifier::Get()->AddPendingEvent(event);
             }
         }