Update installer

Signed-off-by: Syed Daanish <me@syedm.dev>

.clangd

@@ -1,7 +1,9 @@
 CompileFlags:
-  Add: [-I/home/syed/main/crib/include, -I/home/syed/main/crib/libs, -I/usr/include/ruby-3.4.0, -I/usr/include/ruby-3.4.0/x86_64-linux, c++20]
+  Add: [
+    -I/home/syed/main/crib/include,
+    -I/home/syed/main/crib/libs,
+    -I/home/syed/main/crib/libs/mruby/include,
+    -std=c++23
+  ]
   Remove: []
   Compiler: clang++
-
-HeaderInsertion:
-  Policy: Never

.gitattributes

@@ -1 +1 @@
-/libs/unicode_width/** linguist-vendored
+/libs/** linguist-vendored

.gitignore

@@ -3,6 +3,7 @@
 *.a
 *.o
 *.so
+!libs/libruby/libruby.so
 *.yml
 
 .vscode
@@ -16,4 +17,6 @@ bin
 Gemfile*
 .ruby-lsp/
 
+include/scripting/ruby_compiled.h
+
 __old__

.gitmodules

@@ -2,7 +2,7 @@
 	path = libs/libgrapheme
 	url = git://git.suckless.org/libgrapheme
   ignore = dirty
-[submodule "libs/utfcpp"]
+[submodule "libs/mruby"]
-	path = libs/utfcpp
+	path = libs/mruby
-  url = https://github.com/nemtrif/utfcpp.git
+  url = https://github.com/mruby/mruby.git
   ignore = dirty

Makefile

@@ -9,28 +9,30 @@ TARGET_RELEASE := $(BIN_DIR)/crib
 PCH_DEBUG := $(OBJ_DIR)/debug/pch.h.gch
 PCH_RELEASE := $(OBJ_DIR)/release/pch.h.gch
 
+GENERATED_HEADER := $(INCLUDE_DIR)/scripting/ruby_compiled.h
+
 CCACHE := ccache
 CXX := $(CCACHE) clang++
+CC := $(CCACHE) musl-clang
 
 CFLAGS_DEBUG :=\
-	-std=c++23 -Wall -Wextra -Wno-c23-extensions \
+	-std=c++20 -Wall -Wextra \
-	-O0 -fno-inline -gsplit-dwarf\
+	-O0 -fno-inline -gsplit-dwarf \
-	-g -fno-omit-frame-pointer\
+	-g -fno-omit-frame-pointer \
 	-Wno-unused-command-line-argument \
-	-I./include -I./libs \
+	-I./include -I./libs -I/home/syed/main/crib/libs/mruby/include
-	-I/usr/include/ruby-3.4.0 -I/usr/include/ruby-3.4.0/x86_64-linux
+# -fsanitize=address \
+
 CFLAGS_RELEASE :=\
-	-std=c++23 -O3 -march=native \
+	-static --target=x86_64-linux-musl \
-  -fno-rtti -fstrict-aliasing \
+	-std=c++20 -O3 -march=x86-64 -mtune=generic \
+  -fno-rtti \
 	-ffast-math -flto=thin \
-	-fvisibility=hidden -fuse-ld=lld \
+	-fvisibility=hidden \
 	-fomit-frame-pointer -DNDEBUG -s \
 	-mllvm -vectorize-loops \
-	-fno-unwind-tables -fno-asynchronous-unwind-tables\
 	-Wno-unused-command-line-argument \
-	-Wno-c23-extensions \
+	-I./include -I./libs -I/home/syed/main/crib/libs/mruby/include
-	-I./include -I./libs \
-	-I/usr/include/ruby-3.4.0 -I/usr/include/ruby-3.4.0/x86_64-linux
 
 PCH_CFLAGS_DEBUG := $(CFLAGS_DEBUG) -x c++-header
 PCH_CFLAGS_RELEASE := $(CFLAGS_RELEASE) -x c++-header
@@ -40,9 +42,13 @@ UNICODE_SRC := $(wildcard libs/unicode_width/*.c)
 UNICODE_OBJ_DEBUG := $(patsubst libs/unicode_width/%.c,$(OBJ_DIR)/debug/unicode_width/%.o,$(UNICODE_SRC))
 UNICODE_OBJ_RELEASE := $(patsubst libs/unicode_width/%.c,$(OBJ_DIR)/release/unicode_width/%.o,$(UNICODE_SRC))
 
-LIBS := \
+LIBS_RELEASE := \
-	libs/libgrapheme/libgrapheme.a \
+	libs/libgrapheme/libgrapheme.a ./libs/mruby/build/host/lib/libmruby.a \
-	-Wl,-Bstatic -lpcre2-8 -Wl,-Bdynamic -lmagic -lruby
+	-Wl,-Bstatic,--gc-sections -lpcre2-8
+
+LIBS_DEBUG := \
+	libs/libgrapheme/libgrapheme.a ./libs/mruby/build/host/lib/libmruby.a \
+	-Wl,-Bdynamic -lpcre2-8
 
 SRC := $(wildcard $(SRC_DIR)/**/*.cc) $(wildcard $(SRC_DIR)/*.cc)
 OBJ_DEBUG := $(patsubst $(SRC_DIR)/%.cc,$(OBJ_DIR)/debug/%.o,$(SRC))
@@ -59,6 +65,9 @@ test: $(TARGET_DEBUG)
 
 release: $(TARGET_RELEASE)
 
+$(GENERATED_HEADER): $(INCLUDE_DIR)/syntax/tokens.def $(INCLUDE_DIR)/scripting/libcrib.rb src/ruby_compile.sh
+	src/ruby_compile.sh
+
 $(PCH_DEBUG): $(INCLUDE_DIR)/pch.h
 	mkdir -p $(dir $@)
 	$(CXX) $(PCH_CFLAGS_DEBUG) -o $@ $<
@@ -69,27 +78,27 @@ $(PCH_RELEASE): $(INCLUDE_DIR)/pch.h
 
 $(TARGET_DEBUG): $(PCH_DEBUG) $(OBJ_DEBUG) $(UNICODE_OBJ_DEBUG)
 	mkdir -p $(BIN_DIR)
-	$(CXX) $(CFLAGS_DEBUG) -o $@ $(OBJ_DEBUG) $(UNICODE_OBJ_DEBUG) $(LIBS)
+	$(CXX) $(CFLAGS_DEBUG) -o $@ $(OBJ_DEBUG) $(UNICODE_OBJ_DEBUG) $(LIBS_DEBUG)
 
 $(TARGET_RELEASE): $(PCH_RELEASE) $(OBJ_RELEASE) $(UNICODE_OBJ_RELEASE)
 	mkdir -p $(BIN_DIR)
-	$(CXX) $(CFLAGS_RELEASE) -o $@ $(OBJ_RELEASE) $(UNICODE_OBJ_RELEASE) $(LIBS)
+	$(CXX) $(CFLAGS_RELEASE) -o $@ $(OBJ_RELEASE) $(UNICODE_OBJ_RELEASE) $(LIBS_RELEASE)
 
-$(OBJ_DIR)/debug/%.o: $(SRC_DIR)/%.cc $(PCH_DEBUG)
+$(OBJ_DIR)/debug/%.o: $(SRC_DIR)/%.cc $(PCH_DEBUG) $(GENERATED_HEADER)
 	mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS_DEBUG) -include $(INCLUDE_DIR)/pch.h -MMD -MP -c $< -o $@
 
-$(OBJ_DIR)/release/%.o: $(SRC_DIR)/%.cc $(PCH_RELEASE)
+$(OBJ_DIR)/release/%.o: $(SRC_DIR)/%.cc $(PCH_RELEASE) $(GENERATED_HEADER)
 	mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS_RELEASE) -include $(INCLUDE_DIR)/pch.h -MMD -MP -c $< -o $@
 
 $(OBJ_DIR)/debug/unicode_width/%.o: libs/unicode_width/%.c
 	mkdir -p $(dir $@)
-	$(CXX) $(CFLAGS_DEBUG) -MMD -MP -c $< -o $@
+	$(CC) -MMD -MP -c $< -o $@
 
 $(OBJ_DIR)/release/unicode_width/%.o: libs/unicode_width/%.c
 	mkdir -p $(dir $@)
-	$(CXX) $(CFLAGS_RELEASE) -MMD -MP -c $< -o $@
+	$(CC) -MMD -MP -c $< -o $@
 
 DEP_DEBUG += $(UNICODE_OBJ_DEBUG:.o=.d)
 DEP_RELEASE += $(UNICODE_OBJ_RELEASE:.o=.d)

README.md

@@ -12,6 +12,17 @@ It aims to be complete general purpose IDE.<br>
 (It is still very much a work in progress so a lot of things may seem incomplete)<br>
 For now it is just a single file editor. I plan to add a multi-file support with file pickers and tabs soon.<br>
 
+## Installation
+
+Binary can be installed with the following command:
+
+```bash
+curl https://syedm.dev/crib | sh
+```
+
+Currently only for Linux.<br>
+*Tested with arch linux and ubuntu and void*<br>
+
 ## Building
 
 ### Get started
@@ -40,10 +51,10 @@ Make sure you have the following dependencies installed (apart from the standard
   #include <pcre2.h>
   ```
 
-* **libmagic**
+* **[mruby](https://github.com/mruby/mruby)**
-  Install it so that you can include it in your code (most *nix systems have it installed):
+  Install it via your package manager. Once installed, the header should be available as:
   ```cpp
-  #include <magic.h>
+  #include <mruby.h>
   ```
 
 It also uses `xclip` at runtime for copying/pasting *(TODO: make it os portable)*.
@@ -54,7 +65,6 @@ And any modern terminal should work fine - preferably `kitty` or `wezterm`.<br>
 Some other dependancies are added as submodules or copied.<br>
    - `unicode_width` is compiled by the makefile so nothing to do there.<br>
    - `libgrapheme` needs to be compiled using `make` in it's folder.<br>
-   - ``
 
 #### LSPs
 
@@ -88,7 +98,7 @@ The following lsp's are added by default and can be installed anywhere in your `
 
 #### Compiler
 
-`clang++` should work fine but `c++23+` is required.<br>
+`g++` or `clang++` should work fine but `c++20+` is required.<br>
 Can remove `ccache` if you want from the makefile.<br>
 
 #### Compliling
@@ -134,7 +144,7 @@ TODO: add keybind information on how to set in `config/main.rb`
 - current line highlighting
 - all instances of current word under cursor highlighting
 
-#### syntax highlighting and filetype detection (using extention or libmagic) for:
+#### syntax highlighting and filetype detection for:
 - ruby
 <!-- TODO: -->
 <!-- - bash -->

TODO.md

@@ -2,33 +2,49 @@ Copyright 2025 Syed Daanish
 
 # TODO
 
+# memory usage for debug build (release build will be smaller by about 25%)
+```
+8K   ->    13.2M
+128K ->    13.2M (expected worst case 16.6M)
+128M ->   412.0M (expected worst case 2.3G)
+```
+
 ##### BTW Check each lsp with each of the features implemented
 
-* Static link pcre2-8 and libmagic and add precompiled libmagic magic database for better file detection
+* Possibly in the future limit memory usage by parser for larger files
+* Also redo lsp threads such that no mutex needed for any rope stuff
+    - This will mean that parsers/renderers and keystrokes will not need to be individually locked
+    - And so it will be much faster
+    - While at it also make the lsp instead of a single thread be a pool of threads blocking on their stdio
+    - So one lsp being slower wont affect others and fps based reading wont be necessary saving cpu
+    - At which point the main thread can also be blocked on user input or lsp responses and still be fast
+* [ ] Add mgems for most common things and a ruby library to allow combining true ruby with mruby
+* add command to set and use a file type at runtime
+* [ ] color alpha in ini files
+* [ ] Make warning before ctrl+q for saving
 * [ ] **LSP Bug:** Check why `fish-lsp` is behaving so off with completions filtering.
-* [ ] **Critical Crash:** Fix bug where closing immediately while LSP is still loading hangs and then segfaults (especially on slow ones like fish-lsp where quick edits and exit can hang).
 * [ ] **Line move:** fix the move line functions to work without the calculations from folds as folds are removed.
 * [ ] **Editor Indentation Fix:** - Main : merger indentation with the parser for more accurate results.
-    * [ ] Keep cache of language maps in engine to reduce lookup time.
-    * [ ] In indents add function to support tab which indents if before any content and inserts a pure \t otherwise.
-    * [ ] And backspace which undents if before any content.
-    * [ ] Add block indentation support.
     * [ ] Ignore comments/strings from parser when auto-indenting.
-    * [ ] These will dedent when the block immediately after them is dedented
+* [ ] **Readme:** Update readme to show ruby based config in detail.
-    * [ ] Dont dedent if ending is valid starting is invalid but also empty
-    * [ ] Just leave asis if starting is empty
-* [ ] **Readme:** Update readme to show ruby based config.
 * [ ] **UI Refinement:**
-    * [ ] Allow completion list to be scrolled; show only `x` max items.
     * [ ] Finish autocomplete box style functions.
 * [ ] **Documentation UI:** Capture `Ctrl+h` / `Ctrl+l` for scrolling documentation windows.
 * [ ] Redo hooks as a struct.
 * [ ] breakdown the render function into smaller functions.
+    - Might allow for VAI integration easier
 
 * Try to make all functions better now that folds have been purged
 * Cleanup syntax and renderer files
 
-* Add a thing called view which is a rect with speacial type editor . but otherwise a ruby or c++ view
+* add `:j<n>` command to jump to line \<n> in the current file
+* and many more stuff like ruby execution
+* and give warning for invalid commands
+* and upon escape clear the current command
+* allow multiline logging which captures the input entirely and y will copy the log and anything else will exit
+* it will then collapse to being the first line from the log only
+
+* **RN** Add a thing called view which is a rect with speacial type editor . but otherwise a ruby or c++ view
 * can be used for stuff like file manager/git manager/theme picker.
 * allow flushing functions in ruby to tell c++ to refresh keybinds/themes etc.
 * allow keybinds to be set in ruby
@@ -70,8 +86,6 @@ move lsp configs to json and also allow configs for windows-style vs unix-style
 
 ### UX
 
-* [ ] **Editor word highlighter:** Do not recompute word under cursor if not changed.
-
 * [ ] **Completion Filtering:**
     * [ ] Stop filtering case-sensitive.
     * [ ] Normalize completion edits if local filtering is used.
@@ -101,8 +115,6 @@ move lsp configs to json and also allow configs for windows-style vs unix-style
 
 ### Visuals, UI & Extensions?
 
-* [ ] **Status Bar:** Complete status bar and command runner.
-
 * [ ] Add color picker/palette.
 
 * [ ] **Git:** Add Git integration (status, diffs).

config/main.rb

@@ -1,7 +1,16 @@
+# Files can be insluded using Kernel#require_relative
+# but it can be called with binding as the second argument
+# skipping it will call it with global binding which is usually fine
+# Kernel#load can also be used
+
+require_relative "theme"
+
 # basic configuration
 # This can also be used to do speacail configs for different projects.
 # its ruby guys script whatever you want.
 
+# puts "Loading main config..."
+
 C.startup do
   puts "Starting crib..."
 end
@@ -10,67 +19,30 @@ C.shutdown do
   puts "Exiting crib..."
 end
 
-# this can be modified by the user during runtime through keybindings
+# TODO: to be done once a proper api for binding and window drawing is made
-# But i need to know how to ever read this value only when needed.
+#       The binds will be connected to either `editor` or windows where editor can
-# maybe i can write a function that notifies if theme maybe changed then reload
+#       only use a preset set of stuff to bind while teh windows are purely custom
-# It can also be scripted to load different theme formats into a hash usable by crib
+# # this part uses dsl bindings to define the bind function
-C.theme = {
+# # Hopefully extend to give more context/power to bindings
-  :default => { fg: 0xEEEEEE },
+# # but try to keep simple for performance
-  :shebang => { fg: 0x7DCFFF },
+# # for default keybindings
-  :error => { fg: 0xEF5168 },
+# C.bind [:normal, :select], :a => "insert_mode"
-  :comment => { fg: 0xAAAAAA, italic: true },
+# # for custom keybindings
-  :string => { fg: 0xAAD94C },
+# C.bind :select, [:x, :c] do
-  :escape => { fg: 0x7DCFFF },
+#   puts "cut"
-  :interpolation => { fg: 0x7DCFFF },
+# end
-  :regexp => { fg: 0xD2A6FF },
+# C.bind :jumper do
-  :number => { fg: 0xE6C08A },
+#   set [:x, :c] do
-  # rubocop:disable Lint/BooleanSymbol
+#     puts "jump to first bookmark"
-  :true => { fg: 0x7AE93C },
+#   end
-  :false => { fg: 0xEF5168 },
+# end
-  # rubocop:enable Lint/BooleanSymbol
+# # they can also be defined conditionally
-  :char => { fg: 0xFFAF70 },
+# # This code is just an example and doesnt actually work
-  :keyword => { fg: 0xFF8F40 },
+# if using_tmux?
-  :keywordoperator => { fg: 0xF07178 },
+#   bind :C-p do
-  :operator => { fg: 0xFFFFFF, italic: true },
+#     system("tmux select-pane -U")
-  :function => { fg: 0xFFAF70 },
+#   end
-  :type => { fg: 0xF07178 },
+# end
-  :constant => { fg: 0x7DCFFF },
-  :variableinstance => { fg: 0x95E6CB },
-  :variableglobal => { fg: 0xF07178 },
-  :annotation => { fg: 0x7DCFFF },
-  :directive => { fg: 0xFF8F40 },
-  :label => { fg: 0xD2A6FF },
-  :brace1 => { fg: 0xD2A6FF },
-  :brace2 => { fg: 0xFFAFAF },
-  :brace3 => { fg: 0xFFFF00 },
-  :brace4 => { fg: 0x0FFF0F },
-  :brace5 => { fg: 0xFF0F0F }
-}
-
-# # TODO: to be done once a proper api for binding and window drawing is made
-# #       The binds will be connected to either `editor` or windows where editor can
-# #       only use a preset set of stuff to bind while teh windows are purely custom
-# # # this part uses dsl bindings to define the bind function
-# # # Hopefully extend to give more context/power to bindings
-# # # but try to keep simple for performance
-# # # for default keybindings
-# # C.bind [:normal, :select], :a => "insert_mode"
-# # # for custom keybindings
-# # C.bind :select, [:x, :c] do
-# #   puts "cut"
-# # end
-# # C.bind :jumper do
-# #   set [:x, :c] do
-# #     puts "jump to first bookmark"
-# #   end
-# # end
-# # # they can also be defined conditionally
-# # # This code is just an example and doesnt actually work
-# # if using_tmux?
-# #   bind :C-p do
-# #     system("tmux select-pane -U")
-# #   end
-# # end
 
 # This can, for example, be modified by user bindings during runtime
 # TODO: dynamic registration to actually be implemented once keybinds and extentions are implemented
@@ -82,23 +54,22 @@ C.theme = {
 #   symbol: "󰴭 ",
 #   extensions: ["rb"],
 #   filenames: ["Gemfile"],
-#   mimetypes: ["text/x-ruby"],
 #   lsp: "solargraph"
 # }
 
 C.line_endings = :auto_unix # or :unix or :windows or :auto_windows
 
-# C.extra_highlights do |_line, _idx|
+C.extra_highlights do |_line, _idx|
-#   # the return can be an array of
+  # the return can be an array of
-#   # [fg, bg. flags, start, end]
+  # [fg, bg. flags, start, end]
-#   # where fg and bg are integers (using 24 bit color)
+  # where fg and bg are integers (using 24 bit color)
-#   # and flags is a bitmask of bold/underline/italic etc
+  # and flags is a bitmask of bold/underline/italic etc
-#   # and start and end are integers strictly inside the line
+  # and start and end are integers strictly inside the line
-#   return []
+  return []
-# end
+end
 
 # The highlighter will be aplied to the language as long as the langauge is defined in C.languages
-C.highlighters[:ruby_n] = {
+C.highlighters[:string] = {
   parser: ->(line, state, line_idx) {
     # the return value is a hash
     # it contains the state and the highlights

config/theme.rb

@@ -0,0 +1,36 @@
+# this can be modified by the user during runtime through keybindings
+# But i need to know how to ever read this value only when needed.
+# maybe i can write a function that notifies if theme maybe changed then reload
+# It can also be scripted to load different theme formats into a hash usable by crib
+C.theme = {
+  :default => { fg: 0xEEEEEE },
+  :shebang => { fg: 0x7DCFFF },
+  :error => { fg: 0xEF5168 },
+  :comment => { fg: 0xAAAAAA, italic: true },
+  :string => { fg: 0xAAD94C },
+  :escape => { fg: 0x7DCFFF },
+  :interpolation => { fg: 0x7DCFFF },
+  :regexp => { fg: 0xD2A6FF },
+  :number => { fg: 0xE6C08A },
+  # rubocop:disable Lint/BooleanSymbol
+  :true => { fg: 0x7AE93C },
+  :false => { fg: 0xEF5168 },
+  # rubocop:enable Lint/BooleanSymbol
+  :char => { fg: 0xFFAF70 },
+  :keyword => { fg: 0xFF8F40 },
+  :keywordoperator => { fg: 0xF07178 },
+  :operator => { fg: 0xFFFFFF, italic: true },
+  :function => { fg: 0xFFAF70 },
+  :type => { fg: 0xF07178 },
+  :constant => { fg: 0x7DCFFF },
+  :variableinstance => { fg: 0x95E6CB },
+  :variableglobal => { fg: 0xF07178 },
+  :annotation => { fg: 0x7DCFFF },
+  :directive => { fg: 0xFF8F40 },
+  :label => { fg: 0xD2A6FF },
+  :brace1 => { fg: 0xD2A6FF },
+  :brace2 => { fg: 0xFFAFAF },
+  :brace3 => { fg: 0xFFFF00 },
+  :brace4 => { fg: 0x0FFF0F },
+  :brace5 => { fg: 0xFF0F0F }
+}

include/editor/completions.h

@@ -27,9 +27,10 @@ struct CompletionSession {
   bool active = false;
   Coord hook;
   std::optional<std::string> prefix;
-  uint8_t select = 0;
+  uint32_t select = 0;
+  uint32_t scroll = 0;
   std::vector<CompletionItem> items;
-  std::vector<uint8_t> visible;
+  std::vector<uint32_t> visible;
   bool complete = true;
   std::optional<char> trigger_char;
   uint8_t trigger = 0;

include/editor/editor.h

@@ -17,11 +17,9 @@
 #define WORD 1
 #define LINE 2
 
-#define EXTRA_META 4
+#define EXTRA_META 2
 #define INDENT_WIDTH 2
 
-// autocomplete lua// Bracket closing / tab on enter
-
 struct Editor {
   std::string filename;
   std::string uri;
@@ -31,7 +29,7 @@ struct Editor {
   uint32_t cursor_preffered;
   Coord selection;
   bool selection_active;
-  bool unix_eol; // false for windows
+  bool unix_eol;
   int selection_type;
   Coord position;
   Coord size;

include/editor/helpers.h

@@ -17,6 +17,8 @@ void fetch_lsp_hover(Editor *editor);
 void handle_mouse(Editor *editor, KeyEvent event);
 void indent_current_line(Editor *editor);
 void dedent_current_line(Editor *editor);
+void indent_selection(Editor *editor);
+void dedent_selection(Editor *editor);
 void paste(Editor *editor);
 void copy(Editor *editor);
 void cut(Editor *editor);

include/editor/indents.h

@@ -112,12 +112,18 @@ struct IndentationEngine {
   uint32_t set_indent(uint32_t row, int64_t indent_level);
   uint32_t indent_line(uint32_t row);
   uint32_t dedent_line(uint32_t row);
+  void indent_block(uint32_t start_row, uint32_t end_row, int delta);
   void indent_block(uint32_t start, uint32_t end);
   void dedent_block(uint32_t start, uint32_t end);
   // fixes a autocomplete block's indentation
   char *block_to_asis(Coord cursor, std::string source, uint32_t *out_len);
 
 private:
+  const std::vector<std::string> *start_end = nullptr;
+  const std::vector<std::string> *start_start = nullptr;
+  const std::vector<std::string> *end_full = nullptr;
+  const std::vector<std::string> *end_start = nullptr;
+
   // TODO: Ignore comments/strings too
   // returns the indent level of the line itself or of the previous non-empty
   uint32_t indent_expected(uint32_t row);

include/io/knot.h

@@ -115,8 +115,8 @@ LineIterator *begin_l_iter(Knot *root, uint32_t start_line);
 // Each subsequent call returns the next line as a null terminated string
 // `it` is the iterator returned from begin_l_iter
 // After getting the necessary lines free the iterator (no need to go upto
-// the end) returns null if there are no more lines All return strings
+// the end) returns null if there are no more lines
-// `must` be freed by the caller
+// The string must not be freed
 char *next_line(LineIterator *it, uint32_t *out_len);
 
 // Returns the previous line as a null terminated string

include/lsp/lsp.h

@@ -6,12 +6,17 @@
 #include "utils/utils.h"
 
 struct LSPPending {
-  std::string method;
   Editor *editor = nullptr;
-
+  std::function<void(Editor *, const json &)> callback;
-  std::function<void(Editor *, std::string, json)> callback;
 };
 
+// TODO: Defer any editor mutation to main thread to get rid of
+//       all mutex locks on the editor rope.
+// struct LSPPendingResponse {
+//   LSPPending *pending = nullptr;
+//   json message;
+// };
+
 struct LSPOpenRequest {
   Language language;
   Editor *editor;
@@ -80,6 +85,7 @@ void lsp_worker();
 std::shared_ptr<LSPInstance> get_or_init_lsp(std::string lsp_id);
 void clean_lsp(std::shared_ptr<LSPInstance> lsp, std::string lsp_id);
 void close_lsp(std::string lsp_id);
+std::optional<json> read_lsp_message(int fd);
 
 void open_editor(std::shared_ptr<LSPInstance> lsp,
                  std::pair<Language, Editor *> entry);

include/main.h

@@ -2,6 +2,7 @@
 #define MAIN_H
 
 #include "pch.h"
+#include "ui/bar.h"
 
 #define NORMAL 0
 #define INSERT 1
@@ -13,5 +14,6 @@ extern std::atomic<bool> running;
 extern std::atomic<uint8_t> mode;
 extern std::vector<struct Editor *> editors;
 extern uint8_t current_editor;
+extern Bar bar;
 
 #endif

include/pch.h

@@ -4,11 +4,12 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #define PCRE_WORKSPACE_SIZE 512
 
-#pragma clang diagnostic push
+#include "mruby.h"
-#pragma clang diagnostic ignored "-Wunused-parameter"
+#include "mruby/array.h"
-#include <ruby.h>
+#include "mruby/compile.h"
-#pragma clang diagnostic pop
+#include "mruby/hash.h"
-#include <magic.h>
+#include "mruby/irep.h"
+#include "mruby/string.h"
 #include <nlohmann/json.hpp>
 #include <pcre2.h>
 extern "C" {

include/scripting/decl.h

@@ -4,19 +4,50 @@
 #include "syntax/decl.h"
 #include "utils/utils.h"
 
-extern std::unordered_map<std::string, std::pair<VALUE, VALUE>>
+namespace fs = std::filesystem;
-    custom_highlighters;
 
+extern std::unordered_map<std::string, std::pair<mrb_value, mrb_value>>
+    custom_highlighters;
+extern mrb_state *mrb;
+extern fs::path ruby_config_path;
+
+struct BarLight {
+  uint32_t start;
+  uint32_t end;
+  Highlight highlight;
+};
+
+struct BarLine {
+  std::string line;
+  std::vector<BarLight> highlights;
+
+  Highlight get_highlight(uint32_t x) {
+    for (auto &hl : highlights) {
+      if (hl.start <= x && x <= hl.end)
+        return hl.highlight;
+    }
+    return {0xFFFFFF, 0, 0};
+  }
+};
+
+void setup_ruby_bindings(mrb_state *mrb, RClass *C_module);
 void ruby_start();
 void ruby_shutdown();
-void ruby_log(std::string msg);
+void ruby_copy(const char *text, size_t len);
+std::string ruby_paste();
+std::string ruby_file_detect(std::string filename);
 void load_theme();
 void load_languages_info();
 uint8_t read_line_endings();
 void load_custom_highlighters();
-VALUE parse_custom(std::vector<Token> *tokens, VALUE parser_block,
+bool custom_compare(mrb_value match_block, std::string state1,
-                   const char *line, uint32_t len, VALUE state,
+                    std::string state2);
-                   uint32_t line_num);
+std::string parse_custom(std::vector<Token> *tokens, mrb_value parser_block,
-bool custom_compare(VALUE match_block, VALUE state1, VALUE state2);
+                         const char *line, uint32_t len, std::string state,
+                         uint32_t c_line);
+BarLine bar_contents(uint8_t mode, std::string lang_name, uint32_t warnings,
+                     std::string lsp_name, std::string filename,
+                     std::string foldername, uint32_t line, uint32_t max_line,
+                     uint32_t width);
 
 #endif

include/scripting/libcrib.rb

@@ -1,3 +1,66 @@
+def command_exists?(cmd)
+  system("command -v #{cmd} > /dev/null 2>&1")
+end
+
+module Clipboard
+  @clip = ""
+  @os = :os_name_placed_here
+
+  class << self
+    def copy(text)
+      if @os == :windows
+        IO.popen("clip", "w") { |f| f.write(text) }
+      elsif @os == :mac
+        IO.popen("pbcopy", "w") { |f| f.write(text) }
+      elsif @os == :linux
+        if ENV["XDG_SESSION_TYPE"]&.downcase == "wayland" || ENV["WAYLAND_DISPLAY"]
+          if command_exists?("wl-copy")
+            IO.popen("wl-copy", "w") { |f| f.write(text) }
+          else
+            osc52_copy(text)
+          end
+        elsif ENV["XDG_SESSION_TYPE"]&.downcase == "x11" || ENV["DISPLAY"]
+          if command_exists?("xsel")
+            IO.popen("xsel --clipboard --input", "w") { |f| f.write(text) }
+          elsif command_exists?("xclip")
+            IO.popen("xclip -selection clipboard", "w") { |f| f.write(text) }
+          else
+            osc52_copy(text)
+          end
+        end
+      end
+      @clip = text
+    end
+    def paste
+      if @os == :windows
+        return `powershell -NoProfile -Command Get-Clipboard`
+      elsif @os == :mac
+        return `pbpaste`
+      elsif @os == :linux
+        if ENV["XDG_SESSION_TYPE"]&.downcase == "wayland" || ENV["WAYLAND_DISPLAY"]
+          if command_exists?("wl-copy")
+            return `wl-paste`
+          end
+        elsif ENV["XDG_SESSION_TYPE"]&.downcase == "x11" || ENV["DISPLAY"]
+          if command_exists?("xsel")
+            return `xsel --clipboard --output`
+          elsif command_exists?("xclip")
+            return `xclip -selection clipboard -o`
+          else
+            return @clip
+          end
+        end
+      end
+      return ""
+    end
+    def osc52_copy(text)
+      encoded = [text].pack("m0")
+      print "\e]52;c;#{encoded}\a"
+      text
+    end
+  end
+end
+
 module C
   @lsp_config = {
     "clangd" => [
@@ -36,256 +99,186 @@ module C
       color: 0x555555,
       symbol: " ",
       extensions: ["c"],
-      filenames: [],
-      mimetypes: ["text/x-c"],
       lsp: "clangd"
     },
     cpp: {
       color: 0x00599C,
       symbol: " ",
       extensions: ["cpp", "cc", "cxx"],
-      filenames: [],
-      mimetypes: ["text/x-cpp"],
       lsp: "clangd"
     },
     h: {
       color: 0xA8B9CC,
       symbol: " ",
       extensions: ["h", "hpp"],
-      filenames: [],
-      mimetypes: ["text/x-c-header"],
       lsp: "clangd"
     },
     css: {
       color: 0x36a3d9,
       symbol: " ",
       extensions: ["css"],
-      filenames: [],
-      mimetypes: ["text/css"],
       lsp: "vscode-css-language-server"
     },
     fish: {
       color: 0x4d5a5e,
       symbol: " ",
       extensions: ["fish"],
-      filenames: [],
-      mimetypes: ["application/x-fish"],
       lsp: "fish-lsp"
     },
     go: {
       color: 0x00add8,
       symbol: " ",
       extensions: ["go"],
-      filenames: [],
-      mimetypes: ["text/x-go"],
       lsp: "gopls"
     },
     gomod: {
       color: 0x00add8,
       symbol: " ",
       extensions: ["mod"],
-      filenames: [],
-      mimetypes: ["text/x-go-mod"],
       lsp: "gopls"
     },
     haskell: {
       color: 0xa074c4,
       symbol: " ",
       extensions: ["hs", "lhs"],
-      filenames: [],
-      mimetypes: ["text/x-haskell"],
       lsp: "haskell-language-server"
     },
     html: {
       color: 0xef8a91,
       symbol: " ",
       extensions: ["html", "htm"],
-      filenames: [],
-      mimetypes: ["text/html"],
       lsp: "emmet-language-server"
     },
     javascript: {
       color: 0xf0df8a,
       symbol: " ",
       extensions: ["js"],
-      filenames: [],
-      mimetypes: ["application/javascript"],
       lsp: "typescript-language-server"
     },
     typescript: {
       color: 0x36a3d9,
       symbol: " ",
       extensions: ["ts"],
-      filenames: [],
-      mimetypes: ["application/typescript"],
       lsp: "typescript-language-server"
     },
     json: {
       color: 0xcbcb41,
       symbol: "{}",
       extensions: ["json"],
-      filenames: [],
-      mimetypes: ["application/json"],
       lsp: "vscode-json-language-server"
     },
     jsonc: {
       color: 0xcbcb41,
       symbol: "{}",
       extensions: ["jsonc"],
-      filenames: [],
-      mimetypes: ["application/json"],
       lsp: "vscode-json-language-server"
     },
     erb: {
       color: 0x6e1516,
       symbol: " ",
       extensions: ["erb"],
-      filenames: [],
-      mimetypes: ["text/x-erb"],
       lsp: "ruby-lsp"
     },
     lua: {
       color: 0x36a3d9,
       symbol: "󰢱 ",
       extensions: ["lua"],
-      filenames: [],
-      mimetypes: ["text/x-lua"],
       lsp: "lua-language-server"
     },
     python: {
       color: 0x95e6cb,
       symbol: "󰌠 ",
       extensions: ["py"],
-      filenames: [],
-      mimetypes: ["text/x-python"],
       lsp: "pyright"
     },
     rust: {
       color: 0xdea584,
       symbol: "󱘗 ",
       extensions: ["rs"],
-      filenames: [],
-      mimetypes: ["text/x-rust"],
       lsp: "rust-analyzer"
     },
     php: {
       color: 0xa074c4,
       symbol: "󰌟 ",
       extensions: ["php"],
-      filenames: [],
-      mimetypes: ["application/x-php"],
       lsp: "intelephense"
     },
     markdown: {
       color: 0x36a3d9,
       symbol: " ",
       extensions: ["md", "markdown"],
-      filenames: [],
-      mimetypes: ["text/markdown"],
       lsp: "marksman"
     },
     nginx: {
       color: 0x6d8086,
       symbol: " ",
       extensions: ["conf"],
-      filenames: [],
-      mimetypes: ["text/nginx"],
       lsp: "nginx-language-server"
     },
     toml: {
       color: 0x36a3d9,
       symbol: " ",
       extensions: ["toml"],
-      filenames: [],
-      mimetypes: ["application/toml"],
       lsp: "taplo"
     },
     yaml: {
       color: 0x6d8086,
       symbol: " ",
       extensions: ["yml", "yaml"],
-      filenames: [],
-      mimetypes: ["text/yaml"],
       lsp: "yaml-language-server"
     },
     sql: {
       color: 0xdad8d8,
       symbol: " ",
       extensions: ["sql"],
-      filenames: [],
-      mimetypes: ["text/x-sql"],
       lsp: "sqls"
     },
     make: {
       color: 0x4e5c61,
       symbol: " ",
       extensions: ["Makefile", "makefile"],
-      filenames: [],
-      mimetypes: ["text/x-makefile"],
       lsp: "make-language-server"
     },
     gdscript: {
       color: 0x6d8086,
       symbol: " ",
-      extensions: ["gd"],
+      extensions: ["gd"]
-      filenames: [],
-      mimetypes: ["text/x-gdscript"],
-      lsp: nil
     },
     man: {
       color: 0xdad8d8,
       symbol: " ",
-      extensions: ["man"],
+      extensions: ["man"]
-      filenames: [],
-      mimetypes: ["application/x-troff-man"],
-      lsp: nil
     },
     diff: {
       color: 0xDD4C35,
       symbol: " ",
-      extensions: ["diff", "patch"],
+      extensions: ["diff", "patch"]
-      filenames: [],
-      mimetypes: ["text/x-diff"],
-      lsp: nil
     },
     gitattributes: {
       color: 0xF05032,
       symbol: " ",
-      extensions: ["gitattributes"],
+      extensions: ["gitattributes"]
-      filenames: [],
-      mimetypes: [],
-      lsp: nil
     },
     gitignore: {
       color: 0xF05032,
       symbol: " ",
-      extensions: ["gitignore"],
+      extensions: ["gitignore"]
-      filenames: [],
-      mimetypes: [],
-      lsp: nil
     },
     regex: {
       color: 0x9E9E9E,
       symbol: ".*",
-      extensions: ["regex"],
+      extensions: ["regex"]
-      filenames: [],
-      mimetypes: [],
-      lsp: nil
     },
     ini: {
       color: 0x6d8086,
       symbol: " ",
-      extensions: ["ini"],
+      extensions: ["ini"]
-      filenames: [],
-      mimetypes: [],
-      lsp: nil
     },
     ruby: {
       color: 0xff8087,
       symbol: "󰴭 ",
       extensions: ["rb"],
       filenames: ["Gemfile"],
-      mimetypes: ["text/x-ruby"],
       lsp: "solargraph"
     },
     bash: {
@@ -293,8 +286,12 @@ module C
       symbol: " ",
       extensions: ["sh"],
       filenames: ["bash_profile", "bashrc"],
-      mimetypes: ["text/x-sh"],
       lsp: "bash-language-server"
+    },
+    default: {
+      color: 0x6d8086,
+      symbol: "󰈚 ",
+      extensions: []
     }
   }
   @theme = {
@@ -307,10 +304,8 @@ module C
     :interpolation => { fg: 0x7DCFFF },
     :regexp => { fg: 0xD2A6FF },
     :number => { fg: 0xE6C08A },
-    # rubocop:disable Lint/BooleanSymbol
     :true => { fg: 0x7AE93C },
     :false => { fg: 0xEF5168 },
-    # rubocop:enable Lint/BooleanSymbol
     :char => { fg: 0xFFAF70 },
     :keyword => { fg: 0xFF8F40 },
     :keywordoperator => { fg: 0xF07178 },
@@ -333,14 +328,96 @@ module C
   @key_handlers = {}
   @key_binds = {}
   @highlighters = {}
-  @log_queue = []
   @b_startup = nil
   @b_shutdown = nil
+  @b_bar = proc do |info|
+    # mode, lang_name, warnings, lsp_name, filename, foldername, line, max_line, width
+    # puts info.inspect
+    mode_color = 0x82AAFF
+    mode_symbol = "  "
+    case info[:mode]
+    when :normal
+      mode_color = 0x82AAFF
+      mode_symbol = " "
+    when :insert
+      mode_color = 0xFF8F40
+      mode_symbol = "󱓧 "
+    when :select
+      mode_color = 0x9ADE7A
+      mode_symbol = "󱩧 "
+    when :runner
+      mode_color = 0xFFD700
+      mode_symbol = " "
+    when :jumper
+      mode_color = 0xF29CC3
+      mode_symbol = " "
+    end
+    lang_info = C.languages[info[:lang_name]]
+    if lang_info.nil?
+      lang_info = C.languages[:default]
+    end
+    filename = File.basename(info[:filename])
+    starting = " #{mode_symbol} #{info[:mode].to_s.upcase}  #{lang_info[:symbol]}#{filename}"
+    highlights = []
+    highlights << { fg: 0x0b0e14, bg: mode_color, flags: 1 << 1, start: 0, length: 10 }
+    highlights << { fg: mode_color, bg: 0x33363c, start: 10, length: 1 }
+    highlights << { fg: 0x33363c, bg: 0x24272d, start: 11, length: 1 }
+    highlights << { fg: lang_info[:color], bg: 0x24272d, start: 13, length: 2 }
+    highlights << { fg: 0xced4df, bg: 0x24272d, start: 15, length: filename.length }
+    highlights << { fg: 0x24272d, bg: 0x000000, start: 15 + filename.length, length: 1 }
+    next {
+      text: starting,
+      highlights: highlights
+    }
+  end
+  @b_copy = proc do |text|
+    Clipboard.copy(text)
+  end
+  @b_paste = proc do
+    next Clipboard.paste
+  end
+  @b_file_detect = proc do |filename|
+    type = :default
+    next type unless File.exist?(filename)
+    first_line = File.open(filename, &:readline).chomp
+    if first_line.start_with?("#!")
+      shebang = first_line[2..].downcase
+      type = case shebang
+             when /bash/, /sh/   then :bash
+             when /fish/         then :fish
+             when /python/       then :python
+             when /ruby/         then :ruby
+             when /lua/          then :lua
+             else :default
+             end
+      next type
+    end
+    next type if :os_name_placed_here != :linux || :os_name_placed_here != :mac
+    next type if !command_exists?("file")
+    mimetype = `file --mime-type -b #{filename}`.chomp
+    type = case mimetype
+           when /shellscript/ then :bash
+           when /ruby/        then :ruby
+           when /diff/        then :diff
+           when /html/        then :html
+           when /python/      then :python
+           when /javascript/  then :javascript
+           when /makefile/    then :makefile
+           when /-c$/         then :c
+           else :default
+           end
+    next type
+  end
 
   class << self
     attr_accessor :theme, :lsp_config, :languages,
                   :line_endings, :highlighters
-    attr_reader :b_startup, :b_shutdown, :b_extra_highlights
+    attr_reader :b_startup, :b_shutdown, :b_extra_highlights,
+                :b_bar, :b_copy, :b_paste, :b_file_detect
+
+    def bar=(&block)
+      @b_bar = block
+    end
 
     def startup(&block)
       @b_startup = block
@@ -350,15 +427,16 @@ module C
       @b_shutdown = block
     end
 
-    def queue_log(msg)
+    def copy(&block)
-      @log_queue << msg
+      @b_copy = block
     end
 
-    def log_all
+    def paste(&block)
-      @log_queue.each do |msg|
+      @b_paste = block
-        puts msg
     end
-      @log_queue = []
+
+    def file_detect(&block)
+      @b_file_detect = block
     end
 
     def extra_highlights(&block)
@@ -397,4 +475,21 @@ module C
   end
 end
 
-at_exit { C.log_all }
+$LOADED ||= []
+
+module Kernel
+  def require_relative(path, bind = nil)
+    path += ".rb" unless path.end_with?(".rb")
+    path = File.expand_path(path, File.dirname(C.config_file))
+    return if $LOADED.include?(path)
+    $LOADED << path
+    code = File.read(path)
+    eval(code, bind || binding, path)
+  end
+  def load(path, bind = nil)
+    path += ".rb" unless path.end_with?(".rb")
+    path = File.expand_path(path, File.dirname(C.config_file))
+    $LOADED.delete(path)
+    require_relative(path, bind)
+  end
+end

include/syntax/decl.h

@@ -3,6 +3,7 @@
 
 #include "io/knot.h"
 #include "io/sysio.h"
+#include "pch.h"
 #include "syntax/trie.h"
 
 struct Highlight {
@@ -26,24 +27,6 @@ const std::unordered_map<std::string, TokenKind> kind_map = {
 #undef ADD
 };
 
-constexpr const char tokens_def[] = "module Tokens\n"
-#define STRINGIFY_HELPER(x) #x
-#define STRINGIFY(x) STRINGIFY_HELPER(x)
-#define ADD(name) "  " #name " = " STRINGIFY(__COUNTER__) "\n"
-#include "syntax/tokens.def"
-#undef ADD
-#undef STRINGIFY
-#undef STRINGIFY_HELPER
-                                    "  freeze\n"
-                                    "end";
-
-constexpr const char crib_module[] = {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc23-extensions"
-#embed "libcrib.rb"
-#pragma clang diagnostic pop
-    , '\0'};
-
 extern std::array<Highlight, TOKEN_KIND_COUNT> highlights;
 
 struct Token {
@@ -58,10 +41,4 @@ struct LineData {
   std::shared_ptr<void> out_state{nullptr};
 };
 
-struct CustomState {
-  VALUE state;
-  CustomState(VALUE s) : state(s) { rb_gc_register_address(&state); }
-  ~CustomState() { rb_gc_unregister_address(&state); }
-};
-
 #endif

include/syntax/langs.h

@@ -1,6 +1,7 @@
 #ifndef SYNTAX_LANGS_H
 #define SYNTAX_LANGS_H
 
+#include "scripting/decl.h"
 #include "syntax/decl.h"
 
 #define DEF_LANG(name)                                                         \

include/syntax/line_tree.h

@@ -5,17 +5,12 @@
 
 struct LineTree {
   void clear() {
-    std::unique_lock lock(mtx);
     clear_node(root);
     root = nullptr;
     stack_size = 0;
   }
-  void build(uint32_t x) {
+  void build(uint32_t x) { root = build_node(x); }
-    std::unique_lock lock(mtx);
-    root = build_node(x);
-  }
   LineData *at(uint32_t x) {
-    std::shared_lock lock(mtx);
     LineNode *n = root;
     while (n) {
       uint32_t left_size = n->left ? n->left->size : 0;
@@ -31,7 +26,6 @@ struct LineTree {
     return nullptr;
   }
   LineData *start_iter(uint32_t x) {
-    std::shared_lock lock(mtx);
     stack_size = 0;
     LineNode *n = root;
     while (n) {
@@ -52,7 +46,6 @@ struct LineTree {
   }
   void end_iter() { stack_size = 0; }
   LineData *next() {
-    std::shared_lock lock(mtx);
     while (stack_size) {
       auto &f = stack[stack_size - 1];
       LineNode *n = f.node;
@@ -73,21 +66,16 @@ struct LineTree {
     return nullptr;
   }
   void insert(uint32_t x, uint32_t y) {
-    std::unique_lock lock(mtx);
     if (x > subtree_size(root))
       x = subtree_size(root);
     root = insert_node(root, x, y);
   }
   void erase(uint32_t x, uint32_t y) {
-    std::unique_lock lock(mtx);
     if (x + y > subtree_size(root))
       x = subtree_size(root) - y;
     root = erase_node(root, x, y);
   }
-  uint32_t count() {
+  uint32_t count() { return subtree_size(root); }
-    std::shared_lock lock(mtx);
-    return subtree_size(root);
-  }
   ~LineTree() { clear(); }
 
 private:
@@ -117,7 +105,6 @@ private:
   LineNode *root = nullptr;
   Frame stack[32];
   std::atomic<uint8_t> stack_size = 0;
-  std::shared_mutex mtx;
   static constexpr uint32_t LEAF_TARGET = 256;
   LineTree::LineNode *erase_node(LineNode *n, uint32_t x, uint32_t y) {
     if (!n || y == 0)

include/syntax/parser.h

@@ -14,18 +14,16 @@ struct Parser {
                                       uint32_t line_num);
   bool (*state_match_func)(std::shared_ptr<void> state_1,
                            std::shared_ptr<void> state_2);
-  VALUE parser_block = Qnil;
+  mrb_value parser_block = mrb_nil_value();
-  VALUE match_block = Qnil;
+  mrb_value match_block = mrb_nil_value();
   bool is_custom{false};
-  std::atomic<uint32_t> scroll_max{UINT32_MAX - 2048};
+  std::atomic<uint32_t> scroll_max{0};
   std::atomic<bool> scroll_dirty{false};
-  std::mutex mutex;
-  std::mutex data_mutex;
   LineTree line_tree;
   UniqueQueue<uint32_t> dirty_lines;
 
   Parser(Editor *editor, std::string n_lang, uint32_t n_scroll_max);
-  void edit(uint32_t start_line, uint32_t old_end_line, uint32_t inserted_rows);
+  void edit(uint32_t start_line, uint32_t removed_rows, uint32_t inserted_rows);
   void work();
   void scroll(uint32_t line);
 };

include/ui/bar.h

@@ -8,9 +8,10 @@
 struct Bar {
   Coord screen;
   std::string command = "";
+  std::string log_line = "";
   uint32_t cursor = 0;
 
-  Bar(Coord screen) : screen(screen) {}
+  void init(Coord screen) { this->screen = screen; }
   void render();
   void handle(KeyEvent event);
   void log(std::string message);

include/utils/utils.h

@@ -102,7 +102,6 @@ struct Language {
   std::string name;
   std::string lsp_name;
   uint32_t color;
-  std::string symbol;
 };
 
 struct LSP {
@@ -112,7 +111,6 @@ struct LSP {
 
 extern std::unordered_map<std::string, Language> languages;
 extern std::unordered_map<std::string, std::string> language_extensions;
-extern std::unordered_map<std::string, std::string> language_mimetypes;
 extern std::unordered_map<std::string, LSP> lsps;
 
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
@@ -155,12 +153,8 @@ std::string path_to_file_uri(const std::string &path_str);
 std::string filename_from_path(const std::string &path);
 std::string get_exe_dir();
 char *load_file(const char *path, uint32_t *out_len, bool *out_eol);
-char *detect_file_type(const char *filename);
 Language language_for_file(const char *filename);
 
-void copy_to_clipboard(const char *text, size_t len);
-char *get_from_clipboard(uint32_t *out_len);
-
 template <typename T>
 inline T *safe_get(std::map<uint16_t, T> &m, uint16_t key) {
   auto it = m.find(key);

installer.sh

@@ -1,43 +1,39 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
-set -e
 
-BINARY_NAME="crib"
+set -eu
-GITHUB_URL="https://github.com/SyedM-dev/crib/releases/download/v0.0.1-alpha/crib-linux-x86_64"
 
-# 1️⃣ Check dependencies
+install() {
-missing=()
+  BINARY_NAME="crib"
-command -v ruby >/dev/null 2>&1 || missing+=("ruby")
+  BIN_URL="https://git.syedm.dev/SyedM/crib/releases/download/v0.0.5-alpha/crib"
-ldconfig -p | grep libmagic >/dev/null 2>&1 || missing+=("libmagic")
 
-if [ ${#missing[@]} -ne 0 ]; then
+  echo "Install or update locally (~/.local/bin) or globally (/usr/bin)? [l/g]"
-  echo "Missing dependencies: ${missing[*]}"
+  read -r choice </dev/tty
-  echo "Install them using your package manager:"
+  case "$choice" in
-  echo "Ubuntu/Debian: sudo apt install ruby libmagic1"
+  l | L)
-  echo "Arch: sudo pacman -S ruby file"
+    INSTALL_DIR="$HOME/.local/bin"
-  echo "Void: sudo xbps-install -Sy ruby file"
+    SUDO=""
-  exit 1
+    ;;
-fi
+  g | G)
-
+    INSTALL_DIR="/usr/bin"
-# 2️⃣ Ask installation path
+    SUDO="sudo"
-echo "Install locally (~/.local/bin) or globally (/usr/bin)? [l/g]"
+    ;;
-read -r choice
+  *)
-case "$choice" in
-l | L) INSTALL_DIR="$HOME/.local/bin" ;;
-g | G) INSTALL_DIR="/usr/bin" ;;
-*)
     echo "Invalid choice"
     exit 1
     ;;
-esac
+  esac
 
-mkdir -p "$INSTALL_DIR"
+  $SUDO mkdir -p "$INSTALL_DIR"
 
-# 3️⃣ Download the binary
+  echo "Downloading binary..."
-echo "Downloading binary..."
+  curl -L "$BIN_URL" -o /tmp/"$BINARY_NAME"
-curl -L "$GITHUB_URL" -o "$INSTALL_DIR/$BINARY_NAME"
+  $SUDO install -m 755 /tmp/"$BINARY_NAME" "$INSTALL_DIR/$BINARY_NAME"
-chmod +x "$INSTALL_DIR/$BINARY_NAME"
+  rm -f /tmp/"$BINARY_NAME"
 
-# 4️⃣ Optional: confirm
+  echo
-echo "$BINARY_NAME installed to $INSTALL_DIR"
+  echo "✔ Crib installed to $INSTALL_DIR"
-echo "You can run it with: $BINARY_NAME"
+  echo "Run with: $BINARY_NAME"
-echo "Remember to add $INSTALL_DIR to PATH if not already."
+  echo "Add $INSTALL_DIR to PATH if needed."
+}
+
+install "$@"

samples/bash.sh

@@ -22,15 +22,12 @@ colorize() {
 }
 
 # Example of error handling
-
 handle_error() {
   log ERROR "An error occurred on line $1"
 }
 trap 'handle_error $LINENO' ERR
-
 # Multiline string test
 read -r -d '' MULTI <<'CPP'
-
 int main() {
   
 }

samples/ruby.rb

@@ -89,6 +89,7 @@ BASH
 
 puts multi
 
+
 # Arrays mixing everything
 mixed = [
   '🐍 Ruby + Python? sacrilege! 🐍',

src/editor/completions.cc

@@ -25,6 +25,23 @@ inline static std::string completion_prefix(Editor *editor) {
   return prefix;
 }
 
+inline static void completion_adjust_scroll(CompletionSession &s) {
+  if (s.visible.empty())
+    return;
+  int vi = -1;
+  for (size_t i = 0; i < s.visible.size(); i++)
+    if (s.visible[i] == s.select) {
+      vi = (int)i;
+      break;
+    }
+  if (vi < 0)
+    return;
+  if ((uint32_t)vi < s.scroll)
+    s.scroll = vi;
+  else if ((uint32_t)vi >= s.scroll + 8)
+    s.scroll = vi - 7;
+}
+
 void completion_filter(Editor *editor) {
   auto &session = editor->completion;
   std::string prefix = completion_prefix(editor);
@@ -44,6 +61,8 @@ void completion_filter(Editor *editor) {
                 session.select) == session.visible.end())
     session.select = session.visible[0];
   session.box.hidden = false;
+  session.scroll = 0;
+  completion_adjust_scroll(session);
   session.box.render_update();
 }
 
@@ -59,8 +78,7 @@ void completion_request(Editor *editor) {
   editor->completion.version = editor->lsp_version;
   LSPPending *pending = new LSPPending();
   pending->editor = editor;
-  pending->method = "textDocument/completion";
+  pending->callback = [](Editor *editor, const json &message) {
-  pending->callback = [](Editor *editor, std::string, json message) {
     auto &session = editor->completion;
     std::unique_lock lock(session.mtx);
     std::vector<json> items_json;
@@ -340,8 +358,7 @@ void completion_resolve_doc(Editor *editor) {
   item.documentation = "";
   LSPPending *pending = new LSPPending();
   pending->editor = editor;
-  pending->method = "completionItem/resolve";
+  pending->callback = [](Editor *editor, const json &message) {
-  pending->callback = [](Editor *editor, std::string, json message) {
     std::unique_lock lock(editor->completion.mtx);
     auto &item = editor->completion.items[editor->completion.select];
     if (message["result"].contains("documentation")) {
@@ -417,6 +434,7 @@ void complete_next(Editor *editor) {
     vi = (vi + 1) % s.visible.size();
   s.select = s.visible[vi];
   completion_resolve_doc(editor);
+  completion_adjust_scroll(editor->completion);
   editor->completion.box.render_update();
 }
 
@@ -431,6 +449,7 @@ void complete_prev(Editor *editor) {
     vi = (vi + s.visible.size() - 1) % s.visible.size();
   s.select = s.visible[vi];
   completion_resolve_doc(editor);
+  completion_adjust_scroll(editor->completion);
   editor->completion.box.render_update();
 }
 

src/editor/edit.cc

@@ -52,7 +52,7 @@ void edit_erase(Editor *editor, Coord pos, int64_t len) {
     editor->root = erase(editor->root, start, byte_pos - start);
     lock_2.unlock();
     if (editor->parser)
-      editor->parser->edit(start_row, end_row, 0);
+      editor->parser->edit(start_row, end_row - start_row, 0);
     if (do_lsp) {
       if (editor->lsp->incremental_sync) {
         json message = {
@@ -125,7 +125,7 @@ void edit_erase(Editor *editor, Coord pos, int64_t len) {
     editor->root = erase(editor->root, byte_pos, end - byte_pos);
     lock_2.unlock();
     if (editor->parser)
-      editor->parser->edit(start_row, end_row, 0);
+      editor->parser->edit(start_row, end_row - start_row, 0);
     if (do_lsp) {
       if (editor->lsp->incremental_sync) {
         json message = {
@@ -184,7 +184,7 @@ void edit_insert(Editor *editor, Coord pos, char *data, uint32_t len) {
   apply_hook_insertion(editor, pos.row, rows);
   lock_2.unlock();
   if (editor->parser)
-    editor->parser->edit(pos.row, pos.row, rows);
+    editor->parser->edit(pos.row, 0, rows);
   if (editor->lsp) {
     if (editor->lsp->incremental_sync) {
       json message = {
@@ -245,8 +245,10 @@ void edit_replace(Editor *editor, Coord start, Coord end, const char *text,
   for (uint32_t i = 0; i < len; i++)
     if (text[i] == '\n')
       rows++;
+  if (rows > 0)
+    rows--;
   if (editor->parser)
-    editor->parser->edit(start.row, end.row - 1, rows);
+    editor->parser->edit(start.row, end.row - start.row, rows);
   if (editor->lsp) {
     if (editor->lsp->incremental_sync) {
       json message = {

src/editor/editor.cc

@@ -1,6 +1,7 @@
 #include "editor/editor.h"
 #include "editor/decl.h"
 #include "lsp/lsp.h"
+#include "main.h"
 #include "syntax/langs.h"
 #include "utils/utils.h"
 
@@ -77,6 +78,8 @@ void save_file(Editor *editor) {
   }
   out.close();
   free(str);
+  bar.log("Written " + std::to_string(char_count) + " bytes to " +
+          editor->filename);
   if (editor->lsp) {
     json save_msg = {{"jsonrpc", "2.0"},
                      {"method", "textDocument/didSave"},
@@ -94,9 +97,8 @@ void save_file(Editor *editor) {
                       {"trimFinalNewlines", true}}}}}};
       LSPPending *pending = new LSPPending();
       pending->editor = editor;
-      pending->method = "textDocument/formatting";
+      pending->callback = [save_msg, version](Editor *editor,
-      pending->callback = [save_msg, version](Editor *editor, std::string,
+                                              const json &message) {
-                                              json message) {
         if (version != editor->lsp_version)
           return;
         auto &edits = message["result"];

src/editor/events.cc

@@ -153,8 +153,7 @@ void handle_editor_event(Editor *editor, KeyEvent event) {
     if (event.key_type == KEY_CHAR) {
       if (event.len == 1) {
         if (event.c[0] == '\t') {
-          edit_insert(editor, editor->cursor, (char *)"  ", 2);
+          editor->indents.insert_tab(editor->cursor);
-          cursor_right(editor, 2);
         } else if (event.c[0] == '\n' || event.c[0] == '\r') {
           editor->indents.insert_new_line(editor->cursor);
         } else if (event.c[0] == CTRL('W')) {
@@ -205,6 +204,14 @@ void handle_editor_event(Editor *editor, KeyEvent event) {
         paste(editor);
         mode = NORMAL;
         break;
+      case '<':
+      case ',':
+        dedent_selection(editor);
+        break;
+      case '>':
+      case '.':
+        indent_selection(editor);
+        break;
       }
     }
     break;
@@ -232,6 +239,4 @@ void handle_editor_event(Editor *editor, KeyEvent event) {
   if (old_mode == mode || mode != INSERT)
     handle_completion(editor, event);
   ensure_scroll(editor);
-  if ((event.key_type == KEY_CHAR || event.key_type == KEY_PASTE) && event.c)
-    free(event.c);
 }

src/editor/helpers.cc

@@ -4,14 +4,20 @@
 #include "lsp/lsp.h"
 #include "main.h"
 #include "utils/utils.h"
+#include <sys/types.h>
 
 void cut(Editor *editor) {
+  if (ABS((int64_t)editor->cursor.row - (int64_t)editor->selection.row) >
+      1500) {
+    bar.log("Selection too large!");
+    return;
+  }
   if (mode != SELECT)
     return;
   Coord start;
   uint32_t len;
   char *text = get_selection(editor, &len, &start);
-  copy_to_clipboard(text, len);
+  ruby_copy(text, len);
   len = count_clusters(text, len, 0, len);
   edit_erase(editor, start, len);
   free(text);
@@ -19,26 +25,29 @@ void cut(Editor *editor) {
 }
 
 void copy(Editor *editor) {
+  if (ABS((int64_t)editor->cursor.row - (int64_t)editor->selection.row) >
+      1500) {
+    bar.log("Selection too large!");
+    return;
+  }
   if (mode != SELECT)
     return;
   uint32_t len;
   char *text = get_selection(editor, &len, nullptr);
-  copy_to_clipboard(text, len);
+  ruby_copy(text, len);
   free(text);
   editor->selection_active = false;
 }
 
 void paste(Editor *editor) {
-  uint32_t len;
   if (mode == NORMAL) {
-    char *text = get_from_clipboard(&len);
+    std::string text = ruby_paste();
-    if (text) {
+    if (text.empty())
-      insert_str(editor, text, len);
+      return;
-      free(text);
+    insert_str(editor, (char *)text.c_str(), text.length());
-    }
   } else if (mode == SELECT) {
-    char *text = get_from_clipboard(&len);
+    std::string text = ruby_paste();
-    if (text) {
+    if (!text.empty()) {
       Coord start, end;
       selection_bounds(editor, &start, &end);
       uint32_t start_byte =
@@ -46,8 +55,7 @@ void paste(Editor *editor) {
       uint32_t end_byte =
           line_to_byte(editor->root, end.row, nullptr) + end.col;
       edit_erase(editor, start, end_byte - start_byte);
-      edit_insert(editor, editor->cursor, text, len);
+      edit_insert(editor, editor->cursor, (char *)text.c_str(), text.length());
-      free(text);
     }
     editor->selection_active = false;
   }
@@ -75,6 +83,53 @@ void dedent_current_line(Editor *editor) {
   editor->cursor.row = start.row;
 }
 
+static void move_coord_by_delta(Coord &c, uint32_t row, int64_t delta) {
+  if (c.row == row) {
+    int64_t new_col = (int64_t)c.col + delta;
+    c.col = (uint32_t)MAX(new_col, 0);
+  }
+}
+
+void indent_selection(Editor *editor) {
+  uint32_t top = MIN(editor->cursor.row, editor->selection.row);
+  uint32_t bot = MAX(editor->cursor.row, editor->selection.row);
+  if (bot - top > 1500) {
+    bar.log("Can't indent more than 1500 lines at once!");
+    return;
+  }
+  if (bot - top >= 2)
+    editor->indents.indent_block(top + 1, bot - 1);
+  uint32_t delta_top = editor->indents.indent_line(top);
+  uint32_t delta_bot =
+      (bot == top) ? delta_top : editor->indents.indent_line(bot);
+  move_coord_by_delta(editor->cursor, top, delta_top);
+  move_coord_by_delta(editor->selection, top, delta_top);
+  if (bot != top) {
+    move_coord_by_delta(editor->cursor, bot, delta_bot);
+    move_coord_by_delta(editor->selection, bot, delta_bot);
+  }
+}
+
+void dedent_selection(Editor *editor) {
+  uint32_t top = MIN(editor->cursor.row, editor->selection.row);
+  uint32_t bot = MAX(editor->cursor.row, editor->selection.row);
+  if (bot - top > 1500) {
+    bar.log("Can't dedent more than 1500 lines at once!");
+    return;
+  }
+  if (bot - top >= 2)
+    editor->indents.dedent_block(top + 1, bot - 1);
+  uint32_t delta_top = editor->indents.dedent_line(top);
+  uint32_t delta_bot =
+      (bot == top) ? delta_top : editor->indents.dedent_line(bot);
+  move_coord_by_delta(editor->cursor, top, -(int64_t)delta_top);
+  move_coord_by_delta(editor->selection, top, -(int64_t)delta_top);
+  if (bot != top) {
+    move_coord_by_delta(editor->cursor, bot, -(int64_t)delta_bot);
+    move_coord_by_delta(editor->selection, bot, -(int64_t)delta_bot);
+  }
+}
+
 void insert_char(Editor *editor, char c) {
   uint32_t col = editor->cursor.col;
   LineIterator *it = begin_l_iter(editor->root, editor->cursor.row);
@@ -158,9 +213,7 @@ void insert_char(Editor *editor, char c) {
                   {"trimFinalNewlines", true}}}}}};
           LSPPending *pending = new LSPPending();
           pending->editor = editor;
-          pending->method = "textDocument/onTypeFormatting";
+          pending->callback = [version](Editor *editor, const json &message) {
-          pending->callback = [version](Editor *editor, std::string,
-                                        json message) {
             if (version != editor->lsp_version)
               return;
             auto &edits = message["result"];
@@ -204,11 +257,32 @@ void backspace_edit(Editor *editor) {
   LineIterator *it = begin_l_iter(editor->root, editor->cursor.row);
   if (!it)
     return;
-  char *line = next_line(it, nullptr);
+  uint32_t len;
-  char prev_char = line[prev_pos.col];
+  char *line = next_line(it, &len);
-  char next_char = line[editor->cursor.col];
+  if (!line) {
     free(it->buffer);
     free(it);
+    return;
+  }
+  if (len > 0 && line[len - 1] == '\n')
+    --len;
+  char prev_char = (prev_pos.col < len) ? line[prev_pos.col] : 0;
+  char next_char = (editor->cursor.col < len) ? line[editor->cursor.col] : 0;
+  bool before_content = false;
+  if (editor->cursor.col > 0) {
+    before_content = true;
+    for (uint32_t i = 0; i < editor->cursor.col; i++)
+      if (line[i] != ' ' && line[i] != '\t') {
+        before_content = false;
+        break;
+      }
+  }
+  free(it->buffer);
+  free(it);
+  if (before_content) {
+    dedent_current_line(editor);
+    return;
+  }
   bool is_pair = (prev_char == '{' && next_char == '}') ||
                  (prev_char == '(' && next_char == ')') ||
                  (prev_char == '[' && next_char == ']') ||
@@ -315,8 +389,7 @@ void fetch_lsp_hover(Editor *editor) {
           {"position", {{"line", editor->cursor.row}, {"character", col}}}}}};
     LSPPending *pending = new LSPPending();
     pending->editor = editor;
-    pending->method = "textDocument/hover";
+    pending->callback = [](Editor *editor, const json &hover) {
-    pending->callback = [](Editor *editor, std::string, json hover) {
       if (hover.contains("result") && !hover["result"].is_null()) {
         auto &contents = hover["result"]["contents"];
         std::string hover_text = "";

src/editor/indents.cc

@@ -38,6 +38,18 @@ void IndentationEngine::compute_indent(Editor *n_editor) {
     indent = 2;
   free(it->buffer);
   free(it);
+  auto x = kLangtoBlockStartsEnd.find(editor->lang.name);
+  if (x != kLangtoBlockStartsEnd.end())
+    start_end = &x->second;
+  x = kLangtoBlockStartsStart.find(editor->lang.name);
+  if (x != kLangtoBlockStartsStart.end())
+    start_start = &x->second;
+  x = kLangtoBlockEndsFull.find(editor->lang.name);
+  if (x != kLangtoBlockEndsFull.end())
+    end_full = &x->second;
+  x = kLangtoBlockEndsStart.find(editor->lang.name);
+  if (x != kLangtoBlockEndsStart.end())
+    end_start = &x->second;
 }
 
 uint32_t IndentationEngine::indent_real(char *line, uint32_t len) {
@@ -75,18 +87,16 @@ uint32_t IndentationEngine::indent_expected(uint32_t row) {
     if (len == 0)
       continue;
     c_indent = indent_real(line, len);
-    auto is_end_set = kLangtoBlockStartsEnd.find(editor->lang.name);
-    auto is_start_set = kLangtoBlockStartsStart.find(editor->lang.name);
     bool is_end = false;
-    if (is_end_set != kLangtoBlockStartsEnd.end())
+    if (start_end)
-      for (auto end : is_end_set->second)
+      for (auto end : *start_end)
         if (ends_with(line, end)) {
           c_indent++;
           is_end = true;
           break;
         }
-    if (!is_end && is_start_set != kLangtoBlockStartsStart.end())
+    if (!is_end && start_start)
-      for (auto end : is_start_set->second)
+      for (auto end : *start_start)
         if (starts_with(line, end)) {
           c_indent++;
           break;
@@ -195,6 +205,100 @@ uint32_t IndentationEngine::dedent_line(uint32_t row) {
   return (uint32_t)ABS((int64_t)ws_len - (new_indent * indent));
 }
 
+void IndentationEngine::indent_block(uint32_t start_row, uint32_t end_row) {
+  indent_block(start_row, end_row, +1);
+}
+
+void IndentationEngine::dedent_block(uint32_t start_row, uint32_t end_row) {
+  indent_block(start_row, end_row, -1);
+}
+
+void IndentationEngine::indent_block(uint32_t start_row, uint32_t end_row,
+                                     int delta) {
+  if (start_row > end_row)
+    std::swap(start_row, end_row);
+  uint32_t start_len, end_len;
+  uint32_t start_off = line_to_byte(editor->root, start_row, &start_len);
+  uint32_t end_off = line_to_byte(editor->root, end_row, &end_len);
+  uint32_t total_len = (end_off - start_off) + end_len;
+  char *block = read(editor->root, start_off, total_len);
+  if (!block)
+    return;
+  uint32_t cap = total_len + 128;
+  char *out = (char *)malloc(cap);
+  uint32_t out_len = 0;
+  char *p = block;
+  char *end = block + total_len;
+  while (p < end) {
+    char *line_start = p;
+    while (p < end && *p != '\n')
+      p++;
+    uint32_t len = (uint32_t)(p - line_start);
+    uint32_t ws = 0;
+    while (ws < len && (line_start[ws] == ' ' || line_start[ws] == '\t'))
+      ws++;
+    uint32_t real_indent = indent_real(line_start, len);
+    int64_t new_indent = (int64_t)real_indent + delta;
+    if (new_indent < 0)
+      new_indent = 0;
+    uint32_t indent_chars = (indent == 1) ? new_indent : new_indent * indent;
+    uint32_t new_line_len = indent_chars + (len - ws);
+    if (out_len + new_line_len + 2 >= cap) {
+      cap = (cap * 2) + new_line_len + 32;
+      out = (char *)realloc(out, cap);
+    }
+    if (indent == 1) {
+      memset(out + out_len, '\t', indent_chars);
+      out_len += indent_chars;
+    } else {
+      memset(out + out_len, ' ', indent_chars);
+      out_len += indent_chars;
+    }
+    memcpy(out + out_len, line_start + ws, len - ws);
+    out_len += (len - ws);
+    if (p < end && *p == '\n') {
+      out[out_len++] = '\n';
+      p++;
+    }
+  }
+  free(block);
+  edit_replace(editor, {start_row, 0}, {end_row, end_len}, out, out_len);
+  free(out);
+}
+
+void IndentationEngine::insert_tab(Coord cursor) {
+  std::shared_lock lock(editor->knot_mtx);
+  LineIterator *it = begin_l_iter(editor->root, cursor.row);
+  if (!it)
+    return;
+  uint32_t len;
+  char *line = next_line(it, &len);
+  if (!line) {
+    free(it->buffer);
+    free(it);
+    return;
+  }
+  lock.unlock();
+  if (len > 0 && line[len - 1] == '\n')
+    --len;
+  uint32_t ws_len = 0;
+  while (ws_len < len && (line[ws_len] == ' ' || line[ws_len] == '\t'))
+    ws_len++;
+  std::string insert;
+  if (cursor.col <= ws_len) {
+    if (indent == 1)
+      insert = "\t";
+    else
+      insert.assign(indent - ((cursor.col) % indent), ' ');
+  } else {
+    insert = "\t";
+  }
+  free(it->buffer);
+  free(it);
+  edit_insert(editor, cursor, (char *)insert.c_str(), insert.size());
+  editor->cursor.col += insert.size();
+}
+
 void IndentationEngine::insert_new_line(Coord cursor) {
   std::string formatted;
   std::shared_lock lock(editor->knot_mtx);
@@ -212,22 +316,20 @@ void IndentationEngine::insert_new_line(Coord cursor) {
   if (len > 0 && line[len - 1] == '\n')
     --len;
   if (cursor.col >= len) {
-    auto is_end_full = kLangtoBlockEndsFull.find(editor->lang.name);
-    auto is_end_start = kLangtoBlockEndsStart.find(editor->lang.name);
     bool end_matched = false;
-    if (is_end_full != kLangtoBlockEndsFull.end())
+    if (end_full)
-      for (auto end : is_end_full->second)
+      for (auto end : *end_full)
         if (end == trim(line)) {
-          cursor.col =
+          cursor.col = set_indent(
-              set_indent(cursor.row, (int64_t)indent_expected(cursor.row) - 1);
+              cursor.row, (int64_t)indent_expected(cursor.row) - (int64_t)1);
           end_matched = true;
           break;
         }
-    if (!end_matched && is_end_start != kLangtoBlockEndsStart.end())
+    if (!end_matched && end_start)
-      for (auto end : is_end_start->second)
+      for (auto end : *end_start)
         if (starts_with(trim(line), end)) {
-          cursor.col =
+          cursor.col = set_indent(
-              set_indent(cursor.row, (int64_t)indent_expected(cursor.row) - 1);
+              cursor.row, (int64_t)indent_expected(cursor.row) - (int64_t)1);
           break;
         }
     lock.lock();
@@ -248,37 +350,32 @@ void IndentationEngine::insert_new_line(Coord cursor) {
   }
   std::string ending = trim(std::string(line + cursor.col, len - cursor.col));
   std::string before = trim(std::string(line, cursor.col));
-  uint32_t c_indent = indent_real(line, len);
+  int64_t c_indent = indent_real(line, len);
   if (!ending.empty()) {
     bool ending_valid = false;
     bool starting_valid = false;
-    auto is_end_full = kLangtoBlockEndsFull.find(editor->lang.name);
+    if (end_full)
-    auto is_end_start = kLangtoBlockEndsStart.find(editor->lang.name);
+      for (auto end : *end_full)
-    auto is_end_set = kLangtoBlockStartsEnd.find(editor->lang.name);
-    auto is_start_set = kLangtoBlockStartsStart.find(editor->lang.name);
-    if (is_end_full != kLangtoBlockEndsFull.end())
-      for (auto end : is_end_full->second)
         if (ending == end) {
           ending_valid = true;
           break;
         }
-    if (!ending_valid && is_end_start != kLangtoBlockEndsStart.end())
+    if (!ending_valid && end_start)
-      for (auto end : is_end_start->second)
+      for (auto end : *end_start)
         if (starts_with(ending, end)) {
           ending_valid = true;
           break;
         }
-    if (is_end_set != kLangtoBlockStartsEnd.end())
+    if (start_end)
-      for (auto end : is_end_set->second)
+      for (auto end : *start_end)
         if (ends_with(before, end)) {
-          c_indent++;
           starting_valid = true;
           break;
         }
-    if (!starting_valid && is_start_set != kLangtoBlockStartsStart.end())
+    if (!starting_valid && start_start)
-      for (auto end : is_start_set->second)
+      for (auto end : *start_start)
         if (starts_with(before, end)) {
-          c_indent++;
+          starting_valid = true;
           break;
         }
     if (ending_valid && starting_valid)
@@ -289,27 +386,27 @@ void IndentationEngine::insert_new_line(Coord cursor) {
     else if (ending_valid)
       c_indent--;
   }
-  auto is_end_set = kLangtoBlockStartsEnd.find(editor->lang.name);
-  auto is_start_set = kLangtoBlockStartsStart.find(editor->lang.name);
   bool is_end = false;
-  if (is_end_set != kLangtoBlockStartsEnd.end())
+  if (start_end)
-    for (auto end : is_end_set->second)
+    for (auto end : *start_end)
       if (ends_with(before, end)) {
         c_indent++;
         is_end = true;
         break;
       }
-  if (!is_end && is_start_set != kLangtoBlockStartsStart.end())
+  if (!is_end && start_start)
-    for (auto end : is_start_set->second)
+    for (auto end : *start_start)
       if (starts_with(before, end)) {
         c_indent++;
         break;
       }
+  if (c_indent < 0)
+    c_indent = 0;
   formatted = "\n" +
               (indent == 1 ? std::string(c_indent, '\t')
                            : std::string(c_indent * indent, ' ')) +
               ending;
-  Coord new_cursor = {cursor.row + 1, c_indent * indent};
+  Coord new_cursor = {cursor.row + 1, (uint32_t)c_indent * indent};
   edit_replace(editor, cursor, {cursor.row, len}, formatted.data(),
                formatted.size());
   editor->cursor = new_cursor;
@@ -348,8 +445,7 @@ void IndentationEngine::insert_new_line(Coord cursor) {
               {"trimFinalNewlines", true}}}}}};
       LSPPending *pending = new LSPPending();
       pending->editor = editor;
-      pending->method = "textDocument/onTypeFormatting";
+      pending->callback = [version](Editor *editor, const json &message) {
-      pending->callback = [version](Editor *editor, std::string, json message) {
         if (version != editor->lsp_version)
           return;
         auto &edits = message["result"];

src/editor/renderer.cc

@@ -11,7 +11,7 @@ void render_editor(Editor *editor) {
   uint32_t numlen =
       EXTRA_META + static_cast<int>(std::log10(editor->root->line_count + 1));
   uint32_t render_width = editor->size.col - numlen;
-  uint32_t render_x = editor->position.col + numlen;
+  uint32_t render_x = editor->position.col + numlen + 1;
   std::vector<std::pair<uint32_t, char>> v;
   for (size_t i = 0; i < 94; ++i)
     if (editor->hooks[i] != 0)
@@ -25,9 +25,6 @@ void render_editor(Editor *editor) {
   while (warn_it != editor->warnings.end() &&
          warn_it->line < editor->scroll.row)
     ++warn_it;
-  std::unique_lock<std::mutex> lock;
-  if (editor->parser)
-    lock = std::unique_lock<std::mutex>(editor->parser->mutex);
   LineData *line_data = nullptr;
   auto get_type = [&](uint32_t col) {
     if (!line_data)
@@ -146,16 +143,14 @@ void render_editor(Editor *editor) {
         update(editor->position.row + rendered_rows, editor->position.col, hook,
                0xAAAAAA, 0, 0);
         char buf[16];
-        int len =
+        int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1);
-            snprintf(buf, sizeof(buf), "%*u ", numlen - 3, line_index + 1);
         uint32_t num_color =
             editor->cursor.row == line_index ? 0xFFFFFF : 0x555555;
         for (int i = 0; i < len; i++)
-          update(editor->position.row + rendered_rows,
+          update(editor->position.row + rendered_rows, editor->position.col + i,
-                 editor->position.col + i + 2, (char[2]){buf[i], 0}, num_color,
+                 (char[2]){buf[i], 0}, num_color, 0, 0);
-                 0, 0);
       } else {
-        for (uint32_t i = 0; i < numlen; i++)
+        for (uint32_t i = 0; i < numlen + 1; i++)
           update(editor->position.row + rendered_rows, editor->position.col + i,
                  " ", 0, 0, 0);
       }
@@ -349,13 +344,12 @@ void render_editor(Editor *editor) {
       update(editor->position.row + rendered_rows, editor->position.col, hook,
              0xAAAAAA, 0, 0);
       char buf[16];
-      int len = snprintf(buf, sizeof(buf), "%*u ", numlen - 3, line_index + 1);
+      int len = snprintf(buf, sizeof(buf), "%*u ", numlen, line_index + 1);
       uint32_t num_color =
           editor->cursor.row == line_index ? 0xFFFFFF : 0x555555;
       for (int i = 0; i < len; i++)
-        update(editor->position.row + rendered_rows,
+        update(editor->position.row + rendered_rows, editor->position.col + i,
-               editor->position.col + i + 2, (char[2]){buf[i], 0}, num_color, 0,
+               (char[2]){buf[i], 0}, num_color, 0, 0);
-               0);
       if (editor->cursor.row == line_index) {
         cursor.row = editor->position.row + rendered_rows;
         cursor.col = render_x;
@@ -453,8 +447,6 @@ void render_editor(Editor *editor) {
     global_byte_offset += line_len + 1;
     line_index++;
   }
-  if (lock.owns_lock())
-    lock.unlock();
   while (rendered_rows < editor->size.row) {
     for (uint32_t col = 0; col < editor->size.col; col++)
       update(editor->position.row + rendered_rows, editor->position.col + col,

src/lsp/process.cc

@@ -53,9 +53,8 @@ std::shared_ptr<LSPInstance> get_or_init_lsp(std::string lsp_id) {
     if (!init_lsp(lsp))
       return nullptr;
     LSPPending *pending = new LSPPending();
-    pending->method = "initialize";
     pending->editor = nullptr;
-    pending->callback = [lsp, lsp_id](Editor *, std::string, json msg) {
+    pending->callback = [lsp, lsp_id](Editor *, const json &msg) {
       if (msg.contains("result") && msg["result"].contains("capabilities")) {
         auto &caps = msg["result"]["capabilities"];
         // if (caps.contains("positionEncoding")) {
@@ -155,40 +154,78 @@ std::shared_ptr<LSPInstance> get_or_init_lsp(std::string lsp_id) {
 }
 
 void close_lsp(std::string lsp_id) {
-  std::shared_lock active_lsps_lock(active_lsps_mtx);
+  std::shared_ptr<LSPInstance> lsp;
+  {
+    std::shared_lock lock(active_lsps_mtx);
     auto it = active_lsps.find(lsp_id);
     if (it == active_lsps.end())
       return;
-  std::shared_ptr<LSPInstance> lsp = it->second;
+    lsp = it->second;
-  active_lsps_lock.unlock();
+  }
+  if (!lsp || lsp->pid == -1 || lsp->exited)
+    return;
   lsp->exited = true;
   lsp->initialized = false;
-  LSPPending *shutdown_pending = new LSPPending();
+  auto send_raw = [&](const json &msg) {
-  shutdown_pending->method = "shutdown";
+    std::string payload = msg.dump();
-  shutdown_pending->callback = [lsp](Editor *, std::string, json) {
+    std::string header =
-    json exit = {{"jsonrpc", "2.0"}, {"method", "exit"}};
+        "Content-Length: " + std::to_string(payload.size()) + "\r\n\r\n";
-    lsp_send(lsp, exit, nullptr);
+    std::string out = header + payload;
+    const char *ptr = out.data();
+    size_t remaining = out.size();
+    while (remaining > 0) {
+      ssize_t n = write(lsp->stdin_fd, ptr, remaining);
+      if (n <= 0) {
+        if (errno == EINTR)
+          continue;
+        break;
+      }
+      ptr += n;
+      remaining -= n;
+    }
   };
-  json shutdown = {{"jsonrpc", "2.0"}, {"method", "shutdown"}};
+  json shutdown = {{"jsonrpc", "2.0"}, {"id", 1}, {"method", "shutdown"}};
-  lsp_send(lsp, shutdown, shutdown_pending);
+  send_raw(shutdown);
-  std::thread t([lsp, lsp_id] {
+  {
-    std::this_thread::sleep_for(100ms);
+    pollfd pfd{lsp->stdout_fd, POLLIN, 0};
-    std::unique_lock active_lsps_lock(active_lsps_mtx);
+    int timeout_ms = 300;
-    std::unique_lock lock(lsp->mtx);
+    if (poll(&pfd, 1, timeout_ms) > 0) {
-    if (lsp->pid != -1 && kill(lsp->pid, 0) == 0)
+      auto msg = read_lsp_message(lsp->stdout_fd);
+      (void)msg;
+    }
+  }
+  json exit_msg = {{"jsonrpc", "2.0"}, {"method", "exit"}};
+  send_raw(exit_msg);
+  const int max_wait_ms = 500;
+  int waited = 0;
+  while (waited < max_wait_ms) {
+    int status;
+    pid_t res = waitpid(lsp->pid, &status, WNOHANG);
+    if (res == lsp->pid)
+      break;
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    waited += 10;
+  }
+  if (kill(lsp->pid, 0) == 0) {
     kill(lsp->pid, SIGKILL);
     waitpid(lsp->pid, nullptr, 0);
+  }
   close(lsp->stdin_fd);
   close(lsp->stdout_fd);
+  {
+    std::unique_lock lock(lsp->mtx);
     for (auto &kv : lsp->pending)
       delete kv.second;
+    lsp->pending.clear();
+  }
   for (auto &editor : lsp->editors) {
     std::unique_lock editor_lock(editor->lsp_mtx);
     editor->lsp = nullptr;
   }
+  {
+    std::unique_lock lock(active_lsps_mtx);
     active_lsps.erase(lsp_id);
-  });
+  }
-  t.detach();
 }
 
 void clean_lsp(std::shared_ptr<LSPInstance> lsp, std::string lsp_id) {

src/lsp/workers.cc

@@ -16,7 +16,7 @@ void lsp_send(std::shared_ptr<LSPInstance> lsp, json message,
   lsp->outbox.push(message);
 }
 
-static std::optional<json> read_lsp_message(int fd) {
+std::optional<json> read_lsp_message(int fd) {
   std::string header;
   char c;
   while (true) {
@@ -143,7 +143,7 @@ void lsp_worker() {
           LSPPending *pend = it->second;
           lock.unlock();
           if (pend->callback)
-            pend->callback(pend->editor, pend->method, *msg);
+            pend->callback(pend->editor, *msg);
           delete pend;
           lock.lock();
           lsp->pending.erase(it);

src/main.cc

@@ -9,6 +9,7 @@
 std::atomic<bool> running{true};
 Queue<KeyEvent> event_queue;
 std::vector<Editor *> editors;
+Bar bar;
 
 uint8_t current_editor = 0;
 std::atomic<uint8_t> mode = NORMAL;
@@ -36,7 +37,30 @@ inline uint8_t index_of(Editor *ed) {
   return 0;
 }
 
-void input_listener(Bar bar) {
+int main(int argc, char *argv[]) {
+  ruby_start();
+  load_theme();
+  load_languages_info();
+  load_custom_highlighters();
+
+  Coord screen = start_screen();
+  const char *filename = (argc > 1) ? argv[1] : "";
+  uint8_t eol = read_line_endings();
+  Editor *editor =
+      new_editor(filename, {0, 0}, {screen.row - 2, screen.col}, eol);
+  bar.init(screen);
+
+  if (!editor) {
+    end_screen();
+    fprintf(stderr, "Failed to load editor\n");
+    return 1;
+  }
+
+  editors.push_back(editor);
+  current_editor = editors.size() - 1;
+
+  std::thread lsp_thread(background_lsp);
+
   while (running) {
     KeyEvent event = throttle(1ms, read_key);
     if (event.key_type == KEY_NONE)
@@ -53,7 +77,6 @@ void input_listener(Bar bar) {
         if (target) {
           if (event.mouse_state == PRESS)
             current_editor = index_of(target);
-
           event.mouse_x -= target->position.col;
           event.mouse_y -= target->position.row;
           handle_editor_event(target, event);
@@ -64,77 +87,24 @@ void input_listener(Bar bar) {
     } else {
       bar.handle(event);
     }
+    if ((event.key_type == KEY_CHAR || event.key_type == KEY_PASTE) && event.c)
+      free(event.c);
   render:
-    render_editor(editors[current_editor]);
+    throttle(4ms, editor_worker, editors[current_editor]);
     bar.render();
+    render_editor(editors[current_editor]);
     throttle(4ms, render);
   }
-}
-
-int main(int argc, char *argv[]) {
-  auto start = std::chrono::high_resolution_clock::now();
-
-  ruby_init();
-
-  ruby_start();
-  load_theme();
-  load_languages_info();
-  load_custom_highlighters();
-
-  Coord screen = start_screen();
-  const char *filename = (argc > 1) ? argv[1] : "";
-
-  uint8_t eol = read_line_endings();
-
-  Editor *editor =
-      new_editor(filename, {0, 0}, {screen.row - 2, screen.col}, eol);
-  Bar bar(screen);
-
-  auto end = std::chrono::high_resolution_clock::now();
-  auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start)
-                .count();
-  ruby_log("[LOG] STARTUP_TIME: " + std::to_string(static_cast<long long>(ms)) +
-           "ms");
-
-  if (!editor) {
-    end_screen();
-    fprintf(stderr, "Failed to load editor\n");
-    return 1;
-  }
-
-  editors.push_back(editor);
-  current_editor = editors.size() - 1;
-
-  std::thread input_thread(input_listener, bar);
-  std::thread lsp_thread(background_lsp);
-
-  while (running)
-    throttle(16ms, editor_worker, editors[current_editor]);
-
-  if (input_thread.joinable())
-    input_thread.join();
 
   if (lsp_thread.joinable())
     lsp_thread.join();
 
   end_screen();
 
-  ruby_shutdown();
-
   for (auto editor : editors)
     free_editor(editor);
 
-  std::unique_lock lk(active_lsps_mtx);
+  ruby_shutdown();
-  lk.unlock();
-  while (true) {
-    lk.lock();
-    if (active_lsps.empty())
-      break;
-    lk.unlock();
-    throttle(16ms, lsp_worker);
-  }
 
-  rb_gc_start();
+  return 0;
-
-  return ruby_cleanup(0);
 }

src/ruby_compile.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -e
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+INPUT="$SCRIPT_DIR/../include/syntax/tokens.def"
+TMP="/tmp/__crib_precompiled.rb"
+OUTPUT="/tmp/__crib_precompiled.mrb"
+
+echo "module Tokens" >"$TMP"
+
+counter=0
+
+while read -r line; do
+  if [[ $line =~ ADD\(([^\)]+)\) ]]; then
+    name="${BASH_REMATCH[1]}"
+    echo "  $name = $counter" >>"$TMP"
+    counter=$((counter + 1))
+  fi
+done <"$INPUT"
+
+OS="$(uname -s)"
+OS_TYPE="unknown"
+
+case "$OS" in
+Linux*)
+  OS_TYPE="linux"
+  ;;
+Darwin*)
+  OS_TYPE="mac"
+  ;;
+CYGWIN* | MINGW* | MSYS*)
+  OS_TYPE="windows"
+  ;;
+esac
+
+{
+  echo "  freeze"
+  echo "end"
+  echo
+  cat "$SCRIPT_DIR/../include/scripting/libcrib.rb" | sed "s/os_name_placed_here/$OS_TYPE/g"
+} >>"$TMP"
+
+"$SCRIPT_DIR/../libs/mruby/bin/mrbc" -o$OUTPUT $TMP
+
+{
+  echo "#pragma once"
+  xxd -i $OUTPUT | sed 's/^unsigned char /constexpr unsigned char /' |
+    sed 's/^unsigned int /constexpr unsigned int /'
+} >"$SCRIPT_DIR/../include/scripting/ruby_compiled.h"
+
+rm $TMP
+rm $OUTPUT

src/scripting/bindings.cc

@@ -0,0 +1,10 @@
+#include "scripting/decl.h"
+
+mrb_value get_config_file(mrb_state *mrb, mrb_value self) {
+  return mrb_str_new_cstr(mrb, ruby_config_path.string().c_str());
+}
+
+void setup_ruby_bindings(mrb_state *mrb, RClass *C_module) {
+  mrb_define_module_function(mrb, C_module, "config_file", get_config_file,
+                             MRB_ARGS_NONE());
+}

src/scripting/process.cc

@@ -1,7 +1,12 @@
+#include "io/sysio.h"
+#include "main.h"
+#include "pch.h"
 #include "scripting/decl.h"
+#include "scripting/ruby_compiled.h"
 #include "utils/utils.h"
 
-std::unordered_map<std::string, std::pair<VALUE, VALUE>> custom_highlighters;
+std::unordered_map<std::string, std::pair<mrb_value, mrb_value>>
+    custom_highlighters;
 
 struct R_ThemeEntry {
   std::string key;
@@ -16,41 +21,21 @@ struct R_ThemeEntry {
 struct R_Language {
   std::string name;
   uint32_t color = 0xFFFFFF;
-  std::string symbol;
   std::vector<std::string> extensions;
   std::vector<std::string> filenames;
-  std::vector<std::string> mimetypes;
   std::string lsp_command; // link to LSP by name
 };
 
-VALUE C_module = Qnil;
+mrb_state *mrb = nullptr;
-std::mutex ruby_mutex;
+RClass *C_module;
-
+fs::path ruby_config_path;
-namespace fs = std::filesystem;
-
-static void ruby_load(const char *main_file) {
-  std::lock_guard lock(ruby_mutex);
-  ruby_init_loadpath();
-  int state = 0;
-  rb_load_protect(rb_str_new_cstr(main_file), 0, &state);
-  if (state) {
-    VALUE err = rb_errinfo();
-    rb_set_errinfo(Qnil);
-    fprintf(stderr, "%d: Failed to load Ruby file %s\n", state, main_file);
-  }
-}
-
-static void ruby_eval_string(const char *code) {
-  int state = 0;
-  rb_eval_string_protect(code, &state);
-  if (state) {
-    VALUE err = rb_errinfo();
-    rb_set_errinfo(Qnil);
-    fprintf(stderr, "Ruby eval failed\n");
-  }
-}
 
 void ruby_start() {
+  mrb = mrb_open();
+  if (!mrb) {
+    fprintf(stderr, "Failed to init mruby\n");
+    return;
+  }
   fs::path exe_dir = get_exe_dir();
   std::vector<fs::path> candidates;
   candidates.emplace_back("./crib.rb");
@@ -68,140 +53,431 @@ void ruby_start() {
   }
   candidates.emplace_back(exe_dir / "../config/main.rb");
   candidates.emplace_back(exe_dir / "../config/crib.rb");
-  ruby_eval_string(crib_module);
+  mrb_load_irep(mrb, _tmp___crib_precompiled_mrb);
-  ruby_eval_string(tokens_def);
+  C_module = mrb_module_get(mrb, "C");
+  setup_ruby_bindings(mrb, C_module);
   for (const auto &p : candidates) {
-    if (fs::exists(p) && fs::is_regular_file(p)) {
+    if (fs::exists(p)) {
-      ruby_load(p.string().c_str());
+      FILE *f = fopen(p.string().c_str(), "r");
+      if (f) {
+        ruby_config_path = p;
+        mrb_load_file(mrb, f);
+        if (mrb->exc)
+          exit(1);
+        fclose(f);
+      }
       break;
     }
   }
-  C_module = rb_const_get(rb_cObject, rb_intern("C"));
+  mrb_value mod_val = mrb_obj_value(C_module);
-  if (C_module == Qnil)
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_startup", 0);
+  if (!mrb_nil_p(block))
+    mrb_funcall(mrb, block, "call", 0);
+  mrb_garbage_collect(mrb);
+}
+
+static mrb_value sym_fg;
+static mrb_value sym_bg;
+static mrb_value sym_flags;
+static mrb_value sym_start;
+static mrb_value sym_length;
+static mrb_value sym_mode;
+static mrb_value sym_lang_name;
+static mrb_value sym_filename;
+static mrb_value sym_width;
+static mrb_value sym_normal;
+static mrb_value sym_insert;
+static mrb_value sym_select;
+static mrb_value sym_runner;
+static mrb_value sym_jumper;
+
+inline void initialize_symbols() {
+  sym_fg = mrb_symbol_value(mrb_intern_cstr(mrb, "fg"));
+  sym_bg = mrb_symbol_value(mrb_intern_cstr(mrb, "bg"));
+  sym_flags = mrb_symbol_value(mrb_intern_cstr(mrb, "flags"));
+  sym_start = mrb_symbol_value(mrb_intern_cstr(mrb, "start"));
+  sym_length = mrb_symbol_value(mrb_intern_cstr(mrb, "length"));
+  sym_mode = mrb_symbol_value(mrb_intern_cstr(mrb, "mode"));
+  sym_lang_name = mrb_symbol_value(mrb_intern_cstr(mrb, "lang_name"));
+  sym_filename = mrb_symbol_value(mrb_intern_cstr(mrb, "filename"));
+  sym_width = mrb_symbol_value(mrb_intern_cstr(mrb, "width"));
+  sym_normal = mrb_symbol_value(mrb_intern_cstr(mrb, "normal"));
+  sym_insert = mrb_symbol_value(mrb_intern_cstr(mrb, "insert"));
+  sym_select = mrb_symbol_value(mrb_intern_cstr(mrb, "select"));
+  sym_runner = mrb_symbol_value(mrb_intern_cstr(mrb, "runner"));
+  sym_jumper = mrb_symbol_value(mrb_intern_cstr(mrb, "jumper"));
+}
+
+inline static std::vector<BarLight>
+convert_highlights(mrb_state *mrb, mrb_value highlights_val) {
+  std::vector<BarLight> result;
+  if (!mrb_array_p(highlights_val))
+    return result;
+  mrb_int len = RARRAY_LEN(highlights_val);
+  for (mrb_int i = 0; i < len; i++) {
+    mrb_value item = mrb_ary_ref(mrb, highlights_val, i);
+    if (!mrb_hash_p(item))
+      continue;
+    mrb_value fg_v = mrb_hash_get(mrb, item, sym_fg);
+    mrb_value bg_v = mrb_hash_get(mrb, item, sym_bg);
+    mrb_value flags_v = mrb_hash_get(mrb, item, sym_flags);
+    mrb_value start_v = mrb_hash_get(mrb, item, sym_start);
+    mrb_value length_v = mrb_hash_get(mrb, item, sym_length);
+    BarLight bl{};
+    if (!mrb_nil_p(fg_v))
+      bl.highlight.fg = (uint32_t)mrb_fixnum(fg_v);
+    if (!mrb_nil_p(bg_v))
+      bl.highlight.bg = (uint32_t)mrb_fixnum(bg_v);
+    if (!mrb_nil_p(flags_v))
+      bl.highlight.flags = (uint32_t)mrb_fixnum(flags_v);
+    uint32_t start = !mrb_nil_p(start_v) ? (uint32_t)mrb_fixnum(start_v) : 0;
+    uint32_t length = !mrb_nil_p(length_v) ? (uint32_t)mrb_fixnum(length_v) : 0;
+    bl.start = start;
+    bl.end = start + length;
+    result.push_back(bl);
+  }
+  return result;
+}
+
+BarLine bar_contents(uint8_t mode, std::string lang_name, uint32_t warnings,
+                     std::string lsp_name, std::string filename,
+                     std::string foldername, uint32_t line, uint32_t max_line,
+                     uint32_t width) {
+  BarLine bar_line;
+  static bool initialed = false;
+  if (!initialed) {
+    initialize_symbols();
+    initialed = true;
+  }
+  int ai = mrb_gc_arena_save(mrb);
+  mrb_value info = mrb_hash_new(mrb);
+  mrb_value key_mode = sym_mode;
+  mrb_value val_mode;
+  switch (mode) {
+  case NORMAL:
+    val_mode = sym_normal;
+    break;
+  case INSERT:
+    val_mode = sym_insert;
+    break;
+  case SELECT:
+    val_mode = sym_select;
+    break;
+  case RUNNER:
+    val_mode = sym_runner;
+    break;
+  case JUMPER:
+    val_mode = sym_jumper;
+    break;
+  }
+  mrb_hash_set(mrb, info, key_mode, val_mode);
+  mrb_value key_lang_name = sym_lang_name;
+  mrb_value val_lang_name =
+      mrb_symbol_value(mrb_intern_cstr(mrb, lang_name.c_str()));
+  mrb_hash_set(mrb, info, key_lang_name, val_lang_name);
+  mrb_value key_filename = sym_filename;
+  mrb_value val_filename =
+      mrb_str_new(mrb, filename.c_str(), filename.length());
+  mrb_hash_set(mrb, info, key_filename, val_filename);
+  mrb_value key_width = sym_width;
+  mrb_value val_width = mrb_fixnum_value(width);
+  mrb_hash_set(mrb, info, key_width, val_width);
+  mrb_value mod_val = mrb_obj_value(C_module);
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_bar", 0);
+  mrb_value val_line = mrb_funcall(mrb, block, "call", 1, info);
+  if (mrb->exc) {
+    end_screen();
+    fputs("Error when executing Ruby code:\n", stderr);
+    mrb_print_error(mrb);
+    mrb_close(mrb);
+    exit(1);
+  }
+  mrb_value text_val = mrb_hash_get(
+      mrb, val_line, mrb_symbol_value(mrb_intern_cstr(mrb, "text")));
+  const char *ptr = RSTRING_PTR(text_val);
+  mrb_int len = RSTRING_LEN(text_val);
+  bar_line.line = std::string(ptr, len);
+  mrb_value highlights_val = mrb_hash_get(
+      mrb, val_line, mrb_symbol_value(mrb_intern_cstr(mrb, "highlights")));
+  bar_line.highlights = convert_highlights(mrb, highlights_val);
+  mrb_gc_arena_restore(mrb, ai);
+  return bar_line;
+}
+
+std::string serialize_value(mrb_state *mrb, mrb_value val) {
+  int ai = mrb_gc_arena_save(mrb);
+  mrb_value marshal_module = mrb_obj_value(mrb_module_get(mrb, "Marshal"));
+  mrb_value dumped = mrb_funcall(mrb, marshal_module, "dump", 1, val);
+  if (mrb->exc) {
+    end_screen();
+    fputs("Error when executing Ruby code:\n", stderr);
+    mrb_print_error(mrb);
+    mrb_close(mrb);
+    exit(1);
+  }
+  std::string bytes(RSTRING_PTR(dumped), RSTRING_LEN(dumped));
+  mrb_gc_arena_restore(mrb, ai);
+  return bytes;
+}
+
+mrb_value deserialize_value(mrb_state *mrb, std::string bytes) {
+  if (bytes.empty())
+    return mrb_nil_value();
+  mrb_value marshal_module = mrb_obj_value(mrb_module_get(mrb, "Marshal"));
+  mrb_value val = mrb_funcall(mrb, marshal_module, "load", 1,
+                              mrb_str_new(mrb, bytes.c_str(), bytes.length()));
+  if (mrb->exc) {
+    end_screen();
+    fputs("Error when executing Ruby code:\n", stderr);
+    mrb_print_error(mrb);
+    mrb_close(mrb);
+    exit(1);
+  }
+  return val;
+}
+
+void ruby_copy(const char *text, size_t len) {
+  int ai = mrb_gc_arena_save(mrb);
+  if (C_module == nullptr)
     return;
-  VALUE block = rb_funcall(C_module, rb_intern("b_startup"), 0);
+  mrb_value mod_val = mrb_obj_value(C_module);
-  if (block != Qnil)
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_copy", 0);
-    rb_funcall(block, rb_intern("call"), 0);
+  if (!mrb_nil_p(block))
+    mrb_funcall(mrb, block, "call", 1, mrb_str_new(mrb, text, len));
+  if (mrb->exc) {
+    end_screen();
+    fputs("Error when executing Ruby code:\n", stderr);
+    mrb_print_error(mrb);
+    mrb_close(mrb);
+    exit(1);
+  }
+  mrb_gc_arena_restore(mrb, ai);
+}
+
+std::string ruby_file_detect(std::string filename) {
+  int ai = mrb_gc_arena_save(mrb);
+  if (C_module == nullptr)
+    return "";
+  mrb_value mod_val = mrb_obj_value(C_module);
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_file_detect", 0);
+  if (mrb->exc) {
+    end_screen();
+    fputs("Error when executing Ruby code:\n", stderr);
+    mrb_print_error(mrb);
+    mrb_close(mrb);
+    exit(1);
+  }
+  if (!mrb_nil_p(block)) {
+    mrb_value val =
+        mrb_funcall(mrb, block, "call", 1,
+                    mrb_str_new(mrb, filename.c_str(), filename.length()));
+    if (mrb->exc) {
+      end_screen();
+      fputs("Error when executing Ruby code:\n", stderr);
+      mrb_print_error(mrb);
+      mrb_close(mrb);
+      exit(1);
+    }
+    mrb_value s_val = mrb_funcall(mrb, val, "to_s", 0);
+    if (mrb->exc) {
+      end_screen();
+      fputs("Error when executing Ruby code:\n", stderr);
+      mrb_print_error(mrb);
+      mrb_close(mrb);
+      exit(1);
+    }
+    if (mrb_string_p(s_val)) {
+      std::string result = std::string(RSTRING_PTR(s_val), RSTRING_LEN(s_val));
+      mrb_gc_arena_restore(mrb, ai);
+      return result;
+    }
+  }
+  mrb_gc_arena_restore(mrb, ai);
+  return "";
+}
+
+std::string ruby_paste() {
+  int ai = mrb_gc_arena_save(mrb);
+  if (C_module == nullptr)
+    return "";
+  mrb_value mod_val = mrb_obj_value(C_module);
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_paste", 0);
+  if (!mrb_nil_p(block)) {
+    mrb_value val = mrb_funcall(mrb, block, "call", 0);
+    if (mrb->exc) {
+      end_screen();
+      fputs("Error when executing Ruby code:\n", stderr);
+      mrb_print_error(mrb);
+      mrb_close(mrb);
+      exit(1);
+    }
+    if (mrb_string_p(val)) {
+      std::string result = std::string(RSTRING_PTR(val), RSTRING_LEN(val));
+      mrb_gc_arena_restore(mrb, ai);
+      return result;
+    }
+    mrb_gc_arena_restore(mrb, ai);
+    return "";
+  }
+  mrb_gc_arena_restore(mrb, ai);
+  return "";
 }
 
 void ruby_shutdown() {
-  std::lock_guard lock(ruby_mutex);
+  if (C_module == nullptr)
-  if (C_module == Qnil)
     return;
-  VALUE block = rb_funcall(C_module, rb_intern("b_shutdown"), 0);
+  mrb_value mod_val = mrb_obj_value(C_module);
-  if (block != Qnil)
+  mrb_value block = mrb_funcall(mrb, mod_val, "b_shutdown", 0);
-    rb_funcall(block, rb_intern("call"), 0);
+  if (!mrb_nil_p(block))
+    mrb_funcall(mrb, block, "call", 0);
+  mrb_close(mrb);
+  mrb = nullptr;
+  C_module = nullptr;
 }
 
-inline std::vector<std::string> ruby_array_to_vector(VALUE rb_array) {
+std::vector<std::string> array_to_vector(mrb_value ary) {
   std::vector<std::string> result;
-  if (NIL_P(rb_array) || !RB_TYPE_P(rb_array, T_ARRAY))
+  if (mrb_nil_p(ary) || mrb_type(ary) != MRB_TT_ARRAY)
     return result;
-  for (long i = 0; i < RARRAY_LEN(rb_array); ++i) {
+  mrb_int len = RARRAY_LEN(ary);
-    VALUE item = rb_ary_entry(rb_array, i);
+  for (mrb_int i = 0; i < len; i++) {
-    if (RB_TYPE_P(item, T_STRING))
+    mrb_value item = mrb_ary_ref(mrb, ary, i);
-      result.push_back(StringValueCStr(item));
+    if (mrb_string_p(item))
+      result.push_back(std::string(RSTRING_PTR(item), RSTRING_LEN(item)));
   }
   return result;
 }
 
-void ruby_log(std::string msg) {
-  std::lock_guard lock(ruby_mutex);
-  VALUE str = rb_str_new(msg.c_str(), msg.size());
-  rb_funcall(C_module, rb_intern("queue_log"), 1, str);
-}
-
 void load_custom_highlighters() {
-  std::lock_guard lock(ruby_mutex);
+  if (!C_module)
-  if (C_module == Qnil)
     return;
-  VALUE hashmap = rb_funcall(C_module, rb_intern("highlighters"), 0);
+  mrb_value mod_val = mrb_obj_value((struct RObject *)C_module);
-  if (NIL_P(hashmap))
+  mrb_value hashmap = mrb_funcall(mrb, mod_val, "highlighters", 0);
+  if (mrb_nil_p(hashmap) || mrb_type(hashmap) != MRB_TT_HASH)
     return;
-  VALUE keys = rb_funcall(hashmap, rb_intern("keys"), 0);
+  mrb_value keys = mrb_funcall(mrb, hashmap, "keys", 0);
-  for (long i = 0; i < RARRAY_LEN(keys); ++i) {
+  mrb_int len = RARRAY_LEN(keys);
-    VALUE key_sym = rb_ary_entry(keys, i);
+  for (mrb_int i = 0; i < len; i++) {
-    std::string key = rb_id2name(SYM2ID(key_sym));
+    mrb_value key_sym = mrb_ary_ref(mrb, keys, i);
-    VALUE val_hash = rb_hash_aref(hashmap, key_sym);
+    mrb_sym sym_id = mrb_symbol(key_sym);
-    if (NIL_P(val_hash))
+    const char *key_cstr = mrb_sym_dump(mrb, sym_id);
+    std::string key(key_cstr);
+    mrb_value val_hash = mrb_hash_get(mrb, hashmap, key_sym);
+    if (mrb_nil_p(val_hash) || mrb_type(val_hash) != MRB_TT_HASH)
       continue;
-    VALUE parse_block = rb_hash_aref(val_hash, ID2SYM(rb_intern("parser")));
+    mrb_sym parser_sym = mrb_intern_lit(mrb, "parser");
-    VALUE match_block = rb_hash_aref(val_hash, ID2SYM(rb_intern("matcher")));
+    mrb_sym matcher_sym = mrb_intern_lit(mrb, "matcher");
-    rb_gc_register_address(&match_block);
+    mrb_value parse_block =
-    rb_gc_register_address(&parse_block);
+        mrb_hash_get(mrb, val_hash, mrb_symbol_value(parser_sym));
+    mrb_value match_block =
+        mrb_hash_get(mrb, val_hash, mrb_symbol_value(matcher_sym));
     custom_highlighters[key] = {parse_block, match_block};
   }
+  mrb_garbage_collect(mrb);
 }
 
-bool custom_compare(VALUE match_block, VALUE state1, VALUE state2) {
+bool custom_compare(mrb_value match_block, std::string state1,
-  std::lock_guard lock(ruby_mutex);
+                    std::string state2) {
-  return RTEST(rb_funcall(match_block, rb_intern("call"), 2, state1, state2));
+  if (state1.empty() || state2.empty())
+    return false;
+  int ai = mrb_gc_arena_save(mrb);
+  if (mrb_type(match_block) != MRB_TT_PROC)
+    return false;
+  mrb_value ret =
+      mrb_funcall(mrb, match_block, "call", 2, deserialize_value(mrb, state1),
+                  deserialize_value(mrb, state2));
+  bool result = mrb_test(ret);
+  mrb_gc_arena_restore(mrb, ai);
+  return result;
 }
 
-VALUE parse_custom(std::vector<Token> *tokens, VALUE parser_block,
+std::string parse_custom(std::vector<Token> *tokens, mrb_value parser_block,
-                   const char *line, uint32_t len, VALUE state,
+                         const char *line, uint32_t len, std::string state,
                          uint32_t c_line) {
-  std::lock_guard lock(ruby_mutex);
+  int ai = mrb_gc_arena_save(mrb);
   tokens->clear();
-  if (NIL_P(parser_block))
+  if (mrb_nil_p(parser_block))
-    return {};
+    return "";
-  VALUE ruby_line = rb_str_new(line, len);
+  mrb_value ruby_line = mrb_str_new(mrb, line, len);
-  VALUE line_idx = UINT2NUM(c_line);
+  mrb_value line_idx = mrb_fixnum_value(c_line);
-  VALUE tokens_and_state_hash = rb_funcall(parser_block, rb_intern("call"), 3,
+  mrb_value tokens_and_state_hash =
-                                           ruby_line, state, line_idx);
+      mrb_funcall(mrb, parser_block, "call", 3, ruby_line,
-  VALUE tokens_rb =
+                  deserialize_value(mrb, state), line_idx);
-      rb_hash_aref(tokens_and_state_hash, ID2SYM(rb_intern("tokens")));
+  mrb_sym tokens_sym = mrb_intern_lit(mrb, "tokens");
-  for (long i = 0; i < RARRAY_LEN(tokens_rb); ++i) {
+  mrb_value tokens_rb =
-    VALUE token = rb_ary_entry(tokens_rb, i);
+      mrb_hash_get(mrb, tokens_and_state_hash, mrb_symbol_value(tokens_sym));
+  if (mrb_type(tokens_rb) == MRB_TT_ARRAY) {
+    mrb_int len_tokens = RARRAY_LEN(tokens_rb);
+    for (mrb_int i = 0; i < len_tokens; i++) {
+      mrb_value token = mrb_ary_ref(mrb, tokens_rb, i);
       Token tok;
-    tok.type =
+      tok.type = (TokenKind)mrb_fixnum(mrb_hash_get(
-        (TokenKind)NUM2INT(rb_hash_aref(token, ID2SYM(rb_intern("type"))));
+          mrb, token, mrb_symbol_value(mrb_intern_lit(mrb, "type"))));
-    tok.start = NUM2UINT(rb_hash_aref(token, ID2SYM(rb_intern("start"))));
+      tok.start = (uint32_t)mrb_fixnum(mrb_hash_get(
-    tok.end = NUM2UINT(rb_hash_aref(token, ID2SYM(rb_intern("end"))));
+          mrb, token, mrb_symbol_value(mrb_intern_lit(mrb, "start"))));
+      tok.end = (uint32_t)mrb_fixnum(mrb_hash_get(
+          mrb, token, mrb_symbol_value(mrb_intern_lit(mrb, "end"))));
       if (tok.type < TokenKind::Count && tok.end > tok.start && tok.end <= len)
         tokens->push_back(tok);
     }
-  return rb_hash_aref(tokens_and_state_hash, ID2SYM(rb_intern("state")));
+  }
+  mrb_sym state_sym = mrb_intern_lit(mrb, "state");
+  mrb_value state_rb =
+      mrb_hash_get(mrb, tokens_and_state_hash, mrb_symbol_value(state_sym));
+  std::string result;
+  if (mrb_type(state_rb) == MRB_TT_STRING)
+    result = std::string(RSTRING_PTR(state_rb), RSTRING_LEN(state_rb));
+  mrb_gc_arena_restore(mrb, ai);
+  return result;
 }
 
 static std::vector<R_ThemeEntry> read_theme() {
-  std::lock_guard lock(ruby_mutex);
   std::vector<R_ThemeEntry> result;
-  if (C_module == Qnil)
+  if (!C_module)
     return result;
-  VALUE theme_hash = rb_funcall(C_module, rb_intern("theme"), 0);
+  mrb_value mod_val = mrb_obj_value((struct RObject *)C_module);
-  if (NIL_P(theme_hash))
+  mrb_value theme_hash = mrb_funcall(mrb, mod_val, "theme", 0);
+  if (mrb_nil_p(theme_hash) || mrb_type(theme_hash) != MRB_TT_HASH)
     return result;
-  VALUE keys = rb_funcall(theme_hash, rb_intern("keys"), 0);
+  mrb_value keys = mrb_funcall(mrb, theme_hash, "keys", 0);
-  for (long i = 0; i < RARRAY_LEN(keys); ++i) {
+  mrb_int len_keys = RARRAY_LEN(keys);
-    VALUE key_sym = rb_ary_entry(keys, i);
+  for (mrb_int i = 0; i < len_keys; i++) {
-    std::string key = rb_id2name(SYM2ID(key_sym));
+    mrb_value key_sym = mrb_ary_ref(mrb, keys, i);
-    VALUE val_hash = rb_hash_aref(theme_hash, key_sym);
+    mrb_sym sym_id = mrb_symbol(key_sym);
-    if (NIL_P(val_hash))
+    const char *key_cstr = mrb_sym_dump(mrb, sym_id);
+    std::string key(key_cstr);
+    mrb_value val_hash = mrb_hash_get(mrb, theme_hash, key_sym);
+    if (mrb_nil_p(val_hash) || mrb_type(val_hash) != MRB_TT_HASH)
       continue;
     R_ThemeEntry entry;
     entry.key = key;
-    VALUE fg = rb_hash_aref(val_hash, ID2SYM(rb_intern("fg")));
+    mrb_value fg = mrb_hash_get(mrb, val_hash,
-    VALUE bg = rb_hash_aref(val_hash, ID2SYM(rb_intern("bg")));
+                                mrb_symbol_value(mrb_intern_lit(mrb, "fg")));
-    VALUE italic = rb_hash_aref(val_hash, ID2SYM(rb_intern("italic")));
+    mrb_value bg = mrb_hash_get(mrb, val_hash,
-    VALUE bold = rb_hash_aref(val_hash, ID2SYM(rb_intern("bold")));
+                                mrb_symbol_value(mrb_intern_lit(mrb, "bg")));
-    VALUE underline = rb_hash_aref(val_hash, ID2SYM(rb_intern("underline")));
+    mrb_value italic = mrb_hash_get(
-    VALUE strikethrough =
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "italic")));
-        rb_hash_aref(val_hash, ID2SYM(rb_intern("strikethrough")));
+    mrb_value bold = mrb_hash_get(
-    if (!NIL_P(fg))
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "bold")));
-      entry.fg = NUM2UINT(fg);
+    mrb_value underline = mrb_hash_get(
-    if (!NIL_P(bg))
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "underline")));
-      entry.bg = NUM2UINT(bg);
+    mrb_value strikethrough = mrb_hash_get(
-    if (!NIL_P(italic))
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "strikethrough")));
-      entry.italic = RTEST(italic);
+    if (!mrb_nil_p(fg))
-    if (!NIL_P(bold))
+      entry.fg = (uint32_t)mrb_fixnum(fg);
-      entry.bold = RTEST(bold);
+    if (!mrb_nil_p(bg))
-    if (!NIL_P(underline))
+      entry.bg = (uint32_t)mrb_fixnum(bg);
-      entry.underline = RTEST(underline);
+    if (!mrb_nil_p(italic))
-    if (!NIL_P(strikethrough))
+      entry.italic = mrb_test(italic);
-      entry.strikethrough = RTEST(strikethrough);
+    if (!mrb_nil_p(bold))
+      entry.bold = mrb_test(bold);
+    if (!mrb_nil_p(underline))
+      entry.underline = mrb_test(underline);
+    if (!mrb_nil_p(strikethrough))
+      entry.strikethrough = mrb_test(strikethrough);
     result.push_back(entry);
   }
+  mrb_garbage_collect(mrb);
   return result;
 }
 
@@ -251,59 +527,71 @@ void load_theme() {
 
 std::vector<LSP> read_lsps() {
   std::vector<LSP> result;
-  if (C_module == Qnil)
+  if (!C_module)
     return result;
-  VALUE lsp_hash = rb_funcall(C_module, rb_intern("lsp_config"), 0);
+  mrb_value mod_val = mrb_obj_value((struct RObject *)C_module);
-  if (NIL_P(lsp_hash))
+  mrb_value lsp_hash = mrb_funcall(mrb, mod_val, "lsp_config", 0);
+  if (mrb_nil_p(lsp_hash) || mrb_type(lsp_hash) != MRB_TT_HASH)
     return result;
-  VALUE keys = rb_funcall(lsp_hash, rb_intern("keys"), 0);
+  mrb_value keys = mrb_funcall(mrb, lsp_hash, "keys", 0);
-  for (long i = 0; i < RARRAY_LEN(keys); ++i) {
+  mrb_int len_keys = RARRAY_LEN(keys);
-    VALUE key = rb_ary_entry(keys, i);
+  for (mrb_int i = 0; i < len_keys; i++) {
-    std::string cmd = StringValueCStr(key);
+    mrb_value key = mrb_ary_ref(mrb, keys, i);
-    VALUE args_array = rb_hash_aref(lsp_hash, key);
+    std::string cmd;
-    std::vector<std::string> args = ruby_array_to_vector(args_array);
+    if (mrb_string_p(key))
+      cmd = std::string(RSTRING_PTR(key), RSTRING_LEN(key));
+    else if (mrb_symbol_p(key))
+      cmd = std::string(mrb_sym_dump(mrb, mrb_symbol(key)));
+    mrb_value args_array = mrb_hash_get(mrb, lsp_hash, key);
+    std::vector<std::string> args = array_to_vector(args_array);
     result.push_back({cmd, args});
   }
+  mrb_garbage_collect(mrb);
   return result;
 }
 
 std::vector<R_Language> read_languages() {
   std::vector<R_Language> result;
-  if (C_module == Qnil)
+  if (!C_module)
     return result;
-  VALUE lang_hash = rb_funcall(C_module, rb_intern("languages"), 0);
+  mrb_value mod_val = mrb_obj_value((struct RObject *)C_module);
-  if (NIL_P(lang_hash))
+  mrb_value lang_hash = mrb_funcall(mrb, mod_val, "languages", 0);
+  if (mrb_nil_p(lang_hash) || mrb_type(lang_hash) != MRB_TT_HASH)
     return result;
-  VALUE keys = rb_funcall(lang_hash, rb_intern("keys"), 0);
+  mrb_value keys = mrb_funcall(mrb, lang_hash, "keys", 0);
-  for (long i = 0; i < RARRAY_LEN(keys); ++i) {
+  mrb_int len_keys = RARRAY_LEN(keys);
-    VALUE key = rb_ary_entry(keys, i);
+  for (mrb_int i = 0; i < len_keys; i++) {
-    VALUE val_hash = rb_hash_aref(lang_hash, key);
+    mrb_value key = mrb_ary_ref(mrb, keys, i);
-    if (NIL_P(val_hash))
+    mrb_value val_hash = mrb_hash_get(mrb, lang_hash, key);
+    if (mrb_nil_p(val_hash) || mrb_type(val_hash) != MRB_TT_HASH)
       continue;
     R_Language lang;
-    lang.name = rb_id2name(SYM2ID(key));
+    if (mrb_symbol_p(key))
-    VALUE fg = rb_hash_aref(val_hash, ID2SYM(rb_intern("color")));
+      lang.name = std::string(mrb_sym_dump(mrb, mrb_symbol(key)));
-    VALUE symbol = rb_hash_aref(val_hash, ID2SYM(rb_intern("symbol")));
+    else if (mrb_string_p(key))
-    VALUE extensions = rb_hash_aref(val_hash, ID2SYM(rb_intern("extensions")));
+      lang.name = std::string(RSTRING_PTR(key), RSTRING_LEN(key));
-    VALUE filenames = rb_hash_aref(val_hash, ID2SYM(rb_intern("filenames")));
+    mrb_value fg = mrb_hash_get(mrb, val_hash,
-    VALUE mimetypes = rb_hash_aref(val_hash, ID2SYM(rb_intern("mimetypes")));
+                                mrb_symbol_value(mrb_intern_lit(mrb, "color")));
-    VALUE lsp = rb_hash_aref(val_hash, ID2SYM(rb_intern("lsp")));
+    mrb_value extensions = mrb_hash_get(
-    if (!NIL_P(fg))
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "extensions")));
-      lang.color = NUM2UINT(fg);
+    mrb_value filenames = mrb_hash_get(
-    if (!NIL_P(symbol))
+        mrb, val_hash, mrb_symbol_value(mrb_intern_lit(mrb, "filenames")));
-      lang.symbol = StringValueCStr(symbol);
+    mrb_value lsp = mrb_hash_get(mrb, val_hash,
-    lang.extensions = ruby_array_to_vector(extensions);
+                                 mrb_symbol_value(mrb_intern_lit(mrb, "lsp")));
-    lang.filenames = ruby_array_to_vector(filenames);
+    if (!mrb_nil_p(fg))
-    lang.mimetypes = ruby_array_to_vector(mimetypes);
+      lang.color = (uint32_t)mrb_fixnum(fg);
-    if (!NIL_P(lsp))
+    lang.extensions = array_to_vector(extensions);
-      lang.lsp_command = StringValueCStr(lsp);
+    if (!mrb_nil_p(filenames))
+      lang.filenames = array_to_vector(filenames);
+    if (!mrb_nil_p(lsp))
+      lang.lsp_command = std::string(RSTRING_PTR(lsp), RSTRING_LEN(lsp));
     result.push_back(lang);
   }
+  mrb_garbage_collect(mrb);
   return result;
 }
 
 void load_languages_info() {
-  std::lock_guard lock(ruby_mutex);
   auto langs = read_languages();
   auto lsps_t = read_lsps();
   languages.clear();
@@ -312,29 +600,26 @@ void load_languages_info() {
     l.name = lang.name;
     l.color = lang.color;
     l.lsp_name = lang.lsp_command;
-    l.symbol = lang.symbol;
     languages[lang.name] = l;
     for (auto &ext : lang.extensions)
       language_extensions[ext] = lang.name;
     // TODO: seperate extensions and filenames
     for (auto &filename : lang.filenames)
       language_extensions[filename] = lang.name;
-    for (auto &mimetype : lang.mimetypes)
-      language_mimetypes[mimetype] = lang.name;
   }
   for (auto &lsp : lsps_t)
     lsps[lsp.command] = lsp;
 }
 
 uint8_t read_line_endings() {
-  std::lock_guard lock(ruby_mutex);
+  if (!C_module)
-  if (C_module == Qnil)
     return 1;
-  VALUE le = rb_funcall(C_module, rb_intern("line_endings"), 0);
+  mrb_value mod_val = mrb_obj_value((struct RObject *)C_module);
-  if (!SYMBOL_P(le))
+  mrb_value le = mrb_funcall(mrb, mod_val, "line_endings", 0);
+  if (!mrb_symbol_p(le))
     return 1;
   uint8_t flags = 1;
-  const char *name = rb_id2name(SYM2ID(le));
+  const char *name = mrb_sym_dump(mrb, mrb_symbol(le));
   if (std::strcmp(name, "unix") == 0)
     flags = 0b01;
   else if (std::strcmp(name, "windows") == 0)

src/syntax/parser.cc

@@ -2,7 +2,6 @@
 #include "editor/editor.h"
 #include "io/knot.h"
 #include "main.h"
-#include "ruby/internal/special_consts.h"
 #include "syntax/decl.h"
 #include "syntax/langs.h"
 
@@ -27,176 +26,123 @@ 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);
+  edit(0, 0, editor->root->line_count + 1);
 }
 
-void Parser::edit(uint32_t start_line, uint32_t old_end_line,
+void Parser::edit(uint32_t start_line, uint32_t removed_rows,
                   uint32_t inserted_rows) {
-  std::lock_guard lock(data_mutex);
+  int64_t delta = (int64_t)inserted_rows - (int64_t)removed_rows;
-  if (((int64_t)old_end_line - (int64_t)start_line) > 0)
+  if (delta < 0)
-    line_tree.erase(start_line, old_end_line - start_line);
+    line_tree.erase(start_line, (uint32_t)(-delta));
-  if (inserted_rows > 0)
+  else if (delta > 0)
-    line_tree.insert(start_line, inserted_rows);
+    line_tree.insert(start_line, (uint32_t)delta);
-  if (start_line > 0)
+  uint32_t span = MAX(removed_rows, inserted_rows);
-    dirty_lines.push(start_line - 1);
+  uint32_t begin = (start_line > 0) ? start_line - 1 : 0;
-  dirty_lines.push(start_line);
+  uint32_t end = start_line + span;
-  dirty_lines.push(start_line + 1);
+  for (uint32_t line = begin; line <= end + 1; ++line)
+    dirty_lines.push(line);
 }
 
 void Parser::work() {
   if (!editor || !editor->root)
     return;
-  std::shared_lock k_lock(editor->knot_mtx);
+  std::vector<uint32_t> batch;
-  k_lock.unlock();
-  uint32_t capacity = 256;
-  char *text = (char *)calloc((capacity + 1), sizeof(char));
-  std::unique_lock lock_data(data_mutex);
-  lock_data.unlock();
-  std::unique_lock lock(mutex);
-  lock.unlock();
   uint32_t c_line;
-  while (dirty_lines.pop(c_line)) {
+  while (dirty_lines.pop(c_line))
-    if (!running.load(std::memory_order_relaxed)) {
+    batch.push_back(c_line);
-      free(text);
+  uint32_t i = MAX(0, (int64_t)scroll_max - 60);
-      return;
+  LineData *l_iter = line_tree.start_iter(i);
+  while (l_iter && i < scroll_max + 10) {
+    if (!l_iter->out_state)
+      batch.push_back(i);
+    i++;
+    l_iter = line_tree.next();
   }
-    if (c_line > scroll_max + 40) {
+  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 max_line = scroll_max + 10;
+    if (c_line < min_line || c_line > max_line) {
       dirty_lines.push(c_line);
       continue;
     }
-    if (scroll_max > 50 && c_line < scroll_max - 50) {
+    uint32_t scroll_snapshot = scroll_max;
-      dirty_lines.push(c_line);
+    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::shared_lock k_lock(editor->knot_mtx);
+    LineIterator *it = begin_l_iter(editor->root, c_line);
+    if (!it)
       continue;
+    uint32_t cur_line = c_line;
+    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);
+        break;
       }
-    uint32_t line_count = line_tree.count();
+      if (cur_line < min_line || cur_line > max_line) {
-    lock_data.lock();
+        dirty_lines.push(cur_line);
-    std::shared_ptr<void> prev_state =
+        break;
-        (c_line > 0) && c_line < line_tree.count()
-            ? line_tree.at(c_line - 1)->out_state
-            : nullptr;
-    lock_data.unlock();
-    while (c_line < line_count) {
-      if (!running.load(std::memory_order_relaxed)) {
-        free(text);
-        return;
       }
-      if (scroll_dirty.exchange(false, std::memory_order_acq_rel)) {
+      uint32_t len;
-        dirty_lines.push(c_line);
+      char *line = next_line(it, &len);
-        c_line = scroll_max < 50 ? 0 : scroll_max - 50;
+      if (!line)
-      }
+        break;
-      k_lock.lock();
+      LineData *line_data = line_tree.at(cur_line);
-      if (c_line > editor->root->line_count) {
-        k_lock.unlock();
-        continue;
-      }
-      uint32_t r_offset, r_len;
-      r_offset = line_to_byte(editor->root, c_line, &r_len);
-      if (r_len > capacity) {
-        capacity = r_len;
-        text = (char *)realloc(text, capacity + 1);
-        memset(text, 0, capacity + 1);
-      }
-      read_into(editor->root, r_offset, r_len, text);
-      k_lock.unlock();
-      if (c_line < scroll_max &&
-          ((scroll_max > 100 && c_line > scroll_max - 100) || c_line < 100))
-        lock.lock();
-      if (line_tree.count() < c_line) {
-        if (lock.owns_lock())
-          lock.unlock();
-        continue;
-      }
-      lock_data.lock();
-      LineData *line_data = line_tree.at(c_line);
       if (!line_data) {
-        lock_data.unlock();
+        cur_line++;
-        if (lock.owns_lock())
-          lock.unlock();
         continue;
       }
-      std::shared_ptr<void> new_state{nullptr};
+      std::shared_ptr<void> new_state;
       if (is_custom) {
-        VALUE state = Qnil;
+        std::string state = "";
-        if (prev_state) {
+        if (prev_state)
-          std::shared_ptr<CustomState> state_ptr =
+          state = std::static_pointer_cast<std::string>(prev_state)->c_str();
-              std::static_pointer_cast<CustomState>(prev_state);
+        std::string out_state = parse_custom(&line_data->tokens, parser_block,
-          state = state_ptr->state;
+                                             line, len, state, cur_line);
-        }
+        new_state = std::make_shared<std::string>(out_state);
-        VALUE out_state = parse_custom(&line_data->tokens, parser_block, text,
-                                       r_len, state, c_line);
-        std::shared_ptr<CustomState> out_state_ptr =
-            std::make_shared<CustomState>(out_state);
-        new_state = out_state_ptr;
       } else {
         new_state =
-            parse_func(&line_data->tokens, prev_state, text, r_len, c_line);
+            parse_func(&line_data->tokens, prev_state, line, len, cur_line);
       }
       line_data->in_state = prev_state;
       line_data->out_state = new_state;
-      if (!running.load(std::memory_order_relaxed)) {
+      bool done = false;
-        free(text);
+      if (cur_line + 1 < line_count) {
-        return;
+        LineData *next_line_data = line_tree.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()
+                                : "";
+            done = custom_compare(match_block, a, b);
+          } else {
+            done = state_match_func(new_state, next_line_data->in_state);
+          }
+        }
       }
       prev_state = new_state;
-      c_line++;
+      cur_line++;
-      if (c_line < line_count && c_line > scroll_max + 50 && scroll_max < 50 &&
+      if (done)
-          c_line < scroll_max + 50) {
-        lock_data.unlock();
-        if (lock.owns_lock())
-          lock.unlock();
-        if (c_line > 0)
-          dirty_lines.push(c_line - 1);
-        dirty_lines.push(c_line);
         break;
     }
-      if (c_line < line_count && (line_data = line_tree.at(c_line))) {
+    free(it->buffer);
-        bool done = false;
+    free(it);
-        if (is_custom) {
-          VALUE in_state_v = Qnil;
-          if (prev_state)
-            in_state_v =
-                std::static_pointer_cast<CustomState>(prev_state)->state;
-          VALUE out_state_v = Qnil;
-          if (line_data->in_state)
-            out_state_v =
-                std::static_pointer_cast<CustomState>(line_data->in_state)
-                    ->state;
-          done = custom_compare(match_block, in_state_v, out_state_v);
-        } else {
-          done = state_match_func(prev_state, line_data->in_state);
   }
-        if (done) {
-          lock_data.unlock();
-          if (lock.owns_lock())
-            lock.unlock();
-          break;
-        }
-      }
-      lock_data.unlock();
-      if (lock.owns_lock())
-        lock.unlock();
-    }
-    if (!running.load(std::memory_order_relaxed)) {
-      free(text);
-      return;
-    }
-  }
-  free(text);
-  lock_data.lock();
 }
 
-void Parser::scroll(uint32_t line) {
+void Parser::scroll(uint32_t line) { scroll_max = line; }
-  if (line != scroll_max) {
-    scroll_max = line;
-    uint32_t c_line = line > 50 ? line - 50 : 0;
-    if (c_line >= line_tree.count())
-      return;
-    std::unique_lock lock_data(data_mutex);
-    if (line_tree.at(c_line)->in_state || line_tree.at(c_line)->out_state)
-      return;
-    scroll_dirty = true;
-    dirty_lines.push(c_line);
-  } else {
-    scroll_max = line;
-  }
-}

src/ui/bar.cc

@@ -1,78 +1,79 @@
 #include "ui/bar.h"
 #include "io/sysio.h"
+#include "lsp/lsp.h"
 #include "main.h"
+#include "syntax/decl.h"
+
+void Bar::log(std::string message) { log_line = message; }
 
 void Bar::render() {
+  USING(LSPInstance);
   Editor *editor = editors[current_editor];
+  BarLine bar_line =
+      bar_contents(mode, editor->lang.name, editor->warnings.size(),
+                   editor->lsp ? editor->lsp->lsp->command : "",
+                   editor->filename, editor->filename, editor->cursor.row + 1,
+                   editor->root->line_count + 1, screen.col);
   uint32_t row = screen.row - 2;
-  uint32_t col = 0;
   uint32_t width = screen.col;
-  UNUSED(width);
+  std::string &line = bar_line.line;
-  uint32_t color = 0;
+  uint32_t i = 0;
-  uint32_t black = 0x0b0e14;
+  uint32_t col = 0;
-  uint32_t grey = 0x33363c;
+  while (i < line.length()) {
-  uint32_t dark_grey = 0x24272d;
+    uint32_t cluster_len =
-  uint32_t name_color = 0xced4df;
+        grapheme_next_character_break_utf8(line.c_str() + i, line.length() - i);
-  uint32_t lang_color = editor->lang.color;
+    std::string cluster = line.substr(i, cluster_len);
-  const char *symbol = "󱓧 ";
+    int width = display_width(cluster.c_str(), cluster_len);
-  const char *name = "EDITOR";
+    Highlight highlight = bar_line.get_highlight(col);
-  switch (mode) {
+    update(row, col, cluster.c_str(), highlight.fg, highlight.bg,
-  case NORMAL:
+           highlight.flags);
-    color = 0x82AAFF;
+    col += width;
-    symbol = " ";
+    i += cluster_len;
-    name = "NORMAL";
+    for (int w = 1; w < width; w++)
-    break;
+      update(row, col - w, "\x1b", highlight.fg, highlight.bg, highlight.flags);
-  case INSERT:
-    color = 0xFF8F40;
-    symbol = "󱓧 ";
-    name = "INSERT";
-    break;
-  case SELECT:
-    color = 0x9ADE7A;
-    symbol = "󱩧 ";
-    name = "SELECT";
-    break;
-  case RUNNER:
-    color = 0xFFD700;
-    symbol = " ";
-    name = "RUNNER";
-    break;
-  case JUMPER:
-    color = 0xF29CC3;
-    symbol = " ";
-    name = "JUMPER";
-    break;
   }
-  update(row, col, " ", black, color, CF_BOLD);
+  while (col < width)
-  update(row, ++col, symbol, black, color, CF_BOLD);
+    update(row, col++, " ", 0, 0, 0);
-  update(row, ++col, "\x1b", black, color, CF_BOLD);
+  col = 0;
-  update(row, ++col, " ", black, color, CF_BOLD);
+  row++;
-  for (uint32_t i = 0; i < 6; i++)
+  if (mode == RUNNER) {
-    update(row, ++col, {name[i], 0}, black, color, CF_BOLD);
+    update(row, col++, ":", 0xFFFFFF, 0, 0);
-  update(row, ++col, " ", black, color, CF_BOLD);
+    for (char c : command)
-  update(row, ++col, "◗", color, grey, CF_BOLD);
+      update(row, col++, (char[2]){c, 0}, 0xFFFFFF, 0, 0);
-  update(row, ++col, "◗", grey, dark_grey, CF_BOLD);
+  } else {
-  update(row, ++col, " ", name_color, dark_grey, CF_BOLD);
+    for (char c : log_line)
-  update(row, ++col, editor->lang.symbol, lang_color, dark_grey, 0);
+      update(row, col++, (char[2]){c, 0}, 0xFFFFFF, 0, 0);
-  update(row, ++col, "\x1b", lang_color, dark_grey, 0);
+  }
-  update(row, ++col, " ", name_color, dark_grey, CF_BOLD);
+  while (col < width)
-  std::string filename = filename_from_path(editor->filename);
+    update(row, col++, " ", 0, 0, 0);
-  for (uint32_t i = 0; i < filename.length(); i++)
-    update(row, ++col, {filename[i], 0}, name_color, dark_grey, CF_BOLD);
-  update(row, ++col, " ", name_color, dark_grey, CF_BOLD);
-  update(row, ++col, "◗", dark_grey, 1, CF_BOLD);
 }
 
 void Bar::handle(KeyEvent event) {
   if (event.key_type == KEY_CHAR && event.len == 1) {
     if (event.c[0] == 0x1B) {
+      command = "";
       mode = NORMAL;
     } else if (event.c[0] == '\n' || event.c[0] == '\r') {
-      // execute command while stripping starting `[:;]`
+      command = trim(command);
+      if (command == "w") {
+        save_file(editors[current_editor]);
+      } else if (command == "q") {
+        running = false;
+      } else if (command == "wq") {
+        save_file(editors[current_editor]);
+        running = false;
+      }
       mode = NORMAL;
       command = "";
     } else if (isprint((unsigned char)(event.c[0]))) {
-    } else if (event.c[0] == 0x7F || event.c[0] == 0x08) { // backspace
+      command += event.c[0];
+    } else if (event.c[0] == 0x7F || event.c[0] == 0x08) {
+      if (command.length() > 0) {
+        command = command.substr(0, command.length() - 1);
+      } else {
+        mode = NORMAL;
+        command = "";
+      }
     }
   } else if (event.key_type == KEY_SPECIAL) {
     switch (event.special_key) {

src/ui/completionbox.cc

@@ -71,7 +71,9 @@ void CompletionBox::render_update() {
   uint32_t max_label_len = 0;
   uint32_t max_detail_len = 0;
   uint32_t max_kind_len = 0;
-  for (auto i : session->visible) {
+  for (uint32_t x = session->scroll;
+       x < session->scroll + 8 && x < session->visible.size(); x++) {
+    uint32_t i = session->visible[x];
     if (i >= session->items.size())
       continue;
     auto &item = session->items[i];
@@ -81,7 +83,9 @@ void CompletionBox::render_update() {
     max_kind_len =
         MAX(max_kind_len, (uint32_t)item_kind_name(item.kind).size());
   }
-  size.row = session->visible.size() + 2;
+  uint32_t total = session->visible.size();
+  uint32_t rows = MIN(total, 8);
+  size.row = rows + 2;
   size.col = 2 + 2 + max_label_len + 1 + max_detail_len + 2 + max_kind_len + 1;
   cells.assign(size.row * size.col, {" ", 0, 0, 0, 0, 0});
   auto set = [&](uint32_t r, uint32_t c, const char *text, uint32_t fg,
@@ -95,8 +99,10 @@ void CompletionBox::render_update() {
   for (uint32_t c = 1; c < size.col - 1; c++)
     set(0, c, "─", border_fg, 0, 0);
   set(0, size.col - 1, "┐", border_fg, 0, 0);
-  for (uint32_t row_idx = 0; row_idx < session->visible.size(); row_idx++) {
+  uint32_t start = session->scroll;
-    uint32_t r = row_idx + 1;
+  uint32_t end = MIN(start + 8, session->visible.size());
+  for (uint32_t row_idx = start; row_idx < end; row_idx++) {
+    uint32_t r = (row_idx - start) + 1;
     auto &item = session->items[session->visible[row_idx]];
     uint32_t bg = (session->visible[row_idx] == session->select) ? sel_bg : 1;
     uint32_t fg = 0xFFFFFF;
@@ -130,6 +136,12 @@ void CompletionBox::render_update() {
   for (uint32_t c = 1; c < size.col - 1; c++)
     set(bottom, c, "─", border_fg, 0, 0);
   set(bottom, size.col - 1, "┘", border_fg, 0, 0);
+  if (session->visible.size() > 8) {
+    std::string info = std::to_string(start + 1) + "-" + std::to_string(end) +
+                       "/" + std::to_string(session->visible.size());
+    for (size_t i = 0; i < info.size() && i < size.col - 2; i++)
+      set(bottom, 1 + i, (char[2]){info[i], 0}, border_fg, 0, 0);
+  }
 }
 
 void CompletionBox::render(Coord pos) {

src/utils/system.cc

@@ -1,8 +1,8 @@
+#include "scripting/decl.h"
 #include "utils/utils.h"
 
 std::unordered_map<std::string, Language> languages;
 std::unordered_map<std::string, std::string> language_extensions;
-std::unordered_map<std::string, std::string> language_mimetypes;
 std::unordered_map<std::string, LSP> lsps;
 
 void log(const char *fmt, ...) {
@@ -106,88 +106,18 @@ static std::string file_extension(const char *filename) {
   return ext;
 }
 
-char *detect_file_type(const char *filename) {
-  magic_t magic = magic_open(MAGIC_MIME_TYPE);
-  if (!magic)
-    return nullptr;
-  if (magic_load(magic, nullptr) != 0) {
-    magic_close(magic);
-    return nullptr;
-  }
-  const char *type = magic_file(magic, filename);
-  if (!type) {
-    magic_close(magic);
-    return nullptr;
-  }
-  char *result = strdup(type);
-  magic_close(magic);
-  return result;
-}
-
 Language language_for_file(const char *filename) {
   std::string ext = file_extension(filename);
-  std::string lang_name;
   if (!ext.empty()) {
     auto it = language_extensions.find(ext);
     if (it != language_extensions.end())
       return languages.find(it->second)->second;
   }
-  char *mime = detect_file_type(filename);
+  std::string lang_name = ruby_file_detect(filename);
-  if (mime) {
+  if (!lang_name.empty()) {
-    std::string mime_type(mime);
+    auto it = languages.find(lang_name);
-    free(mime);
+    if (it != languages.end())
-    auto it = language_mimetypes.find(mime_type);
+      return it->second;
-    if (it != language_mimetypes.end())
-      return languages.find(it->second)->second;
   }
   return Language{};
 }
-
-char *get_from_clipboard(uint32_t *out_len) {
-  FILE *pipe = popen("xclip -selection clipboard -o", "r");
-  if (!pipe) {
-    *out_len = 0;
-    return nullptr;
-  }
-  size_t capacity = 4096;
-  size_t length = 0;
-  char *buffer = (char *)malloc(capacity);
-  if (!buffer) {
-    pclose(pipe);
-    *out_len = 0;
-    return nullptr;
-  }
-  size_t n;
-  while ((n = fread(buffer + length, 1, capacity - length, pipe)) > 0) {
-    length += n;
-    if (length == capacity) {
-      capacity *= 2;
-      char *tmp = (char *)realloc(buffer, capacity);
-      if (!tmp) {
-        free(buffer);
-        pclose(pipe);
-        *out_len = 0;
-        return nullptr;
-      }
-      buffer = tmp;
-    }
-  }
-  pclose(pipe);
-  char *result = (char *)realloc(buffer, length + 1);
-  if (result) {
-    result[length] = '\0';
-    buffer = result;
-  } else {
-    buffer[length] = '\0';
-  }
-  *out_len = length;
-  return buffer;
-}
-
-void copy_to_clipboard(const char *text, size_t len) {
-  FILE *pipe = popen("xclip -selection clipboard", "w");
-  if (!pipe)
-    return;
-  fwrite(text, sizeof(char), len, pipe);
-  pclose(pipe);
-}

src/utils/unicode.cc

@@ -1,4 +1,3 @@
-#include "utfcpp/source/utf8.h"
 #include "utils/utils.h"
 
 int display_width(const char *str, size_t len) {
@@ -99,42 +98,48 @@ uint32_t count_clusters(const char *line, size_t len, size_t from, size_t to) {
   return count;
 }
 
-size_t utf8_offset_to_utf16(const char *utf8, size_t utf8_len,
+size_t utf8_offset_to_utf16(const char *s, size_t utf8_len, size_t byte_pos) {
-                            size_t byte_offset) {
+  if (byte_pos > utf8_len)
-  if (byte_offset > utf8_len)
+    return 0;
-    return byte_offset;
+  size_t utf16_units = 0;
-  const char *start = utf8;
+  size_t i = 0;
-  const char *mid = utf8 + byte_offset;
+  while (i < byte_pos) {
-  if (!utf8::is_valid(start, mid))
+    unsigned char c = s[i];
-    assert(0 && "invalid utf8");
+    if ((c & 0x80) == 0x00) {
-  size_t utf16_offset = 0;
+      i += 1;
-  for (auto it = start; it < mid;) {
+      utf16_units += 1;
-    uint32_t codepoint = utf8::next(it, mid);
+    } else if ((c & 0xE0) == 0xC0) {
-    if (codepoint <= 0xFFFF)
+      i += 2;
-      utf16_offset += 1;
+      utf16_units += 1;
-    else
+    } else if ((c & 0xF0) == 0xE0) {
-      utf16_offset += 2;
+      i += 3;
+      utf16_units += 1;
+    } else {
+      i += 4;
+      utf16_units += 2;
     }
-  return utf16_offset;
+  }
+  return utf16_units;
 }
 
-size_t utf16_offset_to_utf8(const char *utf8, size_t utf8_len,
+size_t utf16_offset_to_utf8(const char *s, size_t utf8_len, size_t utf16_pos) {
-                            size_t utf16_offset) {
+  size_t utf16_units = 0;
-  const char *start = utf8;
+  size_t i = 0;
-  const char *end = utf8 + utf8_len;
+  while (utf16_units < utf16_pos && i < utf8_len) {
-  const char *it = start;
+    unsigned char c = s[i];
-  size_t utf16_count = 0;
+    if ((c & 0x80) == 0x00) {
-  while (it < end) {
+      i += 1;
-    if (utf16_count >= utf16_offset)
+      utf16_units += 1;
-      break;
+    } else if ((c & 0xE0) == 0xC0) {
-    const char *prev = it;
+      i += 2;
-    uint32_t codepoint = utf8::next(it, end);
+      utf16_units += 1;
-    if (codepoint <= 0xFFFF)
+    } else if ((c & 0xF0) == 0xE0) {
-      utf16_count += 1;
+      i += 3;
-    else
+      utf16_units += 1;
-      utf16_count += 2;
+    } else {
-    if (utf16_count > utf16_offset)
+      i += 4;
-      return prev - start;
+      utf16_units += 2;
     }
-  return it - start;
+  }
+  return i;
 }