fix: canonicalize paths (lapce#1469)

taraio · Oct 10, 2022 · c880b15 · c880b15
1 parent 5e507aa
commit c880b15
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lapce-proxy/src/lib.rs b/lapce-proxy/src/lib.rs
@@ -67,7 +67,11 @@ pub fn mainloop() {
     let cli = Cli::parse();
     if !cli.proxy {
         let pwd = std::env::current_dir().unwrap_or_default();
-        let paths: Vec<_> = cli.paths.iter().map(|p| pwd.join(p)).collect();
+        let paths: Vec<_> = cli
+            .paths
+            .iter()
+            .map(|p| pwd.join(p).canonicalize().unwrap_or_default())
+            .collect();
         let _ = try_open_in_existing_process(&paths);
         return;
     }

diff --git a/lapce-ui/src/app.rs b/lapce-ui/src/app.rs
@@ -41,7 +41,11 @@ pub fn build_window(data: &mut LapceWindowData) -> impl Widget<LapceData> {
 pub fn launch() {
     let cli = Cli::parse();
     let pwd = std::env::current_dir().unwrap_or_default();
-    let paths: Vec<PathBuf> = cli.paths.iter().map(|p| pwd.join(p)).collect();
+    let paths: Vec<PathBuf> = cli
+        .paths
+        .iter()
+        .map(|p| pwd.join(p).canonicalize().unwrap_or_default())
+        .collect();
     if !cli.new && LapceData::try_open_in_existing_process(&paths).is_ok() {
         return;
     }