Move folder

This commit is contained in:
2026-04-13 10:32:46 +01:00
parent c683754d49
commit 037f884050
107 changed files with 292 additions and 155 deletions

0
.clangd Normal file → Executable file
View File

0
.gitattributes vendored Normal file → Executable file
View File

0
.gitignore vendored Normal file → Executable file
View File

0
.gitmodules vendored Normal file → Executable file
View File

0
LICENSE Normal file → Executable file
View File

0
Makefile Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

73
TODO.md Normal file → Executable file
View File

@@ -2,35 +2,45 @@ Copyright 2025 Syed Daanish
# TODO # TODO
## Next few super long boring things to do:: - And factorize renderer into its own class
* redo lsp threads such that no mutex needed for any rope stuff (done) - which is just managed by the renderer
- Also make the classes own the methods in lsp (done) - and adjusment.cc will call it
- This will mean that parsers/renderers and keystrokes will not need to be individually locked (done) - which is reused by scrollers/ensurers too (for knowing screen wrapped end)
- And so it will be much faster (done) - this will then allow inlay hints to be possible
- At which point the main thread can also be blocked on user input or lsp responses and still be faster - and also make VAI easier to implement
* Add a superclass for editor called Window (which can be popup or tiled) (done)
* Add a recursive tiling class for windows (done)
* Handled by a single renderer that calls and renders each window (done)
* Make editor's functions into its own methods (classify it) (done)
- While at it
- Seperate system functions into a class that branches to support local / ssh / server modes.
- Even lsp shouldnt be directly controlled because it can branch on local and server modes
- check wolfSSH stuff for remote editing
- Thick and thin mode
- thin mode only shares screen diffing over the network - uses server settings / themes
- thick only shared fileio and lsp data with local used for all else - uses local settings / themes
- Redo hooks as a engine of its own.
- And factorize renderer into its own class (and make it just return an array of the render without knowing teh x,y)
- which is just managed by the renderer
- which is reused by scrollers/ensurers too
- this will then allow inlay hints to be possible
- and also make VAI easier to implement
* Allow keybinds to be set in ruby * Allow keybinds to be set in ruby
* then the fun part: * ruby file for project specific runs alongside any system wide ones
- Seperate system functions into a class that branches to support local / ssh / server modes.
- Even lsp shouldnt be directly controlled because it can branch on local and server modes
- check libssh2 or child process stuff for remote editing (remote mode)
- Thick and thin mode (server mode) (through ssh or port) (for website only port + webhook)
- thin mode only shares screen diffing over the network - uses server settings / themes / shell
- only one user connects at a time
- provides data as a websocket with tui or gui/online modes where tui shares diffing as is (can be connected to by gui or website)
- and gui/online modes try to (if not then render onto a canvas) forward window.render_gui() and dedicated windowing system (i.e windowing is html divs)
- and window.render_gui() returns a markup code (custom markup)
- and for events i could either leave tui as-is and for markup have special event handling or i
- implement the widget system in both and have the same event handling then
- actually for true cross platform i need to make a ui lib with widgets etc. so it is workable on all platforms (so they all need only a single ui lib)
- thick only shared fileio and lsp data with local used for all else - uses local settings / themes
- multiple users connect at once but maybe either make them not be allowed to open same file or make vscode like multiediting (unsure how exactly)
- they all share same lsp instances
- they all have the same shell access
- allow having an instance that forwards thick mode to thin mode (to connect online mode to a thick server for code collaboration)
* Then allow ruby code to create and handle windows as extentions * Then allow ruby code to create and handle windows as extentions
* Then 3 inbuilt extentions being file manager, theme picker, tab selector * Then 3 inbuilt extentions being file manager, theme picker, tab selector
* make another tile type called tile tabbed that has a tab switcher and shows only one of its children at once
* it takes focus and takes some keybinds for switching and forwards the rest (it also forwards the info and adds one for itself - the selected/total tabs)
* also implement info strings for all the stuff that take focus
* Mode is a feild on a editor and there is no global "mode system" except in editors (enxtentions do their own thing)
* make mode normal and not atomic if it is truly unused across threads
* this means keybinds can be set to use the editor as insert mode only and so behave like vscode
* split lsp stuff into multiple files (not a monolithic class as it is now)
* Extentions can also be used as file openers (for like databases . diffing . images . audio etc) * Extentions can also be used as file openers (for like databases . diffing . images . audio etc)
* Local cache for state management (like undo history, cursor positions etc) (location can be set in config) * Local cache for state management (like undo history, cursor positions etc) (location can be set in config)
* make sure to write inbuilt extentions in cpp and not ruby * make sure to write inbuilt extentions in cpp and not ruby
@@ -110,8 +120,6 @@ Copyright 2025 Syed Daanish
* [ ] **Auto brace selection:** Add support for auto brace selection. * [ ] **Auto brace selection:** Add support for auto brace selection.
* [ ] **Tree-sitter Indent:** Attempt to allow Tree-sitter to handle indentation if possible.
### UX ### UX
* [ ] **Completion Filtering:** * [ ] **Completion Filtering:**
@@ -120,7 +128,7 @@ Copyright 2025 Syed Daanish
* [ ] **Basic Autocomplete:** Keep a list of words in the current buffer for non-LSP fallback. * [ ] **Basic Autocomplete:** Keep a list of words in the current buffer for non-LSP fallback.
### Major Features ### Features
* [ ] **Search & Replace:** * [ ] **Search & Replace:**
* [ ] Add Search/Replace UI. * [ ] Add Search/Replace UI.
@@ -154,3 +162,14 @@ Copyright 2025 Syed Daanish
* [ ] Switch JSON parser to `RapidJSON` (or similar high-performance lib). * [ ] Switch JSON parser to `RapidJSON` (or similar high-performance lib).
* [ ] Decrease usage of `std::string` in UI, LSP, warnings etc. * [ ] Decrease usage of `std::string` in UI, LSP, warnings etc.
* [ ] Also for vectors into managed memory especially for completions/lsp-stuff. * [ ] Also for vectors into managed memory especially for completions/lsp-stuff.
<!-- The pits of hell: -->
<!-- * Replace perfectly working superfast rope with a structure that stores for small files everything -->
<!-- - but for large ones it stores only what the user viewed / edited (by line number) -->
<!-- - the rest is from the disk and not entirely loaded into memory (keep as option maybe they want everything in memory?) -->
<!-- - also for the line mode still go through entire file to get and store line offsets -->
<!-- - also it stores everything prolly still as rope tho (rope of lines) (or sparse map) -->
<!-- - it stores the line text as-is which is only unicode / crlf normalized during usage -->

0
config/main.rb Normal file → Executable file
View File

0
config/theme.rb Normal file → Executable file
View File

0
include/editor/completions.h Normal file → Executable file
View File

0
include/editor/decl.h Normal file → Executable file
View File

18
include/editor/editor.h Normal file → Executable file
View File

@@ -1,7 +1,9 @@
#ifndef EDITOR_H #ifndef EDITOR_H
#define EDITOR_H #define EDITOR_H
#include "editor/hooks.h"
#include "editor/indents.h" #include "editor/indents.h"
#include "editor/visual.h"
#include "extentions/diagnostics.h" #include "extentions/diagnostics.h"
#include "extentions/hover.h" #include "extentions/hover.h"
#include "io/knot.h" #include "io/knot.h"
@@ -31,7 +33,6 @@ struct Editor : Window {
Coord size = {0, 0}; Coord size = {0, 0};
Coord scroll = {0, 0}; Coord scroll = {0, 0};
Language lang = {}; Language lang = {};
uint32_t hooks[94] = {0};
bool jumper_set = false; bool jumper_set = false;
std::vector<VWarn> warnings = {}; std::vector<VWarn> warnings = {};
bool warnings_dirty = false; bool warnings_dirty = false;
@@ -42,6 +43,7 @@ struct Editor : Window {
DiagnosticBox *diagnostic_popup = init_diagnostic(); DiagnosticBox *diagnostic_popup = init_diagnostic();
std::atomic<int> lsp_version = 1; std::atomic<int> lsp_version = 1;
IndentationEngine indents = {}; IndentationEngine indents = {};
HookEngine hooks = {};
Parser *parser = nullptr; Parser *parser = nullptr;
ExtraHighlighter extra_hl = {}; ExtraHighlighter extra_hl = {};
bool is_css_color = false; bool is_css_color = false;
@@ -84,7 +86,6 @@ struct Editor : Window {
void backspace_edit(); void backspace_edit();
void delete_prev_word(); void delete_prev_word();
void delete_next_word(); void delete_next_word();
void clear_hooks_at_line(uint32_t line);
void cursor_prev_word(); void cursor_prev_word();
void cursor_next_word(); void cursor_next_word();
void select_all(); void select_all();
@@ -158,19 +159,6 @@ struct Editor : Window {
free(it->buffer); free(it->buffer);
free(it); free(it);
} }
inline void apply_hook_insertion(uint32_t line, uint32_t rows) {
for (auto &hook : this->hooks)
if (hook > line)
hook += rows;
}
inline void apply_hook_deletion(uint32_t removal_start,
uint32_t removal_end) {
for (auto &hook : this->hooks)
if (hook > removal_start)
hook -= removal_end - removal_start + 1;
}
}; };
#endif #endif

0
include/editor/helpers.h Normal file → Executable file
View File

91
include/editor/hooks.h Executable file
View File

@@ -0,0 +1,91 @@
#ifndef EDITOR_HOOKS_H
#define EDITOR_HOOKS_H
#include "utils/utils.h"
struct HookEngine {
uint32_t hooks[94];
std::vector<std::pair<uint32_t, char>> v;
std::vector<std::pair<uint32_t, char>>::iterator it;
HookEngine() {
for (int i = 0; i < 94; i++)
hooks[i] = UINT32_MAX;
v.reserve(94);
}
inline void edit(uint32_t line, uint32_t removed_rows,
uint32_t inserted_rows) {
int64_t delta = (int64_t)inserted_rows - (int64_t)removed_rows;
for (int i = 0; i < 94; i++) {
uint32_t &h = hooks[i];
if (h == UINT32_MAX)
continue;
if (h < line)
continue;
if (removed_rows > 0 && h < line + removed_rows) {
h = UINT32_MAX;
continue;
}
h = (uint32_t)((int64_t)h + delta);
}
}
inline void set(char c, uint32_t line) {
if (c < '!' || c > '~')
return;
int idx = c - '!';
for (int i = 0; i < 94; i++) {
if (hooks[i] == line) {
hooks[i] = UINT32_MAX;
break;
}
}
hooks[idx] = line;
}
inline bool get(char c, uint32_t *out_line) const {
if (c < '!' || c > '~')
return false;
uint32_t h = hooks[c - '!'];
if (h == UINT32_MAX)
return false;
*out_line = h;
return true;
}
inline void clear_line(uint32_t line) {
for (int i = 0; i < 94; i++)
if (hooks[i] == line)
hooks[i] = UINT32_MAX;
}
inline void clear(char c) {
if (c < '!' || c > '~')
return;
hooks[c - '!'] = UINT32_MAX;
}
void start_iter(uint32_t scroll_line) {
for (int i = 0; i < 94; i++)
if (hooks[i] != UINT32_MAX)
v.push_back({hooks[i], (char)('!' + i)});
std::sort(v.begin(), v.end(),
[](const auto &a, const auto &b) { return a.first < b.first; });
it = std::lower_bound(
v.begin(), v.end(), scroll_line,
[](const auto &p, uint32_t line) { return p.first < line; });
}
char next(uint32_t line_index) {
if (it != v.end() && it->first == line_index) {
char c = it->second;
it++;
return c;
}
return '\0';
}
};
#endif

0
include/editor/indents.h Normal file → Executable file
View File

113
include/editor/visual.h Executable file
View File

@@ -0,0 +1,113 @@
#include "editor/decl.h"
#include "io/knot.h"
#include "io/sysio.h"
#include "utils/utils.h"
struct GraphemeIterator {
char *line{nullptr};
uint32_t len{0};
GraphemeIterator(char *line, uint32_t len) : line(line), len(len) {}
char *next(uint32_t *o_len, uint32_t *o_width) {
if (!line || len == 0)
return nullptr;
char *cur = line;
uint32_t g = grapheme_next_character_break_utf8(cur, len);
if (o_width)
*o_width = display_width(cur, g);
if (o_len)
*o_len = g;
line += g;
len -= g;
return cur;
}
};
struct VisualIterator {
LineIterator *it{nullptr};
uint32_t line_index{UINT32_MAX};
uint32_t offset{0};
uint32_t len{0};
bool first{true};
char *line{nullptr};
uint32_t render_width{io::cols};
std::stack<std::pair<Coord, Coord>> prev_stack;
VisualIterator(Knot *root, Coord pos, uint32_t width)
: it(begin_l_iter(root, pos.row)), offset(pos.col),
line_index(pos.row - 1), render_width(width) {}
std::pair<Coord, Coord> prev() {
if (!it)
return {{UINT32_MAX, UINT32_MAX}, {UINT32_MAX, UINT32_MAX}};
if (prev_stack.empty())
return _prev();
auto ret = prev_stack.top();
offset = ret.first.col;
prev_stack.pop();
return ret;
}
std::pair<Coord, Coord> _prev() {
if (!it)
return {{UINT32_MAX, UINT32_MAX}, {UINT32_MAX, UINT32_MAX}};
line_index--;
line = prev_line(it, &len);
if (!line)
return {{UINT32_MAX, UINT32_MAX}, {UINT32_MAX, UINT32_MAX}};
if (len > 0 && line[len - 1] == '\n')
len--;
offset = first ? offset : 0;
first = false;
GraphemeIterator g(line + offset, len - offset);
uint32_t o_len, o_width, rendered = 0, advance = 0;
while (g.next(&o_len, &o_width)) {
if (rendered + o_width > render_width) {
prev_stack.push({{line_index, offset}, {line_index, offset + advance}});
offset += advance;
rendered = 0;
advance = 0;
}
advance += o_len;
rendered += o_width;
}
return {{line_index, offset}, {line_index, offset + advance}};
}
std::pair<Coord, Coord> next() {
if (!it)
return {{UINT32_MAX, UINT32_MAX}, {UINT32_MAX, UINT32_MAX}};
if (!line) {
line_index++;
line = next_line(it, &len);
if (!line)
return {{UINT32_MAX, UINT32_MAX}, {UINT32_MAX, UINT32_MAX}};
if (len > 0 && line[len - 1] == '\n')
len--;
offset = first ? offset : 0;
first = false;
}
GraphemeIterator g(line + offset, len - offset);
uint32_t o_len, o_width, rendered = 0, advance = 0;
while (g.next(&o_len, &o_width)) {
if (rendered + o_width > render_width) {
offset += advance;
return {{line_index, offset - advance}, {line_index, offset}};
}
advance += o_len;
rendered += o_width;
}
offset += advance;
if (offset >= len)
line = nullptr;
return {{line_index, offset}, {line_index, offset + advance}};
}
~VisualIterator() {
if (!it)
return;
free(it->buffer);
free(it);
}
};

0
include/extentions/diagnostics.h Normal file → Executable file
View File

0
include/extentions/hover.h Normal file → Executable file
View File

0
include/io/knot.h Normal file → Executable file
View File

0
include/io/sysio.h Normal file → Executable file
View File

0
include/lsp/lsp.h Normal file → Executable file
View File

0
include/main.h Normal file → Executable file
View File

1
include/pch.h Normal file → Executable file
View File

@@ -31,6 +31,7 @@ extern "C" {
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <functional> #include <functional>
#include <immintrin.h>
#include <limits.h> #include <limits.h>
#include <map> #include <map>
#include <mutex> #include <mutex>

0
include/ruby/decl.h Normal file → Executable file
View File

0
include/ruby/libcrib.rb Normal file → Executable file
View File

0
include/ruby/ruby_compiled.h Normal file → Executable file
View File

0
include/syntax/decl.h Normal file → Executable file
View File

0
include/syntax/extras.h Normal file → Executable file
View File

0
include/syntax/langs.h Normal file → Executable file
View File

0
include/syntax/line_map.h Normal file → Executable file
View File

0
include/syntax/parser.h Normal file → Executable file
View File

0
include/syntax/tokens.def Normal file → Executable file
View File

0
include/syntax/trie.h Normal file → Executable file
View File

0
include/ui/bar.h Normal file → Executable file
View File

0
include/ui/completionbox.h Normal file → Executable file
View File

0
include/utils/utils.h Normal file → Executable file
View File

0
include/windows/decl.h Normal file → Executable file
View File

0
installer.sh Normal file → Executable file
View File

0
libs/unicode_width/unicode_width.c vendored Normal file → Executable file
View File

0
libs/unicode_width/unicode_width.h vendored Normal file → Executable file
View File

0
samples/Makefile Normal file → Executable file
View File

0
samples/bash.sh Normal file → Executable file
View File

0
samples/css.css Normal file → Executable file
View File

0
samples/diff.patch Normal file → Executable file
View File

0
samples/embedded_template.erb Normal file → Executable file
View File

0
samples/fish.fish Normal file → Executable file
View File

0
samples/gdscript.gd Normal file → Executable file
View File

0
samples/go.go Normal file → Executable file
View File

0
samples/go.mod Normal file → Executable file
View File

0
samples/haskell.hs Normal file → Executable file
View File

0
samples/html.html Normal file → Executable file
View File

0
samples/ini.ini Normal file → Executable file
View File

0
samples/javascript.js Normal file → Executable file
View File

0
samples/json.jsonc Normal file → Executable file
View File

0
samples/lua.lua Normal file → Executable file
View File

0
samples/markdown.md Normal file → Executable file
View File

0
samples/nginx.conf Normal file → Executable file
View File

0
samples/php.php Normal file → Executable file
View File

0
samples/python.py Normal file → Executable file
View File

0
samples/regex.regex Normal file → Executable file
View File

0
samples/ruby.rb Normal file → Executable file
View File

0
samples/rust.rs Normal file → Executable file
View File

0
samples/sample.gitattributes Normal file → Executable file
View File

0
samples/sample.gitignore Normal file → Executable file
View File

0
samples/sql.sql Normal file → Executable file
View File

0
samples/toml.toml Normal file → Executable file
View File

0
samples/yaml.yaml Normal file → Executable file
View File

71
src/editor/adjustment.cc Normal file → Executable file
View File

@@ -2,72 +2,27 @@
void Editor::ensure_cursor() { void Editor::ensure_cursor() {
if (this->cursor < this->scroll) { if (this->cursor < this->scroll) {
this->cursor.row = this->scroll.row; this->cursor = this->scroll;
this->cursor.col = this->scroll.col;
this->cursor_preffered = UINT32_MAX; this->cursor_preffered = UINT32_MAX;
return; return;
} }
uint32_t numlen = uint32_t numlen =
EXTRA_META + static_cast<int>(std::log10(this->root->line_count + 1)); EXTRA_META + static_cast<int>(std::log10(this->root->line_count + 1));
uint32_t render_width = this->size.col - numlen; uint32_t render_width = this->size.col - numlen;
uint32_t visual_rows = 0; uint32_t render_height = 0;
uint32_t line_index = this->scroll.row; VisualIterator vis(root, scroll, render_width);
bool first_visual_line = true; std::pair<Coord, Coord> vline;
LineIterator *it = begin_l_iter(this->root, line_index); Coord last_visible = scroll;
if (!it) while ((vline = vis.next()).first.row != UINT32_MAX &&
return; render_height < this->size.row) {
Coord last_visible = this->scroll; render_height++;
while (true) { last_visible = vline.first;
if (visual_rows >= this->size.row) if (cursor >= vline.first && cursor < vline.second)
break; return;
uint32_t line_len;
char *line = next_line(it, &line_len);
if (!line)
break;
if (line_len > 0 && line[line_len - 1] == '\n')
line_len--;
uint32_t offset = first_visual_line ? this->scroll.col : 0;
first_visual_line = false;
while (offset < line_len || (line_len == 0 && offset == 0)) {
Coord current = {line_index, offset};
last_visible = current;
visual_rows++;
if (visual_rows >= this->size.row)
break;
uint32_t col = 0;
uint32_t advance = 0;
uint32_t left = line_len - offset;
while (left > 0 && col < render_width) {
uint32_t g =
grapheme_next_character_break_utf8(line + offset + advance, left);
int w = display_width(line + offset + advance, g);
if (col + w > render_width)
break;
advance += g;
left -= g;
col += w;
}
if (line_index == this->cursor.row) {
if (this->cursor.col >= offset &&
this->cursor.col <= offset + advance) {
free(it->buffer);
free(it);
return;
}
}
if (advance == 0)
break;
offset += advance;
if (line_len == 0)
break;
}
line_index++;
} }
this->cursor.row = last_visible.row; cursor = last_visible;
this->cursor.col = last_visible.col; cursor_preffered = UINT32_MAX;
this->cursor_preffered = UINT32_MAX; this->cursor_preffered = UINT32_MAX;
free(it->buffer);
free(it);
} }
void Editor::ensure_scroll() { void Editor::ensure_scroll() {

0
src/editor/boundaries.cc Normal file → Executable file
View File

0
src/editor/click.cc Normal file → Executable file
View File

0
src/editor/commands.cc Normal file → Executable file
View File

0
src/editor/completions.cc Normal file → Executable file
View File

0
src/editor/cursor.cc Normal file → Executable file
View File

7
src/editor/edit.cc Normal file → Executable file
View File

@@ -44,10 +44,10 @@ void Editor::edit_erase(Coord pos, int64_t len) {
} }
uint32_t start_row = point.row; uint32_t start_row = point.row;
uint32_t end_row = pos.row; uint32_t end_row = pos.row;
this->apply_hook_deletion(start_row + 1, end_row);
this->root = erase(this->root, start, byte_pos - start); this->root = erase(this->root, start, byte_pos - start);
if (this->parser) if (this->parser)
this->parser->edit(start_row, end_row - start_row, 0); this->parser->edit(start_row, end_row - start_row, 0);
this->hooks.edit(start_row, end_row - start_row, 0);
if (do_lsp) { if (do_lsp) {
auto lsp = this->lsp.load(); auto lsp = this->lsp.load();
if (lsp->incremental_sync) { if (lsp->incremental_sync) {
@@ -113,10 +113,10 @@ void Editor::edit_erase(Coord pos, int64_t len) {
} }
uint32_t start_row = pos.row; uint32_t start_row = pos.row;
uint32_t end_row = point.row; uint32_t end_row = point.row;
this->apply_hook_deletion(start_row + 1, end_row);
this->root = erase(this->root, byte_pos, end - byte_pos); this->root = erase(this->root, byte_pos, end - byte_pos);
if (this->parser) if (this->parser)
this->parser->edit(start_row, end_row - start_row, 0); this->parser->edit(start_row, end_row - start_row, 0);
this->hooks.edit(start_row, end_row - start_row, 0);
if (do_lsp) { if (do_lsp) {
auto lsp = this->lsp.load(); auto lsp = this->lsp.load();
if (lsp->incremental_sync) { if (lsp->incremental_sync) {
@@ -169,9 +169,9 @@ void Editor::edit_insert(Coord pos, char *data, uint32_t len) {
for (uint32_t i = 0; i < len; i++) for (uint32_t i = 0; i < len; i++)
if (data[i] == '\n') if (data[i] == '\n')
rows++; rows++;
this->apply_hook_insertion(pos.row, rows);
if (this->parser) if (this->parser)
this->parser->edit(pos.row, 0, rows); this->parser->edit(pos.row, 0, rows);
this->hooks.edit(pos.row, 0, rows);
auto lsp = this->lsp.load(); auto lsp = this->lsp.load();
if (lsp) { if (lsp) {
if (lsp->incremental_sync) { if (lsp->incremental_sync) {
@@ -234,6 +234,7 @@ void Editor::edit_replace(Coord start, Coord end, const char *text,
rows++; rows++;
if (this->parser) if (this->parser)
this->parser->edit(start.row, end.row - start.row, rows); this->parser->edit(start.row, end.row - start.row, rows);
this->hooks.edit(start.row, end.row - start.row, rows);
auto lsp = this->lsp.load(); auto lsp = this->lsp.load();
if (lsp) { if (lsp) {
if (lsp->incremental_sync) { if (lsp->incremental_sync) {

0
src/editor/editor.cc Normal file → Executable file
View File

15
src/editor/events.cc Normal file → Executable file
View File

@@ -96,7 +96,7 @@ void Editor::handle_event(KeyEvent event) {
this->jumper_set = false; this->jumper_set = false;
break; break;
case 'N': case 'N':
this->clear_hooks_at_line(this->cursor.row); this->hooks.clear_line(this->cursor.row);
break; break;
case 's': case 's':
case 'v': case 'v':
@@ -218,18 +218,11 @@ void Editor::handle_event(KeyEvent event) {
if (event.key_type == KEY_CHAR && event.len == 1 && if (event.key_type == KEY_CHAR && event.len == 1 &&
(event.c[0] >= '!' && event.c[0] <= '~')) { (event.c[0] >= '!' && event.c[0] <= '~')) {
if (this->jumper_set) { if (this->jumper_set) {
for (uint8_t i = 0; i < 94; i++) this->hooks.set(event.c[0], this->cursor.row);
if (this->hooks[i] == this->cursor.row + 1) {
this->hooks[i] = 0;
break;
}
this->hooks[event.c[0] - '!'] = this->cursor.row + 1;
} else { } else {
uint32_t line = this->hooks[event.c[0] - '!'] - 1; uint32_t line;
if (line > 0) { if (this->hooks.get(event.c[0], &line))
this->cursor = {line, 0}; this->cursor = {line, 0};
this->cursor_preffered = UINT32_MAX;
}
} }
} }
mode = NORMAL; mode = NORMAL;

0
src/editor/fluff.cc Executable file
View File

8
src/editor/helpers.cc Normal file → Executable file
View File

@@ -312,14 +312,6 @@ void Editor::delete_next_word() {
this->edit_erase(this->cursor, next_col_cluster); this->edit_erase(this->cursor, next_col_cluster);
} }
void Editor::clear_hooks_at_line(uint32_t line) {
for (uint8_t i = 0; i < 94; i++)
if (this->hooks[i] == line + 1) {
this->hooks[i] = 0;
break;
}
}
void Editor::cursor_prev_word() { void Editor::cursor_prev_word() {
uint32_t prev_col; uint32_t prev_col;
word_boundaries(this->cursor, &prev_col, nullptr, nullptr, nullptr); word_boundaries(this->cursor, &prev_col, nullptr, nullptr, nullptr);

0
src/editor/indents.cc Normal file → Executable file
View File

0
src/editor/lsp.cc Normal file → Executable file
View File

0
src/editor/move_line.cc Normal file → Executable file
View File

30
src/editor/renderer.cc Normal file → Executable file
View File

@@ -11,14 +11,7 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
EXTRA_META + static_cast<int>(std::log10(this->root->line_count + 1)); EXTRA_META + static_cast<int>(std::log10(this->root->line_count + 1));
uint32_t render_width = size.col - numlen; uint32_t render_width = size.col - numlen;
uint32_t render_x = pos.col + numlen + 1; uint32_t render_x = pos.col + numlen + 1;
std::vector<std::pair<uint32_t, char>> v; this->hooks.start_iter(this->scroll.row);
for (size_t i = 0; i < 94; ++i)
if (this->hooks[i] != 0)
v.push_back({this->hooks[i], '!' + i});
std::sort(v.begin(), v.end());
auto hook_it = v.begin();
while (hook_it != v.end() && hook_it->first <= this->scroll.row)
++hook_it;
auto warn_it = this->warnings.begin(); auto warn_it = this->warnings.begin();
while (warn_it != this->warnings.end() && warn_it->line < this->scroll.row) while (warn_it != this->warnings.end() && warn_it->line < this->scroll.row)
++warn_it; ++warn_it;
@@ -140,14 +133,9 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
while (current_byte_offset < line_len && rendered_rows < this->size.row) { while (current_byte_offset < line_len && rendered_rows < this->size.row) {
uint32_t color = this->cursor.row == line_index ? 0x222222 : 0; uint32_t color = this->cursor.row == line_index ? 0x222222 : 0;
if (current_byte_offset == 0 || rendered_rows == 0) { if (current_byte_offset == 0 || rendered_rows == 0) {
const char *hook = ""; char hook = this->hooks.next(line_index);
char h[2] = {0, 0}; update(pos.row + rendered_rows, pos.col, {hook, 0}, 0xAAAAAA, 0, 0, 0,
if (hook_it != v.end() && hook_it->first == line_index + 1) { 1);
h[0] = hook_it->second;
hook = h;
hook_it++;
}
update(pos.row + rendered_rows, pos.col, hook, 0xAAAAAA, 0, 0, 0, 1);
char buf[16]; char buf[16];
int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1); int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1);
uint32_t num_color = uint32_t num_color =
@@ -337,14 +325,8 @@ void Editor::render(std::vector<ScreenCell> &buffer, Coord size, Coord pos) {
if (line_len == 0 || if (line_len == 0 ||
(current_byte_offset >= line_len && rendered_rows == 0)) { (current_byte_offset >= line_len && rendered_rows == 0)) {
uint32_t color = this->cursor.row == line_index ? 0x222222 : 0; uint32_t color = this->cursor.row == line_index ? 0x222222 : 0;
const char *hook = ""; char hook = this->hooks.next(line_index);
char h[2] = {0, 0}; update(pos.row + rendered_rows, pos.col, {hook, 0}, 0xAAAAAA, 0, 0, 0, 1);
if (hook_it != v.end() && hook_it->first == line_index + 1) {
h[0] = hook_it->second;
hook = h;
hook_it++;
}
update(pos.row + rendered_rows, pos.col, hook, 0xAAAAAA, 0, 0, 0, 1);
char buf[16]; char buf[16];
int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1); int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1);
uint32_t num_color = this->cursor.row == line_index ? 0xFFFFFF : 0x555555; uint32_t num_color = this->cursor.row == line_index ? 0xFFFFFF : 0x555555;

0
src/editor/scroll.cc Normal file → Executable file
View File

0
src/editor/selection.cc Normal file → Executable file
View File

0
src/editor/worker.cc Normal file → Executable file
View File

0
src/extentions/completion.cc Normal file → Executable file
View File

0
src/extentions/diagnostics.cc Normal file → Executable file
View File

0
src/extentions/hover.cc Normal file → Executable file
View File

0
src/io/input.cc Normal file → Executable file
View File

0
src/io/knot.cc Normal file → Executable file
View File

0
src/io/renderer.cc Normal file → Executable file
View File

0
src/lsp/handlers.cc Normal file → Executable file
View File

0
src/lsp/process.cc Normal file → Executable file
View File

0
src/lsp/worker.cc Normal file → Executable file
View File

20
src/main.cc Normal file → Executable file
View File

@@ -8,9 +8,8 @@
#include "windows/decl.h" #include "windows/decl.h"
std::atomic<bool> running{true}; std::atomic<bool> running{true};
Queue<KeyEvent> event_queue;
fs::path pwd;
std::atomic<uint8_t> mode = NORMAL; std::atomic<uint8_t> mode = NORMAL;
fs::path pwd;
namespace ui { namespace ui {
Bar bar; Bar bar;
@@ -18,7 +17,7 @@ Bar bar;
void background_lsp() { void background_lsp() {
while (running) while (running)
throttle(8ms, lsp_worker); throttle(16ms, lsp_worker);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@@ -44,9 +43,15 @@ int main(int argc, char *argv[]) {
std::thread lsp_thread(background_lsp); std::thread lsp_thread(background_lsp);
while (running) { while (running) {
uint8_t consumed = 0; layout::focused_window->work();
render();
throttle(16ms, io_render);
KeyEvent event; KeyEvent event;
while (++consumed < 32 && (event = read_key()).key_type != KEY_NONE) { while (running && lsp::response_queue.empty() &&
(event = read_key()).key_type == KEY_NONE)
std::this_thread::sleep_for(1ms);
uint8_t consumed = 0;
do {
if (event.key_type != KEY_NONE) { if (event.key_type != KEY_NONE) {
if (event.key_type == KEY_CHAR && event.len == 1 && if (event.key_type == KEY_CHAR && event.len == 1 &&
event.c[0] == CTRL('q')) { event.c[0] == CTRL('q')) {
@@ -67,14 +72,11 @@ int main(int argc, char *argv[]) {
event.c) event.c)
free(event.c); free(event.c);
} }
} } while (++consumed < 32 && (event = read_key()).key_type != KEY_NONE);
std::unique_ptr<LSPMessage> msg; std::unique_ptr<LSPMessage> msg;
while (lsp::response_queue.pop(msg)) { while (lsp::response_queue.pop(msg)) {
msg->callback(*msg); msg->callback(*msg);
}; };
layout::focused_window->work();
render();
throttle(8ms, io_render);
} }
quit: quit:

0
src/ruby/bindings.cc Normal file → Executable file
View File

0
src/ruby/process.cc Normal file → Executable file
View File

0
src/syntax/bash.cc Normal file → Executable file
View File

0
src/syntax/parser.cc Normal file → Executable file
View File

Some files were not shown because too many files have changed in this diff Show More