Chore: Let's not overdo it on checking if the phpstorm binary exists and then enabling the IDE. We'll use the same pattern the author intended

Author: aolin480

src-tauri/src/shared/settings_core.rs

@@ -3,13 +3,9 @@ use std::path::PathBuf;
 use tokio::sync::Mutex;
 
 use crate::codex::config as codex_config;
-use crate::types::OpenAppTarget;
-use crate::shared::workspaces_core::optional_open_app_targets_core;
 use crate::storage::write_settings;
 use crate::types::AppSettings;
 
-const OPTIONAL_OPEN_APP_TARGET_IDS: &[&str] = &["phpstorm"];
-
 fn normalize_personality(value: &str) -> Option<&'static str> {
     match value.trim() {
         "friendly" => Some("friendly"),
@@ -40,7 +36,6 @@ pub(crate) async fn get_app_settings_core(app_settings: &Mutex<AppSettings>) ->
             .unwrap_or("friendly")
             .to_string();
     }
-    inject_optional_open_app_targets(&mut settings);
     settings
 }
 
@@ -57,9 +52,7 @@ pub(crate) async fn update_app_settings_core(
     write_settings(settings_path, &settings)?;
     let mut current = app_settings.lock().await;
     *current = settings.clone();
-    let mut response = settings;
-    inject_optional_open_app_targets(&mut response);
-    Ok(response)
+    Ok(settings)
 }
 
 pub(crate) fn get_codex_config_path_core() -> Result<String, String> {
@@ -71,50 +64,3 @@ pub(crate) fn get_codex_config_path_core() -> Result<String, String> {
                 .ok_or_else(|| "Unable to resolve CODEX_HOME".to_string())
         })
 }
-
-fn inject_optional_open_app_targets(settings: &mut AppSettings) {
-    let optional_targets = optional_open_app_targets_core();
-    let mut available_optional_targets_by_id = optional_targets
-        .into_iter()
-        .map(|target| (target.id.clone(), target))
-        .collect::<std::collections::HashMap<String, OpenAppTarget>>();
-    let mut existing_targets = std::mem::take(&mut settings.open_app_targets);
-    existing_targets.retain(|target| {
-        !OPTIONAL_OPEN_APP_TARGET_IDS.contains(&target.id.as_str())
-            || available_optional_targets_by_id.contains_key(&target.id)
-    });
-
-    let mut merged_targets =
-        Vec::with_capacity(existing_targets.len() + available_optional_targets_by_id.len());
-    let mut inserted_optional = false;
-
-    for target in existing_targets {
-        if OPTIONAL_OPEN_APP_TARGET_IDS.contains(&target.id.as_str()) {
-            available_optional_targets_by_id.remove(&target.id);
-        }
-        if !inserted_optional && target.kind == "finder" {
-            merged_targets.extend(available_optional_targets_by_id.into_values());
-            available_optional_targets_by_id = std::collections::HashMap::new();
-            inserted_optional = true;
-        }
-        merged_targets.push(target);
-    }
-
-    if !inserted_optional {
-        merged_targets.extend(available_optional_targets_by_id.into_values());
-    }
-
-    settings.open_app_targets = merged_targets;
-
-    if !settings
-        .open_app_targets
-        .iter()
-        .any(|target| target.id == settings.selected_open_app_id)
-    {
-        settings.selected_open_app_id = settings
-            .open_app_targets
-            .first()
-            .map(|target| target.id.clone())
-            .unwrap_or_default();
-    }
-}

src-tauri/src/shared/workspaces_core.rs

@@ -15,7 +15,7 @@ pub(crate) use git_orchestration::{apply_worktree_changes_core, run_git_command_
 pub(crate) use helpers::{is_workspace_path_dir_core, list_workspaces_core};
 pub(crate) use io::{
     get_open_app_icon_core, list_workspace_files_core, open_workspace_in_core,
-    optional_open_app_targets_core, read_workspace_file_core,
+    read_workspace_file_core,
 };
 pub(crate) use runtime_codex_args::{
     set_workspace_runtime_codex_args_core, WorkspaceRuntimeCodexArgsResult,

src-tauri/src/shared/workspaces_core/io.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::env;
 use std::path::{Path, PathBuf};
 
@@ -107,76 +106,6 @@ fn normalize_app_identifier(app: &str) -> String {
         .join(" ")
 }
 
-fn find_executable_in_path(program: &str) -> Option<PathBuf> {
-    let trimmed = program.trim();
-    if trimmed.is_empty() {
-        return None;
-    }
-
-    let path = PathBuf::from(trimmed);
-    if path.is_file() {
-        return Some(path);
-    }
-
-    let path_var = env::var_os("PATH")?;
-    for dir in env::split_paths(&path_var) {
-        let candidate = dir.join(trimmed);
-        if candidate.is_file() {
-            return Some(candidate);
-        }
-    }
-
-    None
-}
-
-#[cfg(target_os = "windows")]
-fn first_available_command(candidates: &[&str]) -> Option<String> {
-    candidates
-        .iter()
-        .copied()
-        .find(|candidate| resolve_windows_executable(candidate, None).is_some())
-        .map(str::to_string)
-}
-
-#[cfg(not(target_os = "windows"))]
-fn first_available_command(candidates: &[&str]) -> Option<String> {
-    candidates
-        .iter()
-        .copied()
-        .find(|candidate| find_executable_in_path(candidate).is_some())
-        .map(str::to_string)
-}
-
-#[cfg(target_os = "windows")]
-fn phpstorm_command_candidates() -> &'static [&'static str] {
-    &["phpstorm64.exe", "phpstorm.bat", "phpstorm"]
-}
-
-#[cfg(target_os = "macos")]
-fn phpstorm_command_candidates() -> &'static [&'static str] {
-    &["phpstorm"]
-}
-
-#[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
-fn phpstorm_command_candidates() -> &'static [&'static str] {
-    &["phpstorm", "phpstorm.sh"]
-}
-
-pub(crate) fn optional_open_app_targets_core() -> Vec<OpenAppTarget> {
-    let Some(command) = first_available_command(phpstorm_command_candidates()) else {
-        return Vec::new();
-    };
-
-    vec![OpenAppTarget {
-        id: "phpstorm".to_string(),
-        label: "PHPStorm".to_string(),
-        kind: "command".to_string(),
-        app_name: None,
-        command: Some(command),
-        args: Vec::new(),
-    }]
-}
-
 fn build_launch_args(
     path: &str,
     args: &[String],
@@ -300,8 +229,7 @@ pub(crate) async fn open_workspace_in_core(
             if let (Some(strategy), Some(cli_program)) = (
                 app_strategy,
                 normalize_open_location(line, column)
-                    .and_then(|_| app_cli_command(trimmed))
-                    .and_then(find_executable_in_path),
+                    .and_then(|_| app_cli_command(trimmed)),
             ) {
                 let launch_args = build_launch_args(&path, &args, line, column, Some(strategy));
                 let mut cmd = tokio_command(cli_program);

src-tauri/src/types.rs

@@ -1043,6 +1043,14 @@ fn default_open_app_targets() -> Vec<OpenAppTarget> {
                 command: None,
                 args: Vec::new(),
             },
+            OpenAppTarget {
+                id: "phpstorm".to_string(),
+                label: "PHPStorm".to_string(),
+                kind: "command".to_string(),
+                app_name: None,
+                command: Some("phpstorm".to_string()),
+                args: Vec::new(),
+            },
             OpenAppTarget {
                 id: "finder".to_string(),
                 label: "Finder".to_string(),
@@ -1101,6 +1109,14 @@ fn default_open_app_targets() -> Vec<OpenAppTarget> {
             command: Some("antigravity".to_string()),
             args: Vec::new(),
         },
+        OpenAppTarget {
+            id: "phpstorm".to_string(),
+            label: "PHPStorm".to_string(),
+            kind: "command".to_string(),
+            app_name: None,
+            command: Some("phpstorm".to_string()),
+            args: Vec::new(),
+        },
         OpenAppTarget {
             id: "finder".to_string(),
             label: file_manager_label.to_string(),
@@ -1364,7 +1380,7 @@ mod tests {
             "vscode"
         };
         assert_eq!(settings.selected_open_app_id, expected_open_id);
-        assert_eq!(settings.open_app_targets.len(), 6);
+        assert_eq!(settings.open_app_targets.len(), 7);
         assert_eq!(settings.open_app_targets[0].id, "vscode");
     }