Preserve existing behavior when editor is empty but make the message more clear

jrnl/controller.py

@@ -311,7 +311,14 @@ def _edit_search_results(
     other_entries = _other_entries(journal, old_entries)
 
     # Send user to the editor
-    edited = get_text_from_editor(config, journal.editable_str())
+    try:
+        edited = get_text_from_editor(config, journal.editable_str())
+    except JrnlException as e:
+        if e.has_message_text(MsgText.NoTextReceived):
+            raise JrnlException(Message(MsgText.NoEditsReceivedJournalNotDeleted, MsgStyle.WARNING))
+        else:
+            raise e
+
     journal.parse_editable_str(edited)
 
     # Put back entries we separated earlier, sort, and write the journal

jrnl/editor.py

@@ -44,6 +44,9 @@ def get_text_from_editor(config: dict, template: str = "") -> str:
         raw = f.read()
     os.remove(tmpfile)
 
+    if not raw:
+        raise JrnlException(Message(MsgText.NoTextReceived, MsgStyle.NORMAL))
+
     return raw
 
 

jrnl/exception.py

@@ -7,6 +7,7 @@ from jrnl.output import print_msg
 
 if TYPE_CHECKING:
     from jrnl.messages import Message
+    from jrnl.messages import MsgText
 
 
 class JrnlException(Exception):
@@ -18,3 +19,6 @@ class JrnlException(Exception):
     def print(self) -> None:
         for msg in self.messages:
             print_msg(msg)
+    
+    def has_message_text(self, message_text: "MsgText"):
+        return any([m.text == message_text for m in self.messages])

jrnl/messages/MsgText.py

@@ -151,6 +151,14 @@ class MsgText(Enum):
             https://jrnl.sh/en/stable/external-editors/
         """
 
+    NoEditsReceivedJournalNotDeleted = """
+        No text received from editor. Were you trying to delete all the entries?
+
+        This seems a bit drastic, so the operation was cancelled.
+
+        To delete all entries, use the --delete option.
+        """
+
     NoEditsReceived = "No edits to save, because nothing was changed"
 
     NoTextReceived = """