[markdown] add support for github alerts

tstack · May 17, 2024 · 8d8467d · 8d8467d
1 parent 54b391e
commit 8d8467d
Show file tree

Hide file tree

Showing 21 changed files with 1,555 additions and 102 deletions.
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -70,6 +70,7 @@ add_library(
         strnatcmp.h
         time_util.hh
         types.hh
+        wcwidth9.h
 
         ../third-party/xxHash/xxhash.h
         ../third-party/xxHash/xxhash.c

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
@@ -69,7 +69,8 @@ noinst_HEADERS = \
     string_util.hh \
     strnatcmp.h \
     time_util.hh \
-    types.hh
+    types.hh \
+    wcwidth9.h
 
 libbase_a_SOURCES = \
     ansi_scrubber.cc \

diff --git a/src/base/attr_line.cc b/src/base/attr_line.cc
@@ -523,7 +523,7 @@ attr_line_t::erase(size_t pos, size_t len)
 attr_line_t&
 attr_line_t::pad_to(ssize_t size)
 {
-    const auto curr_len = this->utf8_length_or_length();
+    const auto curr_len = this->column_width();
 
     if (curr_len < size) {
         this->append((size - curr_len), ' ');

diff --git a/src/base/intern_string.cc b/src/base/intern_string.cc
@@ -36,6 +36,7 @@
 #include <string.h>
 
 #include "config.h"
+#include "fmt/ostream.h"
 #include "pcrepp/pcre2pp.hh"
 #include "ww898/cp_utf8.hpp"
 #include "xxHash/xxhash.h"
@@ -416,9 +417,14 @@ string_fragment::sub_cell_range(int cell_start, int cell_end) const
                         cell_index += 1;
                     } while (cell_index % 8);
                     break;
-                default:
-                    cell_index += wcwidth(read_res.unwrap());
+                default: {
+                    auto wcw_res = wcwidth(read_res.unwrap());
+                    if (wcw_res < 0) {
+                        wcw_res = 1;
+                    }
+                    cell_index += wcw_res;
                     break;
+                }
             }
         }
     }
@@ -456,9 +462,14 @@ string_fragment::column_width() const
                         retval += 1;
                     } while (retval % 8);
                     break;
-                default:
-                    retval += wcwidth(read_res.unwrap());
+                default: {
+                    auto wcw_res = wcwidth(read_res.unwrap());
+                    if (wcw_res < 0) {
+                        wcw_res = 1;
+                    }
+                    retval += wcw_res;
                     break;
+                }
             }
         }
     }

diff --git a/src/base/intern_string.tests.cc b/src/base/intern_string.tests.cc
@@ -184,3 +184,17 @@ World!)");
         CHECK(all_sf2 == "Hello,\nWorld!");
     }
 }
+
+TEST_CASE("string_fragment::column_width")
+{
+    {
+        const auto sf = string_fragment::from_const("Key(s)\n");
+
+        CHECK(7 == sf.column_width());
+    }
+    {
+        const auto sf = string_fragment::from_const("\u26a0");
+
+        CHECK(1 == sf.column_width());
+    }
+}
diff --git a/src/base/lnav.console.cc b/src/base/lnav.console.cc
@@ -409,7 +409,9 @@ println(FILE* file, const attr_line_t& al)
                         default:
                             break;
                     }
-                } else if (attr.sa_type == &VC_ROLE) {
+                } else if (attr.sa_type == &VC_ROLE
+                           || attr.sa_type == &VC_ROLE_FG)
+                {
                     auto saw = string_attr_wrapper<role_t>(&attr);
                     auto role = saw.get();
 
@@ -441,6 +443,9 @@ println(FILE* file, const attr_line_t& al)
                             line_style |= fmt::emphasis::bold
                                 | fmt::fg(fmt::terminal_color::green);
                             break;
+                        case role_t::VCR_FOOTNOTE_BORDER:
+                            line_style |= fmt::fg(fmt::terminal_color::blue);
+                            break;
                         case role_t::VCR_INFO:
                         case role_t::VCR_STATUS:
                             line_style |= fmt::emphasis::bold

diff --git a/src/base/string_util.cc b/src/base/string_util.cc
@@ -37,6 +37,7 @@
 #include "config.h"
 #include "is_utf8.hh"
 #include "lnav_log.hh"
+#include "wcwidth9.h"
 
 void
 scrub_to_utf8(char* buffer, size_t length)
@@ -422,3 +423,9 @@ quote(string_fragment str)
 
 }  // namespace pcre2pp
 }  // namespace lnav
+
+int
+wcwidth(wchar_t wc)
+{
+    return wcwidth9(wc);
+}