diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
| commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
| tree | a1a796b056909dd0a04ffec163db9363a8757808 /src/lnav_util.cc | |
| parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
| download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip | |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/lnav_util.cc')
| -rw-r--r-- | src/lnav_util.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lnav_util.cc b/src/lnav_util.cc index e5540d9..97ccd03 100644 --- a/src/lnav_util.cc +++ b/src/lnav_util.cc @@ -150,7 +150,8 @@ to_json(yajlpp_gen& gen, const attr_line_t& al) }, [&](const bookmark_metadata* bm) { elem_map.gen(""); }, [&](const timespec& ts) { elem_map.gen(""); }, - [&](const string_fragment& sf) { elem_map.gen(sf); }); + [&](const string_fragment& sf) { elem_map.gen(sf); }, + [&](const block_elem_t& be) { elem_map.gen(""); }); } } } @@ -215,6 +216,14 @@ to_json(const lnav::console::user_message& um) to_json(gen, snip.s_content); } } + root_map.gen("notes"); + { + yajlpp_array notes_array(gen); + + for (const auto& note : um.um_notes) { + to_json(gen, note); + } + } root_map.gen("help"); to_json(gen, um.um_help); } @@ -317,6 +326,9 @@ static const typed_json_path_container<console::user_message> yajlpp::property_handler("snippets#") .for_field(&console::user_message::um_snippets) .with_children(snippet_handlers), + yajlpp::property_handler("notes#") + .for_field(&console::user_message::um_notes) + .with_children(attr_line_handlers), yajlpp::property_handler("help") .for_child(&console::user_message::um_help) .with_children(attr_line_handlers), |