syedm/crib-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite diagnostics popup with new api

Browse Source
This commit is contained in:
Syed Daanish
2026-02-11 19:51:45 +00:00
parent 5b66f503e4
commit e9d164d769
10 changed files with 239 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extentions/diagnostics.cc
+187
View File
@@ -0,0 +1,187 @@
#include "extentions/diagnostics.h"
#include <cstdint>
DiagnosticBox *init_diagnostic() {
auto diagnostic = std::make_unique<DiagnosticBox>();
diagnostic->pos = {0, 0};
diagnostic->size = {1, 1};
diagnostic->hidden = true;
DiagnosticBox *ptr = diagnostic.get();
layout::popups.push_back(std::move(diagnostic));
return ptr;
}
void DiagnosticBox::render(std::vector<ScreenCell> &buffer, Coord n_size,
Coord n_pos) {
pos = n_pos;
size = n_size;
int32_t start_row = (int32_t)pos.row - (int32_t)size.row;
if (start_row < 0)
start_row = pos.row + 1;
int32_t start_col = pos.col;
Coord screen_size = {io::rows, io::cols};
if (start_col + size.col > screen_size.col) {
start_col = screen_size.col - size.col;
if (start_col < 0)
start_col = 0;
}
pos.col = start_col;
pos.row = start_row;
if (warnings.empty())
return;
uint32_t longest_line = 8 + warnings[0].source.length();
for (auto &warn : warnings) {
uint32_t longest = 0;
uint32_t cur = 0;
for (char ch : warn.text_full)
if (ch == '\n') {
longest = MAX(longest, cur);
cur = 0;
} else {
if (ch == '\t')
cur += 3;
++cur;
}
longest = MAX(longest, cur);
longest_line = MAX(longest_line, longest + 7);
longest_line = MAX(longest_line, (uint32_t)warn.code.length() + 4);
for (auto &see_also : warn.see_also)
longest_line = MAX(longest_line, (uint32_t)see_also.length() + 4);
}
uint32_t content_width = MIN(longest_line, 150u);
size.col = content_width + 2;
auto set = [&](uint32_t r, uint32_t c, std::string text, uint32_t fg,
uint32_t bg, uint8_t flags, uint32_t width) {
if (r < 0 || r >= size.row || c < 0 || c >= size.col)
return;
r += pos.row;
c += pos.col;
if (r < 0 || r >= screen_size.row || c < 0 || c >= screen_size.col)
return;
ScreenCell &cell = buffer[r * screen_size.col + c];
cell.utf8 = std::move(text);
cell.width = width;
cell.fg = fg;
cell.bg = bg;
cell.flags = flags;
cell.ul_color = 0;
};
uint32_t base_bg = 0;
uint32_t border_fg = 0x82AAFF;
uint32_t r = 0;
if (warnings[0].source != "") {
std::string src_txt = "Source: ";
uint32_t i = 0;
for (; i < 8 && i < content_width; i++)
set(1, i + 1, (char[2]){src_txt[i], 0}, 0x3EAAFF, base_bg, 0, 1);
for (; i < 8 + warnings[0].source.length() && i < content_width; i++)
set(1, i + 1, (char[2]){warnings[0].source[i - 8], 0}, 0xffffff, base_bg,
0, 1);
while (i < content_width)
set(1, ++i, " ", 0xffffff, base_bg, 0, 1);
r++;
}
int idx = 1;
for (auto &warn : warnings) {
char buf[4];
std::snprintf(buf, sizeof(buf), "%2d", idx % 100);
std::string line_txt = std::string(buf) + ". ";
for (uint32_t i = 0; i < line_txt.length(); i++)
set(r + 1, i + 1, (char[2]){line_txt[i], 0}, 0xffffff, base_bg, 0, 1);
if (r >= 23)
break;
const char *err_sym = "";
uint32_t c_sym = 0xAAAAAA;
switch (warn.type) {
case 1:
err_sym = "";
c_sym = 0xFF0000;
break;
case 2:
err_sym = "";
c_sym = 0xFFFF00;
break;
case 3:
err_sym = "";
c_sym = 0xFF00FF;
break;
case 4:
err_sym = "";
c_sym = 0xAAAAAA;
break;
}
std::string text = warn.text_full + " " + err_sym;
uint32_t i = 0;
while (i < text.length() && r < 23) {
uint32_t c = 4;
while (c < content_width && i < text.length()) {
if (text[i] == '\n') {
while (i < text.length() && text[i] == '\n')
i++;
break;
}
uint32_t cluster_len = grapheme_next_character_break_utf8(
text.c_str() + i, text.length() - i);
std::string cluster = text.substr(i, cluster_len);
int width = display_width(cluster.c_str(), cluster_len);
if (c + width > content_width)
break;
set(r + 1, c + 1, cluster.c_str(), c_sym, base_bg, 0, width);
c += width;
i += cluster_len;
for (int w = 1; w < width; w++)
set(r + 1, c - w + 1, "\x1b", c_sym, base_bg, 0, 0);
}
while (c < content_width)
set(r + 1, ++c, " ", 0xffffff, base_bg, 0, 1);
r++;
}
if (r >= 23)
break;
if (warn.code != "") {
uint32_t i = 0;
for (; i < 5 && i < content_width; i++)
set(r + 1, i, " ", 0x81cdc6, base_bg, 0, 1);
for (; i < warn.code.length() + 5 && i < content_width; i++)
set(r + 1, i, (char[2]){warn.code[i - 5], 0}, 0x81cdc6, base_bg, 0, 1);
while (i <= content_width)
set(r + 1, i++, " ", 0x81cdc6, base_bg, 0, 1);
r++;
}
if (r >= 23)
break;
for (std::string &see_also : warn.see_also) {
uint32_t fg = 0xB55EFF;
uint8_t colon_count = 0;
uint32_t i = 0;
for (; i < 5 && i < content_width; i++)
set(r + 1, i, " ", 0x81cdc6, base_bg, 0, 1);
for (; i < see_also.length() + 5 && i < content_width; i++) {
set(r + 1, i, (char[2]){see_also[i - 5], 0}, fg, base_bg, 0, 1);
if (see_also[i] == ':')
colon_count++;
if (colon_count == 2)
fg = 0xFFFFFF;
}
while (i <= content_width)
set(r + 1, i++, " ", fg, base_bg, 0, 1);
r++;
if (r >= 23)
break;
};
idx++;
}
size.row = 2 + r;
set(0, 0, "┌", border_fg, base_bg, 0, 1);
for (uint32_t i = 1; i < size.col - 1; i++)
set(0, i, "─", border_fg, base_bg, 0, 1);
set(0, size.col - 1, "┐", border_fg, base_bg, 0, 1);
for (uint32_t r = 1; r < size.row - 1; r++) {
set(r, 0, "│", border_fg, base_bg, 0, 1);
set(r, size.col - 1, "│", border_fg, base_bg, 0, 1);
}
set(size.row - 1, 0, "└", border_fg, base_bg, 0, 1);
for (uint32_t i = 1; i < size.col - 1; i++)
set(size.row - 1, i, "─", border_fg, base_bg, 0, 1);
set(size.row - 1, size.col - 1, "┘", border_fg, base_bg, 0, 1);
}
src/extentions/hover.cc
+1 -1
View File
@@ -36,7 +36,7 @@ void HoverBox::render(std::vector<ScreenCell> &buffer, Coord n_size,
int32_t start_row = (int32_t)pos.row - (int32_t)size.row;
if (start_row < 0)
start_row = pos.row + 1;
int32_t start_col = pos.col; // pos here is the cursor pos
int32_t start_col = pos.col;
Coord screen_size = {io::rows, io::cols};
if (start_col + size.col > screen_size.col) {
start_col = screen_size.col - size.col;