From d265e44209f120b0c4804aef6b3f3ce047a01ddf Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Mon, 18 Nov 2024 10:55:44 -0800
Subject: [PATCH]  Don't treat absence of a file on fs as conflict for new
 files from CLI (#20828)

Closes #20827

Release Notes:

- Fixes bug where save for new files created via CLI would report a
conflict and ask about overwriting.
---
 crates/language/src/buffer.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 571e444d7c..d1a01c26e6 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -1775,11 +1775,12 @@ impl Buffer {
             return false;
         };
         match file.disk_state() {
-            DiskState::New | DiskState::Deleted => true,
+            DiskState::New => false,
             DiskState::Present { mtime } => match self.saved_mtime {
                 Some(saved_mtime) => mtime > saved_mtime && self.has_unsaved_edits(),
                 None => true,
             },
+            DiskState::Deleted => true,
         }
     }