From 5c3f01fea26d80fd3d3a6b3afa94d48abc0c0c6d Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Sun, 17 Aug 2014 15:19:04 +0100
Subject: [PATCH] Add exception reporting in filter mode

---
 src/main.cc | 52 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/main.cc b/src/main.cc
index 3ef17912..36ec7980 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -397,31 +397,45 @@ int run_filter(StringView keystr, memoryview<StringView> files)
     register_env_vars();
     register_registers();
 
-    auto keys = parse_keys(keystr);
-
-    for (auto& file : files)
+    try
     {
-        Buffer* buffer = create_buffer_from_file(file);
-        InputHandler input_handler{{ *buffer, Selection{} }};
+        auto keys = parse_keys(keystr);
 
-        for (auto& key : keys)
-            input_handler.handle_key(key);
+        auto apply_keys_to_buffer = [&](Buffer& buffer)
+        {
+            try
+            {
+                InputHandler input_handler{{ buffer, Selection{} }};
 
-        write_buffer_to_file(*buffer, file + ".kak-out");
+                for (auto& key : keys)
+                    input_handler.handle_key(key);
+            }
+            catch (Kakoune::runtime_error& err)
+            {
+                fprintf(stderr, "error while applying keys to buffer '%s': %s\n",
+                        buffer.display_name().c_str(), err.what());
+            }
+        };
 
-        buffer_manager.delete_buffer(*buffer);
+        for (auto& file : files)
+        {
+            Buffer* buffer = create_buffer_from_file(file);
+            apply_keys_to_buffer(*buffer);
+            write_buffer_to_file(*buffer, file + ".kak-out");
+            buffer_manager.delete_buffer(*buffer);
+        }
+        if (not isatty(0))
+        {
+            Buffer* buffer = create_buffer_from_data(read_fd(0), "*stdin*",
+                                                     Buffer::Flags::None);
+            apply_keys_to_buffer(*buffer);
+            write_buffer_to_fd(*buffer, 1);
+            buffer_manager.delete_buffer(*buffer);
+        }
     }
-    if (not isatty(0))
+    catch (Kakoune::runtime_error& err)
     {
-        Buffer* buffer = create_buffer_from_data(read_fd(0), "*stdin*", Buffer::Flags::None);
-        InputHandler input_handler{{ *buffer, Selection{} }};
-
-        for (auto& key : keys)
-            input_handler.handle_key(key);
-
-        write_buffer_to_fd(*buffer, 1);
-
-        buffer_manager.delete_buffer(*buffer);
+        fprintf(stderr, "error: %s\n", err.what());
     }
 
     buffer_manager.clear_buffer_trash();