Don't treat absence of a file on fs as conflict for new files from CLI (#20828)

Michael Sloan created 1 year ago

Closes #20827

Release Notes:

- Fixes bug where save for new files created via CLI would report a
conflict and ask about overwriting.

Change summary

crates/language/src/buffer.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

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,
         }
     }