SyedM/crib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Improve highlighting structure

Browse Source 
- switched to a sparse delta based map
- true lazy-loading to avoid any unneccessary allocations
- fixed windows management api
This commit is contained in:
Syed Daanish
2026-02-11 18:18:28 +00:00
parent d79ea4e75a
commit 5b66f503e4
24 changed files with 481 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/events.cc
View File

@@ -6,8 +6,8 @@
void Editor::handle_event(KeyEvent event) {
uint8_t old_mode = mode;
if (this->hover_active)
this->hover_active = false;
if (!this->hover_popup->hidden)
this->hover_popup->hidden = true;
if (event.key_type == KEY_SPECIAL) {
switch (event.special_modifier) {
case 0:
@@ -67,12 +67,12 @@ void Editor::handle_event(KeyEvent event) {
this->select_all();
break;
case CTRL('h'):
static_cast<HoverBox *>(ui::hover_popup->tile.get())->scroll(-1);
this->hover_active = true;
this->hover_popup->scroll(-1);
this->hover_popup->hidden = false;
break;
case CTRL('l'):
static_cast<HoverBox *>(ui::hover_popup->tile.get())->scroll(1);
this->hover_active = true;
this->hover_popup->scroll(1);
this->hover_popup->hidden = false;
break;
case 'h':
this->fetch_lsp_hover();

13
src/editor/helpers.cc
View File

@@ -410,11 +410,10 @@ void Editor::fetch_lsp_hover() {
hover_text += contents.get<std::string>();
}
if (!hover_text.empty()) {
auto hover_box = static_cast<HoverBox *>(ui::hover_popup->tile.get());
hover_box->clear();
hover_box->text = clean_text(hover_text);
hover_box->is_markup = is_markup;
message.editor->hover_active = true;
message.editor->hover_popup->clear();
message.editor->hover_popup->text = clean_text(hover_text);
message.editor->hover_popup->is_markup = is_markup;
message.editor->hover_popup->hidden = false;
}
}
};
@@ -423,12 +422,14 @@ void Editor::fetch_lsp_hover() {
}
void Editor::handle_click(KeyEvent event, Coord size) {
focused_window = this;
layout::focused_window = this;
this->size = size;
static std::chrono::steady_clock::time_point last_click_time =
std::chrono::steady_clock::now();
static uint32_t click_count = 0;
static Coord last_click_pos = {UINT32_MAX, UINT32_MAX};
if (!this->hover_popup->hidden)
this->hover_popup->hidden = true;
if (event.key_type == KEY_MOUSE) {
auto now = std::chrono::steady_clock::now();
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(

14
src/editor/renderer.cc
View File

@@ -31,7 +31,7 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
return (int)token.type;
return 0;
};
Coord screen = get_size();
Coord screen = {io::rows, io::cols};
auto update = [&](uint32_t row, uint32_t col, std::string text, uint32_t fg,
uint32_t bg, uint8_t flags, uint32_t u_color,
uint32_t width) {
@@ -115,12 +115,8 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
while (rendered_rows < this->size.row) {
uint32_t line_len;
char *line = next_line(it, &line_len);
if (this->parser) {
if (line_data)
line_data = this->parser->line_tree.next();
else
line_data = this->parser->line_tree.start_iter(line_index);
}
if (this->parser)
line_data = this->parser->line_map.at(line_index);
if (!line)
break;
if (line_len > 0 && line[line_len - 1] == '\n')
@@ -477,8 +473,8 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
// this->hover.render(cursor);
// else if (this->diagnostics_active)
// this->diagnostics.render(cursor);
if (this->hover_active)
ui::hover_popup->pos = cursor;
if (!this->hover_popup->hidden)
this->hover_popup->pos = cursor;
}
free(it->buffer);
free(it);

48
src/extentions/hover.cc
View File

@@ -1,15 +1,16 @@
#include "extentions/hover.h"
#include "io/sysio.h"
#include "syntax/decl.h"
#include "windows/decl.h"
TileRoot *init_hover() {
auto root = std::make_unique<TileRoot>();
root->tile = std::make_unique<HoverBox>();
root->pos = {0, 0};
root->size = {1, 1};
root->tile->hidden = true;
popups.push_back(std::move(root));
return popups.back().get();
HoverBox *init_hover() {
auto hover = std::make_unique<HoverBox>();
hover->pos = {0, 0};
hover->size = {1, 1};
hover->hidden = true;
HoverBox *ptr = hover.get();
layout::popups.push_back(std::move(hover));
return ptr;
}
void HoverBox::scroll(int32_t number) {
@@ -25,20 +26,25 @@ void HoverBox::scroll(int32_t number) {
scroll_dirty = true;
}
void HoverBox::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
void HoverBox::render(std::vector<ScreenCell> &buffer, Coord n_size,
Coord n_pos) {
pos = n_pos;
size = n_size;
if (scroll_dirty) {
// TODO: call syntax highlighter here
}
// 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
Coord screen_size = get_size();
// if (start_col + size.col > screen_size.col) {
// start_col = screen_size.col - size.col;
// if (start_col < 0)
// start_col = 0;
// }
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
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;
uint32_t longest_line = 0;
uint32_t current_width = 0;
for (size_t j = 0; j < text.length(); j++) {
@@ -69,6 +75,8 @@ void HoverBox::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
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 = text;
cell.width = width;
@@ -103,6 +111,8 @@ void HoverBox::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
for (int w = 1; w < width; w++)
set(r + 1, c - w + 1, "\x1b", 0xFFFFFF, base_bg, 0, 0);
}
while (c < content_width)
set(r + 1, ++c, " ", 0xFFFFFF, base_bg, 0, 0);
r++;
}
if (scroll_dirty)

16
src/io/renderer.cc
View File

@@ -1,15 +1,19 @@
#include "io/sysio.h"
namespace io {
std::vector<ScreenCell> new_screen;
static uint32_t rows, cols;
static bool show_cursor = 0;
static std::vector<ScreenCell> old_screen;
static termios orig_termios;
uint32_t rows, cols;
bool show_cursor = 0;
std::vector<ScreenCell> old_screen;
termios orig_termios;
} // namespace io
using namespace io;
void disable_raw_mode() {
std::string os = "\x1b[?1049l\x1b[2 q\x1b[?1002l\x1b[?25h\x1b[?2004l";
write(STDOUT_FILENO, os.c_str(), os.size());
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &orig_termios) == -1) {
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &io::orig_termios) == -1) {
perror("tcsetattr");
exit(EXIT_FAILURE);
}
@@ -45,8 +49,6 @@ Coord start_screen() {
void end_screen() { disable_raw_mode(); }
Coord get_size() { return {rows, cols}; }
void io_render() {
static bool first_render = true;
uint32_t current_fg = 0;

19
src/main.cc
View File

@@ -1,6 +1,5 @@
#include "main.h"
#include "editor/editor.h"
#include "extentions/hover.h"
#include "io/sysio.h"
#include "lsp/lsp.h"
#include "ruby/decl.h"
@@ -15,7 +14,6 @@ std::atomic<uint8_t> mode = NORMAL;
namespace ui {
Bar bar;
TileRoot *hover_popup = nullptr;
} // namespace ui
void background_lsp() {
@@ -33,13 +31,14 @@ int main(int argc, char *argv[]) {
const char *filename = (argc > 1) ? argv[1] : "";
uint8_t eol = read_line_endings();
ui::hover_popup = init_hover();
layout::root_tile.pos = {0, 0};
layout::root_tile.size = {screen.row - 2, screen.col - 1};
auto editor = std::make_unique<Editor>(filename, eol);
layout::focused_window = editor.get();
auto block = std::make_unique<TileBlock>();
block->tiles.push_back(std::move(editor));
layout::root_tile.tile = std::move(block);
root_tile.size = {screen.row - 2, screen.col - 1};
root_tile.pos = {0, 0};
root_tile.tile = std::make_unique<Editor>(filename, eol);
focused_window = static_cast<Editor *>(root_tile.tile.get());
ui::bar.init(screen);
std::thread lsp_thread(background_lsp);
@@ -57,7 +56,7 @@ int main(int argc, char *argv[]) {
if (event.key_type == KEY_MOUSE) {
handle_click(event);
} else {
focused_window->handle_event(event);
layout::focused_window->handle_event(event);
}
} else {
ui::bar.handle_event(event);
@@ -68,7 +67,7 @@ int main(int argc, char *argv[]) {
}
for (auto &lsp_inst : lsp::active_lsps)
lsp_inst.second->callbacks();
focused_window->work();
layout::focused_window->work();
throttle(4ms, render);
throttle(4ms, io_render);
}

28
src/syntax/bash.cc
View File

@@ -10,7 +10,7 @@ struct BashFullState {
bool line_cont = false;
struct Lit {
std::string delim = ""; // Only 1 wide for strings
std::string delim = "";
bool allow_interp = false;
bool operator==(const BashFullState::Lit &other) const {
@@ -24,7 +24,7 @@ struct BashFullState {
}
};
struct BashState {
struct BashState : StateBase {
using full_state_type = BashFullState;
int interp_level = 0;
@@ -37,26 +37,32 @@ struct BashState {
((full_state && other.full_state &&
*full_state == *other.full_state));
}
std::unique_ptr<StateBase> clone() const override {
return std::make_unique<BashState>(*this);
}
};
bool bash_state_match(std::shared_ptr<void> state_1,
std::shared_ptr<void> state_2) {
bool bash_state_match(StateBase *state_1, StateBase *state_2) {
if (!state_1 || !state_2)
return false;
return *std::static_pointer_cast<BashState>(state_1) ==
*std::static_pointer_cast<BashState>(state_2);
return *static_cast<BashState *>(state_1) ==
*static_cast<BashState *>(state_2);
}
std::shared_ptr<void> bash_parse(std::vector<Token> *tokens,
std::shared_ptr<void> in_state,
const char *text, uint32_t len,
uint32_t line_num) {
std::unique_ptr<StateBase> bash_parse(std::vector<Token> *tokens,
StateBase *in_state, const char *text,
uint32_t len, uint32_t line_num) {
static bool keywords_trie_init = false;
if (!keywords_trie_init) {
keywords_trie_init = true;
}
tokens->clear();
auto state = ensure_state(std::static_pointer_cast<BashState>(in_state));
std::unique_ptr<BashState> state;
if (in_state)
state = static_unique_ptr_cast<BashState>(in_state->clone());
else
state = std::make_unique<BashState>();
uint32_t i = 0;
while (len > 0 && (text[len - 1] == '\n' || text[len - 1] == '\r' ||
text[len - 1] == '\t' || text[len - 1] == ' '))

111
src/syntax/parser.cc
View File

@@ -26,21 +26,19 @@ Parser::Parser(Editor *n_editor, std::string n_lang, uint32_t n_scroll_max) {
assert("unknown lang should be checked by caller" && 0);
}
}
edit(0, 0, editor->root->line_count + 1);
line_map.apply_edit(0, editor->root->line_count + 1);
}
void Parser::edit(uint32_t start_line, uint32_t removed_rows,
uint32_t inserted_rows) {
int64_t delta = (int64_t)inserted_rows - (int64_t)removed_rows;
if (delta < 0)
line_tree.erase(start_line, (uint32_t)(-delta));
else if (delta > 0)
line_tree.insert(start_line, (uint32_t)delta);
line_map.apply_edit(start_line, delta);
uint32_t span = MAX(removed_rows, inserted_rows);
uint32_t begin = (start_line > 0) ? start_line - 1 : 0;
uint32_t end = start_line + span;
for (uint32_t line = begin; line <= end + 1; ++line)
dirty_lines.push(line);
if (LineData *ld = line_map.at(line))
ld->out_state = nullptr;
}
void Parser::work() {
@@ -48,32 +46,30 @@ void Parser::work() {
return;
std::vector<uint32_t> batch;
uint32_t c_line;
while (dirty_lines.pop(c_line))
batch.push_back(c_line);
uint32_t i = MAX(0, (int64_t)scroll_max - 60);
LineData *l_iter = line_tree.start_iter(i);
while (l_iter && i < scroll_max + 10) {
if (!l_iter->out_state)
uint32_t line_count = editor->root->line_count + 1;
for (uint32_t i = MAX(0, (int64_t)scroll_max - MAX_LINES_LOOKBEHIND);
i <= scroll_max + 10 && i < line_count; ++i) {
auto l_opt = line_map.at(i);
if (!l_opt || (l_opt && !l_opt->out_state))
batch.push_back(i);
i++;
l_iter = line_tree.next();
}
line_tree.end_iter();
for (uint32_t c_line : batch) {
if (!running.load(std::memory_order_relaxed))
break;
uint32_t min_line = scroll_max > 60 ? scroll_max - 60 : 0;
uint32_t min_line = scroll_max > MAX_LINES_LOOKBEHIND
? scroll_max - MAX_LINES_LOOKBEHIND
: 0;
uint32_t max_line = scroll_max + 10;
if (c_line < min_line || c_line > max_line) {
dirty_lines.push(c_line);
if (c_line < min_line || c_line > max_line)
continue;
}
uint32_t scroll_snapshot = scroll_max;
std::shared_ptr<void> prev_state = nullptr;
uint32_t line_count;
line_count = line_tree.count();
if (c_line > 0 && c_line < line_count)
prev_state = line_tree.at(c_line - 1)->out_state;
std::unique_ptr<StateBase> prev_state = nullptr;
if (c_line > 0 && c_line < line_count) {
auto lm = line_map.at(c_line - 1);
if (lm && lm->out_state)
prev_state = lm->out_state ? lm->out_state->clone() : nullptr;
}
LineIterator *it = begin_l_iter(editor->root, c_line);
if (!it)
continue;
@@ -81,60 +77,57 @@ void Parser::work() {
while (cur_line < line_count) {
if (!running.load(std::memory_order_relaxed))
break;
if (scroll_snapshot != scroll_max) {
LineData *line_data = line_tree.at(cur_line);
if (line_data && !line_data->out_state)
dirty_lines.push(cur_line);
if (scroll_snapshot != scroll_max)
break;
}
if (cur_line < min_line || cur_line > max_line) {
dirty_lines.push(cur_line);
if (cur_line < min_line || cur_line > max_line)
break;
}
uint32_t len;
char *line = next_line(it, &len);
if (!line)
break;
LineData *line_data = line_tree.at(cur_line);
if (!line_data) {
cur_line++;
continue;
}
std::shared_ptr<void> new_state;
LineData *line_data = line_map.create_at(cur_line);
std::unique_ptr<StateBase> new_state;
if (is_custom) {
std::string state = "";
if (prev_state)
state = std::static_pointer_cast<std::string>(prev_state)->c_str();
std::string out_state = parse_custom(&line_data->tokens, parser_block,
line, len, state, cur_line);
new_state = std::make_shared<std::string>(out_state);
std::string prev_value = "";
if (prev_state) {
CustomState *prev_custom =
static_cast<CustomState *>(prev_state.get());
prev_value = prev_custom->value;
}
std::string out_value = parse_custom(&line_data->tokens, parser_block,
line, len, prev_value, cur_line);
new_state = std::make_unique<CustomState>(out_value);
} else {
new_state =
parse_func(&line_data->tokens, prev_state, line, len, cur_line);
new_state = parse_func(&line_data->tokens, prev_state.get(), line, len,
cur_line);
}
line_data->in_state = prev_state;
line_data->out_state = new_state;
line_data->in_state = std::move(prev_state);
line_data->out_state = std::move(new_state);
bool done = false;
if (cur_line + 1 < line_count) {
LineData *next_line_data = line_tree.at(cur_line + 1);
LineData *next_line_data = line_map.at(cur_line + 1);
if (next_line_data) {
if (is_custom) {
std::string a =
prev_state
? std::static_pointer_cast<std::string>(new_state)->c_str()
: "";
std::string b = next_line_data->in_state
? std::static_pointer_cast<std::string>(
next_line_data->in_state)
->c_str()
: "";
std::string a = "";
if (new_state) {
CustomState *cs = static_cast<CustomState *>(new_state.get());
a = cs->value;
}
std::string b = "";
if (next_line_data->in_state) {
CustomState *cs =
static_cast<CustomState *>(next_line_data->in_state.get());
b = cs->value;
}
done = custom_compare(match_block, a, b);
} else {
done = state_match_func(new_state, next_line_data->in_state);
done = state_match_func(new_state.get(),
next_line_data->in_state.get());
}
}
}
prev_state = new_state;
prev_state =
line_data->out_state ? line_data->out_state->clone() : nullptr;
cur_line++;
if (done)
break;

240
src/syntax/ruby.cc
View File

@@ -241,20 +241,22 @@ struct RubyFullState {
}
};
struct RubyState {
struct RubyState : StateBase {
using full_state_type = RubyFullState;
int interp_level = 0;
std::stack<std::shared_ptr<RubyFullState>> interp_stack;
std::shared_ptr<RubyFullState> full_state;
std::stack<RubyFullState> interp_stack;
RubyFullState full_state;
std::deque<HeredocInfo> heredocs;
bool operator==(const RubyState &other) const {
return interp_level == other.interp_level &&
interp_stack == other.interp_stack &&
((full_state && other.full_state &&
*full_state == *other.full_state)) &&
heredocs == other.heredocs;
full_state == other.full_state && heredocs == other.heredocs;
}
std::unique_ptr<StateBase> clone() const override {
return std::make_unique<RubyState>(*this);
}
};
@@ -278,18 +280,16 @@ inline static uint32_t get_next_word(const char *text, uint32_t i,
return width;
}
bool ruby_state_match(std::shared_ptr<void> state_1,
std::shared_ptr<void> state_2) {
bool ruby_state_match(StateBase *state_1, StateBase *state_2) {
if (!state_1 || !state_2)
return false;
return *std::static_pointer_cast<RubyState>(state_1) ==
*std::static_pointer_cast<RubyState>(state_2);
return *static_cast<RubyState *>(state_1) ==
*static_cast<RubyState *>(state_2);
}
std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
std::shared_ptr<void> in_state,
const char *text, uint32_t len,
uint32_t line_num) {
std::unique_ptr<StateBase> ruby_parse(std::vector<Token> *tokens,
StateBase *in_state, const char *text,
uint32_t len, uint32_t line_num) {
static bool keywords_trie_init = false;
static Trie<void> base_keywords_trie;
static Trie<void> expecting_keywords_trie;
@@ -313,7 +313,11 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
keywords_trie_init = true;
}
tokens->clear();
auto state = ensure_state(std::static_pointer_cast<RubyState>(in_state));
std::unique_ptr<RubyState> state;
if (in_state)
state = static_unique_ptr_cast<RubyState>(in_state->clone());
else
state = std::make_unique<RubyState>();
uint32_t i = 0;
while (len > 0 && (text[len - 1] == '\n' || text[len - 1] == '\r' ||
text[len - 1] == '\t' || text[len - 1] == ' '))
@@ -322,18 +326,18 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
return state;
bool heredoc_first = false;
while (i < len) {
if (state->full_state->in_state == RubyFullState::END)
if (state->full_state.in_state == RubyFullState::END)
return state;
if (state->full_state->in_state == RubyFullState::COMMENT) {
if (state->full_state.in_state == RubyFullState::COMMENT) {
tokens->push_back({i, len, TokenKind::K_COMMENT});
if (i == 0 && len == 4 && text[i] == '=' && text[i + 1] == 'e' &&
text[i + 2] == 'n' && text[i + 3] == 'd') {
state->full_state->in_state = RubyFullState::NONE;
state->full_state.in_state = RubyFullState::NONE;
}
return state;
}
if (!heredoc_first &&
state->full_state->in_state == RubyFullState::HEREDOC) {
state->full_state.in_state == RubyFullState::HEREDOC) {
if (i == 0) {
uint32_t start = 0;
if (state->heredocs.front().allow_indentation)
@@ -344,7 +348,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
state->heredocs.front().delim.length())) {
state->heredocs.pop_front();
if (state->heredocs.empty())
state->full_state->in_state = RubyFullState::NONE;
state->full_state.in_state = RubyFullState::NONE;
tokens->push_back({i, len, TokenKind::K_ANNOTATION});
return state;
}
@@ -421,7 +425,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({i, i + 2, TokenKind::K_INTERPOLATION});
i += 2;
state->interp_stack.push(state->full_state);
state->full_state = std::make_shared<RubyFullState>();
state->full_state = RubyFullState();
state->interp_level = 1;
break;
}
@@ -432,7 +436,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
continue;
}
}
if (state->full_state->in_state == RubyFullState::STRING) {
if (state->full_state.in_state == RubyFullState::STRING) {
uint32_t start = i;
while (i < len) {
if (text[i] == '\\') {
@@ -496,36 +500,36 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_ESCAPE});
continue;
}
if (state->full_state->lit.allow_interp && text[i] == '#' &&
if (state->full_state.lit.allow_interp && text[i] == '#' &&
i + 1 < len && text[i + 1] == '{') {
tokens->push_back({start, i, TokenKind::K_STRING});
tokens->push_back({i, i + 2, TokenKind::K_INTERPOLATION});
i += 2;
state->interp_stack.push(state->full_state);
state->full_state = std::make_shared<RubyFullState>();
state->full_state = RubyFullState();
state->interp_level = 1;
break;
}
if (text[i] == state->full_state->lit.delim_start &&
state->full_state->lit.delim_start !=
state->full_state->lit.delim_end) {
state->full_state->lit.brace_level++;
if (text[i] == state->full_state.lit.delim_start &&
state->full_state.lit.delim_start !=
state->full_state.lit.delim_end) {
state->full_state.lit.brace_level++;
}
if (text[i] == state->full_state->lit.delim_end) {
if (state->full_state->lit.delim_start ==
state->full_state->lit.delim_end) {
if (text[i] == state->full_state.lit.delim_end) {
if (state->full_state.lit.delim_start ==
state->full_state.lit.delim_end) {
i++;
tokens->push_back({start, i, TokenKind::K_STRING});
state->full_state->in_state = RubyFullState::NONE;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::NONE;
state->full_state.expecting_expr = false;
break;
} else {
state->full_state->lit.brace_level--;
if (state->full_state->lit.brace_level == 0) {
state->full_state.lit.brace_level--;
if (state->full_state.lit.brace_level == 0) {
i++;
tokens->push_back({start, i, TokenKind::K_STRING});
state->full_state->in_state = RubyFullState::NONE;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::NONE;
state->full_state.expecting_expr = false;
break;
}
}
@@ -536,7 +540,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, len, TokenKind::K_STRING});
continue;
}
if (state->full_state->in_state == RubyFullState::REGEXP) {
if (state->full_state.in_state == RubyFullState::REGEXP) {
uint32_t start = i;
while (i < len) {
if (text[i] == '\\') {
@@ -605,30 +609,30 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({i, i + 2, TokenKind::K_INTERPOLATION});
i += 2;
state->interp_stack.push(state->full_state);
state->full_state = std::make_shared<RubyFullState>();
state->full_state = RubyFullState();
state->interp_level = 1;
break;
}
if (text[i] == state->full_state->lit.delim_start &&
state->full_state->lit.delim_start !=
state->full_state->lit.delim_end) {
state->full_state->lit.brace_level++;
if (text[i] == state->full_state.lit.delim_start &&
state->full_state.lit.delim_start !=
state->full_state.lit.delim_end) {
state->full_state.lit.brace_level++;
}
if (text[i] == state->full_state->lit.delim_end) {
if (state->full_state->lit.delim_start ==
state->full_state->lit.delim_end) {
if (text[i] == state->full_state.lit.delim_end) {
if (state->full_state.lit.delim_start ==
state->full_state.lit.delim_end) {
i += 1;
tokens->push_back({start, i, TokenKind::K_REGEXP});
state->full_state->in_state = RubyFullState::NONE;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::NONE;
state->full_state.expecting_expr = false;
break;
} else {
state->full_state->lit.brace_level--;
if (state->full_state->lit.brace_level == 0) {
state->full_state.lit.brace_level--;
if (state->full_state.lit.brace_level == 0) {
i += 1;
tokens->push_back({start, i, TokenKind::K_REGEXP});
state->full_state->in_state = RubyFullState::NONE;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::NONE;
state->full_state.expecting_expr = false;
break;
}
}
@@ -642,8 +646,8 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
if (i == 0 && len == 6) {
if (text[i] == '=' && text[i + 1] == 'b' && text[i + 2] == 'e' &&
text[i + 3] == 'g' && text[i + 4] == 'i' && text[i + 5] == 'n') {
state->full_state->in_state = RubyFullState::COMMENT;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::COMMENT;
state->full_state.expecting_expr = false;
tokens->push_back({0, len, TokenKind::K_COMMENT});
return state;
}
@@ -653,8 +657,8 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
text[i + 3] == 'N' && text[i + 4] == 'D' && text[i + 5] == '_' &&
text[i + 6] == '_') {
tokens->clear();
state->full_state->in_state = RubyFullState::END;
state->full_state->expecting_expr = false;
state->full_state.in_state = RubyFullState::END;
state->full_state.expecting_expr = false;
return state;
}
}
@@ -684,33 +688,33 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
delim += text[j++];
}
}
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
if (!delim.empty()) {
tokens->push_back({s, j, TokenKind::K_ANNOTATION});
state->heredocs.push_back({delim, interpolation, indented});
state->full_state->in_state = RubyFullState::HEREDOC;
state->full_state.in_state = RubyFullState::HEREDOC;
heredoc_first = true;
}
i = j;
continue;
}
if (text[i] == '/' && state->full_state->expecting_expr) {
if (text[i] == '/' && state->full_state.expecting_expr) {
tokens->push_back({i, i + 1, TokenKind::K_REGEXP});
state->full_state->in_state = RubyFullState::REGEXP;
state->full_state->expecting_expr = false;
state->full_state->lit.delim_start = '/';
state->full_state->lit.delim_end = '/';
state->full_state->lit.allow_interp = true;
state->full_state.in_state = RubyFullState::REGEXP;
state->full_state.expecting_expr = false;
state->full_state.lit.delim_start = '/';
state->full_state.lit.delim_end = '/';
state->full_state.lit.allow_interp = true;
i++;
continue;
} else if (text[i] == '#') {
if (line_num == 0 && i == 0 && len > 4 && text[i + 1] == '!') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
tokens->push_back({0, len, TokenKind::K_SHEBANG});
return state;
}
tokens->push_back({i, len, TokenKind::K_COMMENT});
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
return state;
} else if (text[i] == '.') {
uint32_t start = i;
@@ -722,15 +726,15 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
}
}
tokens->push_back({start, i, TokenKind::K_OPERATOR});
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
continue;
} else if (text[i] == ':') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t start = i;
i++;
if (i >= len) {
tokens->push_back({start, i, TokenKind::K_OPERATOR});
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
continue;
}
if (text[i] == ':') {
@@ -739,7 +743,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
}
if (text[i] == '\'' || text[i] == '"') {
tokens->push_back({start, i, TokenKind::K_LABEL});
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
continue;
}
if (text[i] == '$' || text[i] == '@') {
@@ -767,7 +771,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_OPERATOR});
continue;
} else if (text[i] == '@') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t start = i;
i++;
if (i >= len)
@@ -783,7 +787,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_VARIABLEINSTANCE});
continue;
} else if (text[i] == '$') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t start = i;
i++;
if (i >= len)
@@ -806,7 +810,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_VARIABLEGLOBAL});
continue;
} else if (text[i] == '?') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t start = i;
i++;
if (i < len && text[i] == '\\') {
@@ -851,95 +855,95 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_CHAR});
continue;
} else {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
tokens->push_back({start, i, TokenKind::K_OPERATOR});
continue;
}
} else if (text[i] == '{') {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
state->interp_level++;
state->full_state->brace_level++;
state->full_state.brace_level++;
i++;
continue;
} else if (text[i] == '}') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
state->interp_level--;
if (state->interp_level == 0 && !state->interp_stack.empty()) {
state->full_state = state->interp_stack.top();
state->interp_stack.pop();
tokens->push_back({i, i + 1, TokenKind::K_INTERPOLATION});
} else {
state->full_state->brace_level--;
state->full_state.brace_level--;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
}
i++;
continue;
} else if (text[i] == '(') {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
state->full_state->brace_level++;
state->full_state.brace_level++;
i++;
continue;
} else if (text[i] == ')') {
state->full_state->expecting_expr = false;
state->full_state->brace_level--;
state->full_state.expecting_expr = false;
state->full_state.brace_level--;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
i++;
continue;
} else if (text[i] == '[') {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
state->full_state->brace_level++;
state->full_state.brace_level++;
i++;
continue;
} else if (text[i] == ']') {
state->full_state->expecting_expr = false;
state->full_state->brace_level--;
state->full_state.expecting_expr = false;
state->full_state.brace_level--;
uint8_t brace_color =
(uint8_t)TokenKind::K_BRACE1 + (state->full_state->brace_level % 5);
(uint8_t)TokenKind::K_BRACE1 + (state->full_state.brace_level % 5);
tokens->push_back({i, i + 1, (TokenKind)brace_color});
i++;
continue;
} else if (text[i] == '\'') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
tokens->push_back({i, i + 1, TokenKind::K_STRING});
state->full_state->in_state = RubyFullState::STRING;
state->full_state->lit.delim_start = '\'';
state->full_state->lit.delim_end = '\'';
state->full_state->lit.allow_interp = false;
state->full_state.in_state = RubyFullState::STRING;
state->full_state.lit.delim_start = '\'';
state->full_state.lit.delim_end = '\'';
state->full_state.lit.allow_interp = false;
i++;
continue;
} else if (text[i] == '"') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
tokens->push_back({i, i + 1, TokenKind::K_STRING});
state->full_state->in_state = RubyFullState::STRING;
state->full_state->lit.delim_start = '"';
state->full_state->lit.delim_end = '"';
state->full_state->lit.allow_interp = true;
state->full_state.in_state = RubyFullState::STRING;
state->full_state.lit.delim_start = '"';
state->full_state.lit.delim_end = '"';
state->full_state.lit.allow_interp = true;
i++;
continue;
} else if (text[i] == '`') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
tokens->push_back({i, i + 1, TokenKind::K_STRING});
state->full_state->in_state = RubyFullState::STRING;
state->full_state->lit.delim_start = '`';
state->full_state->lit.delim_end = '`';
state->full_state->lit.allow_interp = true;
state->full_state.in_state = RubyFullState::STRING;
state->full_state.lit.delim_start = '`';
state->full_state.lit.delim_end = '`';
state->full_state.lit.allow_interp = true;
i++;
continue;
} else if (text[i] == '%') {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
if (i + 1 >= len) {
i++;
continue;
@@ -1005,16 +1009,16 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back(
{i, i + prefix_len + 1,
(is_regexp ? TokenKind::K_REGEXP : TokenKind::K_STRING)});
state->full_state->in_state =
state->full_state.in_state =
is_regexp ? RubyFullState::REGEXP : RubyFullState::STRING;
state->full_state->lit.delim_start = delim_start;
state->full_state->lit.delim_end = delim_end;
state->full_state->lit.allow_interp = allow_interp;
state->full_state->lit.brace_level = 1;
state->full_state.lit.delim_start = delim_start;
state->full_state.lit.delim_end = delim_end;
state->full_state.lit.allow_interp = allow_interp;
state->full_state.lit.brace_level = 1;
i += prefix_len + 1;
continue;
} else if (isdigit(text[i])) {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t start = i;
if (text[i] == '0') {
i++;
@@ -1115,7 +1119,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
tokens->push_back({start, i, TokenKind::K_NUMBER});
continue;
} else if (identifier_start_char(text[i])) {
state->full_state->expecting_expr = false;
state->full_state.expecting_expr = false;
uint32_t length;
if ((length = base_keywords_trie.match(text, i, len, identifier_char))) {
tokens->push_back({i, i + length, TokenKind::K_KEYWORD});
@@ -1123,7 +1127,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
continue;
} else if ((length = expecting_keywords_trie.match(text, i, len,
identifier_char))) {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
tokens->push_back({i, i + length, TokenKind::K_KEYWORD});
i += length;
continue;
@@ -1134,7 +1138,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
continue;
} else if ((length = expecting_operators_trie.match(
text, i, len, identifier_char)) > 0) {
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
tokens->push_back({i, i + length, TokenKind::K_KEYWORDOPERATOR});
i += length;
continue;
@@ -1256,7 +1260,7 @@ std::shared_ptr<void> ruby_parse(std::vector<Token> *tokens,
operator_trie.match(text, i, len, [](char) { return false; }))) {
tokens->push_back({i, i + op_len, TokenKind::K_OPERATOR});
i += op_len;
state->full_state->expecting_expr = true;
state->full_state.expecting_expr = true;
continue;
} else {
i += utf8_codepoint_width(text[i]);

7
src/ui/bar.cc
View File

@@ -10,7 +10,8 @@ void Bar::log(std::string message) { log_line = message; }
void Bar::render(std::vector<ScreenCell> &buffer) {
USING(LSPInstance);
BarLine bar_line;
bar_line = bar_contents(mode, screen.col, pwd.string(), focused_window);
bar_line =
bar_contents(mode, screen.col, pwd.string(), layout::focused_window);
auto update = [&](uint32_t row, uint32_t col, std::string text, uint32_t fg,
uint32_t bg, uint8_t flags, uint32_t width) {
ScreenCell &c = buffer[row * screen.col + col];
@@ -61,8 +62,8 @@ void Bar::handle_command(std::string &command) {
running = false;
return;
}
if (focused_window)
focused_window->handle_command(command);
if (layout::focused_window)
layout::focused_window->handle_command(command);
}
void Bar::handle_event(KeyEvent event) {

46
src/windows/renderer.cc
View File

@@ -1,23 +1,49 @@
#include "io/sysio.h"
#include "main.h"
#include "windows/decl.h"
TileRoot root_tile;
std::vector<std::unique_ptr<TileRoot>> popups;
namespace layout {
TileBase root_tile;
Window *focused_window;
std::vector<std::unique_ptr<Popup>> popups;
std::vector<std::unique_ptr<TileBase>> floating_tiles;
} // namespace layout
void render() {
ui::bar.render(new_screen);
root_tile.render(new_screen);
for (auto &popup : popups)
popup->render(new_screen);
ui::bar.render(io::new_screen);
layout::root_tile.render(io::new_screen);
for (auto &tile : layout::floating_tiles) {
if (tile->hidden())
continue;
tile->render(io::new_screen);
}
for (auto &popup : layout::popups) {
if (popup->hidden)
continue;
popup->render(io::new_screen, popup->size, popup->pos);
}
}
void handle_click(KeyEvent event) {
for (auto &popup : popups) {
if (popup->inside(event.mouse_x, event.mouse_y)) {
popup->handle_click(event);
for (auto &popup : layout::popups) {
if (!popup->hidden &&
inside({event.mouse_y, event.mouse_x}, popup->pos, popup->size)) {
event.mouse_x -= popup->pos.col;
event.mouse_y -= popup->pos.row;
popup->handle_click(event, popup->size);
return;
}
}
root_tile.handle_click(event);
for (auto &tile : layout::floating_tiles) {
if (!tile->hidden() &&
inside({event.mouse_y, event.mouse_x}, tile->pos, tile->size)) {
event.mouse_x -= tile->pos.col;
event.mouse_y -= tile->pos.row;
tile->handle_click(event);
return;
}
}
if (inside({event.mouse_y, event.mouse_x}, layout::root_tile.pos,
layout::root_tile.size))
layout::root_tile.handle_click(event);
}