[styling] add object-key style config

Related to #1510

Author: tstack

docs/schemas/config-v1.schema.json

@@ -709,6 +709,11 @@
                                             "title": "/ui/theme-defs/<theme_name>/syntax-styles/code-border",
                                             "$ref": "#/definitions/style"
                                         },
+                                        "object-key": {
+                                            "description": "Styling for a key in an object",
+                                            "title": "/ui/theme-defs/<theme_name>/syntax-styles/object-key",
+                                            "$ref": "#/definitions/style"
+                                        },
                                         "keyword": {
                                             "description": "Styling for keywords in source files",
                                             "title": "/ui/theme-defs/<theme_name>/syntax-styles/keyword",

docs/source/intro.rst

@@ -101,6 +101,7 @@ The builtin themes are:
 `dracula <https://github.com/tstack/lnav/blob/master/src/themes/dracula.json>`_,
 `eldar <https://github.com/tstack/lnav/blob/master/src/themes/eldar.json>`_,
 `grayscale <https://github.com/tstack/lnav/blob/master/src/themes/grayscale.json>`_,
+`modus-operandi <https://github.com/tstack/lnav/blob/master/src/themes/modus-operandi.json>`_,
 `monocai <https://github.com/tstack/lnav/blob/master/src/themes/monocai.json>`_,
 `night-owl <https://github.com/tstack/lnav/blob/master/src/themes/night-owl.json>`_,
 `solarized-dark <https://github.com/tstack/lnav/blob/master/src/themes/solarized-dark.json>`_,

src/base/string_attr_type.hh

@@ -172,6 +172,8 @@ enum class role_t : int32_t {
     VCR_SELECTED_TEXT,
     VCR_FUZZY_MATCH,
 
+    VCR_OBJECT_KEY,
+
     VCR__MAX
 };
 

src/lnav_config.cc

@@ -943,6 +943,10 @@ static const struct json_path_container theme_syntax_styles_handlers = {
         .with_description("Styling for quoted-code borders")
         .for_child(&lnav_theme::lt_style_code_border)
         .with_children(style_config_handlers),
+    yajlpp::property_handler("object-key")
+        .with_description("Styling for a key in an object")
+        .for_child(&lnav_theme::lt_style_object_key)
+        .with_children(style_config_handlers),
     yajlpp::property_handler("keyword")
         .with_description("Styling for keywords in source files")
         .for_child(&lnav_theme::lt_style_keyword)

src/log_format_impls.cc

@@ -2136,12 +2136,15 @@ class logfmt_format : public log_format {
                     auto value_lr
                         = line_range{value_frag.sf_begin, value_frag.sf_end};
 
+                    auto known_field = false;
                     if (kvp.first.is_one_of(
                             "timestamp"_frag, "time"_frag, "ts"_frag, "t"_frag))
                     {
                         sa.emplace_back(value_lr, L_TIMESTAMP.value());
+                        known_field = true;
                     } else if (kvp.first.is_one_of("level"_frag, "lvl"_frag)) {
                         sa.emplace_back(value_lr, L_LEVEL.value());
+                        known_field = true;
                     } else if (kvp.first.is_one_of("msg"_frag, "message"_frag))
                     {
                         sa.emplace_back(value_lr, SA_BODY.value());
@@ -2162,7 +2165,15 @@ class logfmt_format : public log_format {
                                   .with_struct_name(FIELDS_NAME);
                         values.lvv_values.emplace_back(lvm, value_frag);
                     }
-
+                    if (known_field) {
+                        auto key_with_eq = kvp.first;
+                        key_with_eq.sf_end += 1;
+                        sa.emplace_back(to_line_range(key_with_eq),
+                                        SA_REPLACED.value());
+                    } else {
+                        sa.emplace_back(to_line_range(kvp.first),
+                                        VC_ROLE.value(role_t::VCR_OBJECT_KEY));
+                    }
                     return false;
                 },
                 [line_number, &sbr](const logfmt::parser::error& err) {

src/styling.hh

@@ -135,6 +135,7 @@ struct lnav_theme {
     positioned_property<style_config> lt_style_inline_code;
     positioned_property<style_config> lt_style_quoted_code;
     positioned_property<style_config> lt_style_code_border;
+    positioned_property<style_config> lt_style_object_key;
     positioned_property<style_config> lt_style_keyword;
     positioned_property<style_config> lt_style_string;
     positioned_property<style_config> lt_style_comment;

src/themes/default-theme.json

@@ -205,6 +205,9 @@
                     "code-border": {
                         "color": "#444"
                     },
+                    "object-key": {
+                        "color": "semantic()"
+                    },
                     "keyword": {
                         "color": "Navy"
                     },

src/themes/dracula.json

@@ -186,6 +186,9 @@
                         "color": "#444",
                         "background-color": "#121212"
                     },
+                    "object-key": {
+                        "color": "semantic()"
+                    },
                     "keyword": {
                         "color": "$pink",
                         "bold": true

src/themes/eldar.json

@@ -171,6 +171,9 @@
                         "color": "#444",
                         "background-color": "#121212"
                     },
+                    "object-key": {
+                        "color": "semantic()"
+                    },
                     "keyword": {
                         "color": "$yellow"
                     },

src/themes/grayscale.json

@@ -158,6 +158,9 @@
                     }
                 },
                 "syntax-styles": {
+                    "object-key": {
+                        "bold": true
+                    },
                     "comment": {
                         "color": "#888"
                     },