[TEXT] add bookmarks for stderr lines

Author: tstack

NEWS.md

@@ -327,6 +327,8 @@ Bug Fixes:
   passed on the command-line.
 * Marks in the TEXT view are now stable after filtering
   is applied.
+* Error bookmarks are now added for stderr content when
+  executing a command in the shell using `-e` or `:sh`.
 
 Internal:
 * Added operation IDs (OpIDs) to lnav's internal logging

src/textfile_sub_source.cc

@@ -520,6 +520,31 @@ textfile_sub_source::text_update_marks(vis_bookmarks& bm)
             }
         }
     }
+
+    if (lf->has_line_metadata()) {
+        auto& bm_errors = bm[&textview_curses::BM_ERRORS];
+        auto& bm_warnings = bm[&textview_curses::BM_WARNINGS];
+
+        bm_errors.clear();
+        bm_warnings.clear();
+
+        auto& tfs = lfo->lfo_filter_state.tfs_index;
+        for (uint32_t vl = 0; vl < tfs.size(); ++vl) {
+            auto ll = lf->begin() + tfs[vl];
+            switch (ll->get_msg_level()) {
+                case log_level_t::LEVEL_FATAL:
+                case log_level_t::LEVEL_CRITICAL:
+                case log_level_t::LEVEL_ERROR:
+                    bm_errors.insert_once(vis_line_t(vl));
+                    break;
+                case log_level_t::LEVEL_WARNING:
+                    bm_warnings.insert_once(vis_line_t(vl));
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
 }
 
 void

test/expected/Makefile.am

@@ -1774,6 +1774,8 @@ dist_noinst_DATA = \
     test_text_file.sh_ac872aadda29b9a824361a2c711d62ec1c75d40f.out \
     test_text_file.sh_b0945bb63076f4d84fe01c9863557a1f935fcb13.err \
     test_text_file.sh_b0945bb63076f4d84fe01c9863557a1f935fcb13.out \
+    test_text_file.sh_b166346955b5ad775836204f6eba79802a57f73c.err \
+    test_text_file.sh_b166346955b5ad775836204f6eba79802a57f73c.out \
     test_text_file.sh_b2cf922c24f5ef2e99b85f49560b5b0b3e210c46.err \
     test_text_file.sh_b2cf922c24f5ef2e99b85f49560b5b0b3e210c46.out \
     test_text_file.sh_b35e7066a419e46f57a6c93a593dae2c8988af49.err \

test/expected/test_text_file.sh_b166346955b5ad775836204f6eba79802a57f73c.err

@@ -0,0 +1,2 @@
+error: something went wrong
+warning: be careful

test/expected/test_text_file.sh_b166346955b5ad775836204f6eba79802a57f73c.out

@@ -218,6 +218,11 @@ run_cap_test ${lnav_test} -n \
 
 run_cap_test ${lnav_test} -n ${test_dir}/textfile_ctrl.0
 
+# Test that error/warning bookmarks are set for piper text files
+run_cap_test ${lnav_test} -n \
+    -e "bash ${test_dir}/textfile_stderr_levels.sh" \
+    -c ':goto 0' \
+    -c ':next-mark error'
 
 #####
 

test/test_text_file.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "info message one"
+echo "info message two"
+echo "error: something went wrong" >&2
+echo "warning: be careful" >&2