bunmicro 0.9.5 → 0.9.9

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.9.9] - 2026-06-04
+- Added long line protection for softwrap
+  * That means binary edits available
+  * you can now open libc.so.6
+  * Ctrl+E reopen hex3 to edit & save
+- Fixed softwrap search match cross line
+
 ## [0.9.5] - 2026-06-03
 - Added encoding hex3 for binary edit
 - term better supports fish

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunmicro",
-  "version": "0.9.5",
+  "version": "0.9.9",
   "description": "Bun JavaScript rewrite of the micro editor originally in Golang",
   "type": "module",
   "main": "./src/index.js",

package/src/index.js

@@ -101,6 +101,8 @@ const DEFAULT_SETTINGS = {
 };
 
 const LONG_LINE_REHIGHLIGHT_LIMIT = 300;
+// Lines exceeding this are never highlighted interactively; stored as default and deferred to Esc.
+const LONG_LINE_INITIAL_HIGHLIGHT_LIMIT = 10_000;
 
 const promptHistory = new Map();
 let startupHighlightProgress = null;
@@ -340,8 +342,11 @@ function normalizeCharBoundary(line, idx) {
 // breaks[0] === 0 always. breaks[k] is the start of visual row k within `line`.
 // Tabs are treated as `tabsize` columns wide (consistent with the renderer).
 // With wordwrap=true, breaks at word boundaries; with wordwrap=false, hard-wraps at bufWidth.
+let _swCacheLine = null, _swCacheBufWidth = 0, _swCacheWordwrap = false, _swCacheTabsize = 4, _swCacheBreaks = null;
 function softwrapBreaks(line, bufWidth, wordwrap, tabsize) {
   if (bufWidth <= 0) return [0];
+  if (line === _swCacheLine && bufWidth === _swCacheBufWidth && wordwrap === _swCacheWordwrap && tabsize === _swCacheTabsize)
+    return _swCacheBreaks;
   const breaks = [0];
   let visualX = 0;    // display col within current visual row
   let wordStart = 0;  // code-unit index of current word start
@@ -381,6 +386,7 @@ function softwrapBreaks(line, bufWidth, wordwrap, tabsize) {
     }
   }
 
+  _swCacheLine = line; _swCacheBufWidth = bufWidth; _swCacheWordwrap = wordwrap; _swCacheTabsize = tabsize; _swCacheBreaks = breaks;
   return breaks;
 }
 
@@ -569,6 +575,9 @@ function parseInput(args) {
 }
 
 class BufferModel {
+  get searchPattern() { return this._searchPattern ?? ""; }
+  set searchPattern(v) { this._searchPattern = v ?? ""; this.searchMatches?.clear(); }
+
   constructor({ path = "", text = "", command = {}, type = "default", readonly = false, modTimeMs = null, encoding = DEFAULT_SETTINGS.encoding } = {}) {
     this.path = path;
     this.type = type;
@@ -589,6 +598,7 @@ class BufferModel {
     this.acSuggestions = [];
     this.acCompletions = [];
     this.acCurIdx = -1;
+    this.searchMatches = new Map();
     this.searchPattern = "";
     this.command = command;
     this.filetype = "unknown";
@@ -660,6 +670,8 @@ class BufferModel {
 
   invalidateHighlightFrom(lineNo = 0, options = {}) {
     this._editRev = (this._editRev ?? 0) + 1;
+    if (options.force) this.searchMatches?.clear();
+    else this.searchMatches?.delete(lineNo);
     invalidateHighlightFrom(this, lineNo, options);
   }
 
@@ -2066,12 +2078,14 @@ class App {
         const isCL = clBg && lineNo === buf.cursor.y && !pane.selection;
         if (gutterW > 0) renderGutter(lineNo, row, screenRow);
         if (lineNo < buf.lines.length) {
-          const cells = renderHighlightedCells(buf, lineNo, buf.scroll.x, maxW, this.context.colorscheme, pane.selection, buf.searchPattern, braceMatches, isCL ? clBg : null);
+          const cells = renderHighlightedCells(buf, lineNo, buf.scroll.x, maxW, this.context.colorscheme, pane.selection, getLineSearchRanges(buf, lineNo), braceMatches, isCL ? clBg : null);
           putCells(this.screen, pane.x + gutterW, screenRow, cells, maxW);
         }
       }
     } else {
       let sloc = { line: buf.scroll.y, row: buf.scroll.row ?? 0 };
+      let _swBreaksLineNo = -1, _swBreaks = null;
+      let _swSearchLineNo = -1, _swSearchRanges = [];
       for (let screenY = 0; screenY < pane.h; screenY++) {
         const screenRow = pane.y + screenY;
         const { line: lineNo, row: subRow } = sloc;
@@ -2079,13 +2093,15 @@ class App {
         if (lineNo >= buf.lines.length) break;
 
         const lineStr = buf.lines[lineNo] ?? "";
-        const breaks = softwrapBreaks(lineStr, maxW, wordwrap, tabsize);
+        if (lineNo !== _swBreaksLineNo) { _swBreaks = softwrapBreaks(lineStr, maxW, wordwrap, tabsize); _swBreaksLineNo = lineNo; }
+        if (lineNo !== _swSearchLineNo) { _swSearchRanges = getLineSearchRanges(buf, lineNo); _swSearchLineNo = lineNo; }
+        const breaks = _swBreaks;
         const segStart = breaks[subRow] ?? 0;
         const isCL = clBg && lineNo === buf.cursor.y && !pane.selection;
 
         if (gutterW > 0) renderGutter(lineNo, screenY, screenRow, subRow);
 
-        const cells = renderHighlightedCells(buf, lineNo, segStart, maxW, this.context.colorscheme, pane.selection, buf.searchPattern, braceMatches, isCL ? clBg : null);
+        const cells = renderHighlightedCells(buf, lineNo, segStart, maxW, this.context.colorscheme, pane.selection, _swSearchRanges, braceMatches, isCL ? clBg : null);
         putCells(this.screen, pane.x + gutterW, screenRow, cells, maxW);
 
         if (subRow + 1 < breaks.length) {
@@ -4995,6 +5011,15 @@ function highlightBufferLine(buf, lineNo) {
     if (!cache.forceLongLineRehighlight && cache.dirtyLongLines.has(y) && cache.results[y]) {
       result = cache.results[y];
       state = cache.states[y] ?? null;
+    } else if (!cache.forceLongLineRehighlight && line.length > LONG_LINE_INITIAL_HIGHLIGHT_LIMIT) {
+      // Too long to highlight interactively — store a default result and mark dirty for Esc rehighlight.
+      if (!cache.results[y]) {
+        cache.results[y] = { changes: new Map([[0, "default"], [line.length, "default"]]), state: null };
+        cache.states[y] = null;
+      }
+      result = cache.results[y];
+      state = null;
+      cache.dirtyLongLines.add(y);
     } else {
       const progress = startupHighlightProgress
         ? (pos) => startupHighlightProgress.linePosition(pos, y, target)
@@ -5031,6 +5056,11 @@ function invalidateHighlightFrom(buf, lineNo = 0, { force = false } = {}) {
   if (!cache) return;
   const from = Math.max(0, Math.trunc(Number(lineNo) || 0));
   const line = buf.lines[from] ?? "";
+  // Hard limit: never clear cache for very long lines even on force — mark dirty instead.
+  if (line.length > LONG_LINE_INITIAL_HIGHLIGHT_LIMIT && cache.results[from]) {
+    cache.dirtyLongLines.add(from);
+    return;
+  }
   if (!force && line.length > LONG_LINE_REHIGHLIGHT_LIMIT && cache.results[from]) {
     cache.dirtyLongLines.add(from);
     return;
@@ -5452,6 +5482,7 @@ function findMatchingBracePositions(buf) {
 
 function findMatchingBracePair(buf) {
   if (!(buf?.Settings?.matchbrace ?? DEFAULT_SETTINGS.matchbrace)) return null;
+  if ((buf.lines[buf.cursor.y] ?? "").length > LONG_LINE_INITIAL_HIGHLIGHT_LIMIT) return null;
   const left = braceAt(buf, buf.cursor.x - 1, buf.cursor.y);
   const right = braceAt(buf, buf.cursor.x, buf.cursor.y);
   let origin = null;
@@ -5509,7 +5540,7 @@ function braceKey(loc) {
   return String(loc.y) + ":" + String(loc.x);
 }
 
-function renderHighlightedCells(buf, lineNo, scrollX, maxWidth, colorscheme, selection = null, searchPattern = "", braceMatches = null, cursorLineBg = null) {
+function renderHighlightedCells(buf, lineNo, scrollX, maxWidth, colorscheme, selection = null, searchRanges = [], braceMatches = null, cursorLineBg = null) {
   const raw = buf.lines[lineNo] ?? "";
   const cells = [];
   let width = 0;
@@ -5520,8 +5551,6 @@ function renderHighlightedCells(buf, lineNo, scrollX, maxWidth, colorscheme, sel
     if (changes.length === 0 || changes[0][0] !== 0) changes.unshift([0, "default"]);
     changes.push([raw.length, changes.at(-1)?.[1] ?? "default"]);
   }
-
-  const searchRanges = searchPattern ? getSearchRanges(raw, searchPattern, buf.Settings?.ignorecase ?? true) : [];
   // Go: cursor-line bg is skipped when a syntax style already has a non-default background (preservebg)
   const defBg = colorscheme?.defaultStyle?.bg ?? "default";
 
@@ -5537,6 +5566,7 @@ function renderHighlightedCells(buf, lineNo, scrollX, maxWidth, colorscheme, sel
     : null;
 
   let changeIndex = 0;
+  let searchIdx = 0;
   let i = scrollX;
   while (i < raw.length && width < maxWidth) {
     const cp = raw.codePointAt(i);
@@ -5550,7 +5580,8 @@ function renderHighlightedCells(buf, lineNo, scrollX, maxWidth, colorscheme, sel
     const syntaxStyle = colorscheme?.get(group) ?? colorscheme?.defaultStyle ?? {};
     const preservebg = cursorLineBg != null && syntaxStyle.bg !== undefined && syntaxStyle.bg !== defBg;
     const baseStyle = (cursorLineBg && !preservebg) ? { ...syntaxStyle, bg: cursorLineBg } : syntaxStyle;
-    const inSearch = searchRanges.some(([from, to]) => i >= from && i < to);
+    while (searchIdx < searchRanges.length && searchRanges[searchIdx][1] <= i) searchIdx++;
+    const inSearch = searchIdx < searchRanges.length && i >= searchRanges[searchIdx][0] && i < searchRanges[searchIdx][1];
     const selected = isSelected(selection, lineNo, i, i + charLen);
     const braceMatched = braceMatches?.has(String(lineNo) + ":" + String(i));
     let style = (showTrailingWs && i >= trailingWsIdx) ? trailingWsStyle : baseStyle;
@@ -5657,7 +5688,17 @@ function allMatchPositions(text, re, literal) {
   return positions;
 }
 
-function getSearchRanges(line, pattern, ignoreCase = false) {
+function getLineSearchRanges(buf, lineNo) {
+  if (!buf.searchPattern) return [];
+  if (!buf.searchMatches.has(lineNo)) {
+    const raw = buf.lines[lineNo] ?? "";
+    const ignoreCase = buf.Settings?.ignorecase ?? true;
+    buf.searchMatches.set(lineNo, getSearchRanges(raw, buf.searchPattern, ignoreCase));
+  }
+  return buf.searchMatches.get(lineNo);
+}
+
+function getSearchRanges(line, pattern, ignoreCase = false, rangeStart = 0, rangeEnd = line.length) {
   if (!pattern) return [];
   let re;
   try {
@@ -5667,16 +5708,18 @@ function getSearchRanges(line, pattern, ignoreCase = false) {
   }
   const ranges = [];
   if (re) {
+    re.lastIndex = rangeStart;
     let m;
     while ((m = re.exec(line)) !== null) {
+      if (m.index >= rangeEnd) break;
       if (m[0].length === 0) { re.lastIndex++; continue; }
       ranges.push([m.index, m.index + m[0].length]);
     }
   } else {
-    let idx = 0;
-    while (idx < line.length) {
+    let idx = rangeStart;
+    while (idx < rangeEnd) {
       const pos = line.indexOf(pattern, idx);
-      if (pos < 0) break;
+      if (pos < 0 || pos >= rangeEnd) break;
       ranges.push([pos, pos + pattern.length]);
       idx = pos + pattern.length;
     }

package/todo.txt

@@ -68,6 +68,12 @@ Current handoff notes
     - Lines over 300 chars keep their old cached highlight/state when dirtied, mark the row dirty, and defer full rehighlight until Esc.
     - Dirty long lines render red in the gutter and in the statusline row field.
     - Startup and Esc rehighlight show colorful bottom progress by highlighted character count, wrapped with Bun.wrapAnsi.
+[x] Recent 0.9.x updates:
+    - Added hex3 encoding for binary edit/open/save paths and encoding completion.
+    - --cat/--bat-style highlighting supports HTTP/HTTPS URLs.
+    - Terminal pane close behavior improved: exited terminals show "Press enter to close" and Enter closes/restores the pane.
+    - Added Alt-s selection mode plus more Alt key help/defaultkey documentation.
+    - Added Dedent/Unindent action aliases for outdent actions.
 [!] Known follow-up: syntax detection still needs Go parity. todo.txt can be misdetected as filetype B because signatures are considered globally instead of only disambiguating filename/header matches.
 [!] Known tool note: apply_patch is currently unreliable in this environment; use Bun scripts for small file edits.
 
@@ -76,7 +82,9 @@ Screen / tcell parity
 [x] Replace current whole-string renderer with CellBuffer-backed rendering and diff flush.
 [x] Implement Screen.SetContent/GetContent/Fill/Show equivalents over CellBuffer.
 [x] Preserve per-cell style and wide-char handling: Cell.filler for double-width right-half, Screen.Show skips filler cells, putText/putCells advance col by visual width, setFillerContent added to Screen/CellBuffer.
-[ ] Preserve combining chars (zero-width combining marks stored alongside base char).
+[~] Preserve combining chars (zero-width combining marks stored alongside base char).
+    Done: CellBuffer/Screen/VT100 store combining marks alongside the base cell and terminal pane rendering emits them through Screen.SetContent.
+    Remaining: editor text rendering still needs grapheme-cluster-level behavior for combining marks and ZWJ sequences.
 [ ] Implement fake cursor and multi-cursor reverse styling behavior.
 [ ] Add raw escape registration/unregistration equivalent to tcell RegisterRawSeq.
 [~] Add complete bracketed paste event handling across split input chunks.
@@ -105,6 +113,7 @@ Buffer / editing model
 [~] Implement save options: fileformat, encoding, eofnewline, rmtrailingws, mkparents, autosu/sucmd behavior.
     Done: eofnewline save behavior exists; fileformat status/toggle exists; encoding decode/reopen supports Bun TextDecoder labels including common CJK encodings, and statusline encoding click pre-fills reopen with encoding completion.
     Done: saving a non-UTF-8-decoded buffer prompts "Save in UTF-8?(y,n)" before converting the buffer to UTF-8 on disk.
+    Done: hex3 encoding supports binary edit/open/save paths without UTF-8 conversion prompt.
     Remaining: non-UTF-8 save/encode, rmtrailingws, mkparents, autosu/sucmd, full fileformat behavior parity.
 [ ] Implement backup recovery and permbackup behavior.
 [~] Implement savecursor and saveundo serialization.
@@ -194,8 +203,8 @@ Lua plugin parity
     Done: minimal Buf/BufPane/Cursor adapters support autoclose-style Line/Insert/Replace/cursor movement and option access.
     Remaining: real BufPane/Cursor/Buffer object parity, selections, multi-cursor, Tab/TabList APIs, InfoPane/Log/Raw buffers.
 [~] Implement all plugin lifecycle hooks: preinit, init, postinit, onRune, preInsertNewline, preBackspace, onSave, onBufferOpen, onBufferOptionChanged, onAnyEvent, etc.
-    Done: preinit/init/postinit, onRune, preInsertNewline, preBackspace, onSave, onBufferOpen, onSetActive/onBufferClose are dispatched in current editor paths.
-    Remaining: onBufferOptionChanged, onAnyEvent, deinit/reload hooks, full action hook coverage, exact args/return behavior.
+    Done: preinit/init/postinit, onRune, preInsertNewline, preBackspace, onSave, onBufferOpen, onSetActive/onBufferClose, onBufferOptionChanged are dispatched in current editor paths.
+    Remaining: onAnyEvent, deinit/reload hooks, full action hook coverage, exact args/return behavior.
 [~] Ensure Lua return values can cancel operations where Go micro expects bool false.
     Done: PluginManager.runBool treats false as cancellation and is wired for preBackspace/preInsertNewline.
     Remaining: all cancellable actions/hooks need to use the same path and match Go micro semantics.
@@ -291,7 +300,9 @@ Shell / jobs / terminal pane
 [x] Implement Ctrl-B ShellMode prompt and shell command execution with temporary screen fini/start behavior.
 [x] Improve Bun PTY terminal pane rendering using terminal state/cell emulation instead of raw line log.
     VT100 class in src/screen/vt100.js: CSI cursor/erase/SGR/scroll, CPR response, OSC strip.
-[ ] Implement terminal selection/copy and close behavior parity.
+[~] Implement terminal selection/copy and close behavior parity.
+    Done: exited terminal panes can be closed with Enter and restore the previous editor buffer when available.
+    Remaining: terminal selection/copy and full close behavior parity.
 [ ] Verify Bun.spawn stdio usage everywhere; PTY terminal option remains separate.
 [x] Shared HTTP backend in platform/commands.js: fetchHttp(url) and downloadFile(url, outPath).
     Priority: Bun.which detects curl (curl -kL --silent --fail) or wget (wget --no-check-certificate -q -O -),