From 62db3fa63f4fcd1aaa9611c7d8fe4bcc4530e178 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 13 Mar 2023 11:54:46 -0700
Subject: [PATCH] Merge pull request #2244 from
 zed-industries/less-surprising-defaults

Clean up some default settings
---
 assets/settings/default.json    | 14 --------------
 crates/settings/src/settings.rs |  2 --
 2 files changed, 16 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 90c47478f3..add664f956 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -22,11 +22,6 @@
     "show_completions_on_input": true,
     // Whether the screen sharing icon is showed in the os status bar.
     "show_call_status_icon": true,
-    // Whether new projects should start out 'online'. Online projects
-    // appear in the contacts panel under your name, so that your contacts
-    // can see which projects you are working on. Regardless of this
-    // setting, projects keep their last online status when you reopen them.
-    "projects_online_by_default": true,
     // Whether to use language servers to provide code intelligence.
     "enable_language_server": true,
     // When to automatically save edited buffers. This setting can
@@ -202,12 +197,6 @@
         "Plain Text": {
             "soft_wrap": "preferred_line_length"
         },
-        "C": {
-            "tab_size": 2
-        },
-        "C++": {
-            "tab_size": 2
-        },
         "Elixir": {
             "tab_size": 2
         },
@@ -218,9 +207,6 @@
         "Markdown": {
             "soft_wrap": "preferred_line_length"
         },
-        "Rust": {
-            "tab_size": 4
-        },
         "JavaScript": {
             "tab_size": 2
         },
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 49f43e7a2d..42d0f39823 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -324,8 +324,6 @@ impl Column for DockAnchor {
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct SettingsFileContent {
-    #[serde(default)]
-    pub projects_online_by_default: Option<bool>,
     #[serde(default)]
     pub buffer_font_family: Option<String>,
     #[serde(default)]