Merge branch 'main' into stream-git-statuses

crates/rpc/proto/zed.proto

@@ -132,6 +132,8 @@ message Envelope {
 
         OnTypeFormatting on_type_formatting = 111;
         OnTypeFormattingResponse on_type_formatting_response = 112;
+
+        UpdateWorktreeSettings update_worktree_settings = 113;
     }
 }
 
@@ -339,6 +341,13 @@ message UpdateWorktree {
     string abs_path = 10;
 }
 
+message UpdateWorktreeSettings {
+    uint64 project_id = 1;
+    uint64 worktree_id = 2;
+    string path = 3;
+    optional string content = 4;
+}
+
 message CreateProjectEntry {
     uint64 project_id = 1;
     uint64 worktree_id = 2;
@@ -467,7 +476,7 @@ message Symbol {
     string name = 4;
     int32 kind = 5;
     string path = 6;
-    // Cannot use generate anchors for unopend files,
+    // Cannot use generate anchors for unopened files,
     // so we are forced to use point coords instead
     PointUtf16 start = 7;
     PointUtf16 end = 8;

crates/rpc/src/auth.rs

@@ -42,7 +42,7 @@ impl PublicKey {
 }
 
 impl PrivateKey {
-    /// Decrypt a base64-encoded string that was encrypted by the correspoding public key.
+    /// Decrypt a base64-encoded string that was encrypted by the corresponding public key.
     pub fn decrypt_string(&self, encrypted_string: &str) -> Result<String> {
         let encrypted_bytes = base64::decode_config(encrypted_string, base64::URL_SAFE)
             .context("failed to base64-decode encrypted string")?;

crates/rpc/src/proto.rs

@@ -236,6 +236,7 @@ messages!(
     (UpdateProject, Foreground),
     (UpdateProjectCollaborator, Foreground),
     (UpdateWorktree, Foreground),
+    (UpdateWorktreeSettings, Foreground),
     (UpdateDiffBase, Foreground),
     (GetPrivateUserInfo, Foreground),
     (GetPrivateUserInfoResponse, Foreground),
@@ -345,6 +346,7 @@ entity_messages!(
     UpdateProject,
     UpdateProjectCollaborator,
     UpdateWorktree,
+    UpdateWorktreeSettings,
     UpdateDiffBase
 );