@@ -266,11 +266,15 @@ fn spawn_deferred_delete(trash_path: &std::path::Path) -> std::io::Result<std::p
266266/// Check if file content contains Vite+ sourcing lines.
267267fn is_vite_plus_source_line ( line : & str ) -> bool {
268268 let trimmed = line. trim_start ( ) ;
269- ( trimmed. starts_with ( ". " ) || trimmed. starts_with ( "source " ) )
270- && [ "env" , "env.fish" , "env.nu" ] . iter ( ) . any ( |env_file| {
271- trimmed. contains ( & format ! ( ".vite-plus/{env_file}\" " ) )
272- || trimmed. contains ( & format ! ( ".vite-plus\\ {env_file}\" " ) )
273- } )
269+ [
270+ ( ". " , ".vite-plus/env\" " ) ,
271+ ( "source " , ".vite-plus/env\" " ) ,
272+ ( "source " , ".vite-plus/env.fish\" " ) ,
273+ ( "source " , ".vite-plus/env.nu'" ) ,
274+ ( "source " , ".vite-plus\\ env.nu'" ) ,
275+ ]
276+ . iter ( )
277+ . any ( |( prefix, suffix) | trimmed. starts_with ( prefix) && trimmed. contains ( suffix) )
274278}
275279
276280/// Remove Vite+ lines from content, returning the cleaned string.
@@ -369,14 +373,14 @@ mod tests {
369373
370374 #[ test]
371375 fn test_remove_vite_plus_lines_nushell ( ) {
372- let content = "# existing config\n \n # Vite+ bin (https://viteplus.dev)\n source \" ~/.vite-plus/env.nu\" \n " ;
376+ let content = "# existing config\n \n # Vite+ bin (https://viteplus.dev)\n source ' ~/.vite-plus/env.nu' \n " ;
373377 let result = remove_vite_plus_lines ( content) ;
374378 assert_eq ! ( & * result, "# existing config\n " ) ;
375379 }
376380
377381 #[ test]
378382 fn test_remove_vite_plus_lines_nushell_windows_path ( ) {
379- let content = "# existing config\n source \" ~\\ .vite-plus\\ env.nu\" \n " ;
383+ let content = "# existing config\n source ' ~\\ .vite-plus\\ env.nu' \n " ;
380384 let result = remove_vite_plus_lines ( content) ;
381385 assert_eq ! ( & * result, "# existing config\n " ) ;
382386 }
@@ -591,8 +595,7 @@ mod tests {
591595 std:: fs:: create_dir_all ( & home) . unwrap ( ) ;
592596 std:: fs:: create_dir_all ( & nushell_dir) . unwrap ( ) ;
593597
594- std:: fs:: write ( nushell_dir. join ( "vite-plus.nu" ) , "source \" ~/.vite-plus/env.nu\" \n " )
595- . unwrap ( ) ;
598+ std:: fs:: write ( nushell_dir. join ( "vite-plus.nu" ) , "source '~/.vite-plus/env.nu'\n " ) . unwrap ( ) ;
596599
597600 let _guard = ProfileEnvGuard :: new ( None , None , Some ( & xdg_data) ) ;
598601
0 commit comments