restore code_actions_on_format

Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla Maki
<mikayla.c.maki@gmail.com>

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Cole <cole@zed.dev>

Author: 3 people

crates/migrator/src/migrations.rs

@@ -117,3 +117,9 @@ pub(crate) mod m_2025_10_03 {
 
     pub(crate) use settings::SETTINGS_PATTERNS;
 }
+
+pub(crate) mod m_2025_10_16 {
+    mod settings;
+
+    pub(crate) use settings::restore_code_actions_on_format;
+}

crates/migrator/src/migrations/m_2025_10_10/settings.rs

@@ -0,0 +1,63 @@
+use anyhow::Result;
+use serde_json::Value;
+
+use crate::patterns::migrate_language_setting;
+
+pub fn restore_code_actions_on_format(value: &mut Value) -> Result<()> {
+    migrate_language_setting(value, restore_code_actions_on_format_inner)
+}
+
+fn restore_code_actions_on_format_inner(value: &mut Value, path: &[&str]) -> Result<()> {
+    let Some(obj) = value.as_object_mut() else {
+        return Ok(());
+    };
+    let code_actions_on_format = obj
+        .get("code_actions_on_format")
+        .cloned()
+        .unwrap_or_else(|| Value::Object(Default::default()));
+
+    fn fmt_path(path: &[&str], key: &str) -> String {
+        let mut path = path.to_vec();
+        path.push(key);
+        path.join(".")
+    }
+
+    let Some(mut code_actions_map) = code_actions_on_format.as_object().cloned() else {
+        anyhow::bail!(
+            r#"The `code_actions_on_format` is in an invalid state and cannot be migrated at {}. Please ensure the code_actions_on_format setting is a Map<String, bool>"#,
+            fmt_path(path, "code_actions_on_format"),
+        );
+    };
+
+    let Some(formatter) = obj.get("formatter") else {
+        return Ok(());
+    };
+    let formatter_array = if let Some(array) = formatter.as_array() {
+        array.clone()
+    } else {
+        vec![formatter.clone()]
+    };
+    let mut code_action_formatters = Vec::new();
+    for formatter in formatter_array {
+        let Some(code_action) = formatter.get("code_action") else {
+            return Ok(());
+        };
+        let Some(code_action_name) = code_action.as_str() else {
+            anyhow::bail!(
+                r#"The `code_action` is in an invalid state and cannot be migrated at {}. Please ensure the code_action setting is a String"#,
+                fmt_path(path, "formatter"),
+            );
+        };
+        code_action_formatters.push(code_action_name.to_string());
+    }
+
+    code_actions_map.extend(code_action_formatters.into_iter().rev().map(|code_action| (code_action, Value::Bool(true))));
+
+    obj.remove("formatter");
+    obj.insert(
+        "code_actions_on_format".into(),
+        Value::Object(code_actions_map),
+    );
+
+    Ok(())
+}

crates/migrator/src/migrations/m_2025_10_16/settings.rs

@@ -211,6 +211,7 @@ pub fn migrate_settings(text: &str) -> Result<Option<String>> {
             migrations::m_2025_10_03::SETTINGS_PATTERNS,
             &SETTINGS_QUERY_2025_10_03,
         ),
+        MigrationType::Json(migrations::m_2025_10_16::restore_code_actions_on_format),
     ];
     run_migrations(text, migrations)
 }
@@ -361,6 +362,7 @@ mod tests {
         pretty_assertions::assert_eq!(migrated.as_deref(), output);
     }
 
+    #[track_caller]
     fn assert_migrate_settings(input: &str, output: Option<&str>) {
         let migrated = migrate_settings(input).unwrap();
         assert_migrated_correctly(migrated, output);
@@ -1336,7 +1338,10 @@ mod tests {
 
     #[test]
     fn test_flatten_code_action_formatters_basic_array() {
-        assert_migrate_settings(
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_01::flatten_code_actions_formatters,
+            )],
             &r#"{
         "formatter": [
           {
@@ -1367,7 +1372,10 @@ mod tests {
 
     #[test]
     fn test_flatten_code_action_formatters_basic_object() {
-        assert_migrate_settings(
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_01::flatten_code_actions_formatters,
+            )],
             &r#"{
         "formatter": {
           "code_actions": {
@@ -1521,7 +1529,10 @@ mod tests {
     #[test]
     fn test_flatten_code_action_formatters_array_with_multiple_action_blocks_in_defaults_and_multiple_languages()
      {
-        assert_migrate_settings(
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_01::flatten_code_actions_formatters,
+            )],
             &r#"{
         "formatter": {
           "code_actions": {
@@ -1987,4 +1998,96 @@ mod tests {
             None,
         );
     }
+
+    #[test]
+    fn test_restore_code_actions_on_format() {
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_16::restore_code_actions_on_format,
+            )],
+            &r#"{
+                "formatter": {
+                    "code_action": "foo"
+                }
+            }"#
+            .unindent(),
+            Some(
+                &r#"{
+                    "code_actions_on_format": {
+                        "foo": true
+                    }
+                }
+                "#
+                .unindent(),
+            ),
+        );
+
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_16::restore_code_actions_on_format,
+            )],
+            &r#"{
+                "formatter": [
+                    { "code_action": "foo" },
+                    "auto"
+                ]
+            }"#
+            .unindent(),
+            None,
+        );
+
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_16::restore_code_actions_on_format,
+            )],
+            &r#"{
+                "formatter": {
+                    "code_action": "foo"
+                },
+                "code_actions_on_format": {
+                    "bar": true,
+                    "baz": false
+                }
+            }"#
+            .unindent(),
+            Some(
+                &r#"{
+                    "code_actions_on_format": {
+                        "foo": true,
+                        "bar": true,
+                        "baz": false
+                    }
+                }"#
+                .unindent(),
+            ),
+        );
+
+        assert_migrate_settings_with_migrations(
+            &[MigrationType::Json(
+                migrations::m_2025_10_16::restore_code_actions_on_format,
+            )],
+            &r#"{
+                "formatter": [
+                    { "code_action": "foo" },
+                    { "code_action": "qux" },
+                ],
+                "code_actions_on_format": {
+                    "bar": true,
+                    "baz": false
+                }
+            }"#
+            .unindent(),
+            Some(
+                &r#"{
+                    "code_actions_on_format": {
+                        "foo": true,
+                        "qux": true,
+                        "bar": true,
+                        "baz": false
+                    }
+                }"#
+                .unindent(),
+            ),
+        );
+    }
 }