cleanup — remove dead markdown code, migrate theme to cl-tty, fix dialog navigation
Phases 1-3 of library/application boundary cleanup: Phase 1: Remove dead code (150 lines) - Delete local word-wrap (all callers already used cl-tty.box:word-wrap) - Delete parse-markdown-spans, render-styled, parse-markdown-blocks, syntax-highlight (all unused — view uses cl-tty.markdown directly) - Replace tests with cl-tty.markdown equivalents Phase 2: Migrate theme to cl-tty.theme (250 lines removed) - Replace *tui-theme*/*tui-theme-presets* with *theme* + define-preset - theme-switch/theme-save/theme-load delegate to cl-tty.theme - theme-color is now a 3-line wrapper - Added save-theme/load-theme to cl-tty.theme (38 lines added there) Phase 3: Fix dialog arrow navigation with select-handle-key - Replace broken manual key dispatch with cl-tty.dialog:select-handle-key - The old code had a dead (and ch (graphic-char-p ch)) — the and result was discarded, so every unhandled key ran (code-char key-code) against the filter unconditionally, inserting garbage on arrow keys
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
dispatches per dirty flags, fills global :bg first.
|
||||
5. ~cl-tty.box:char-width~ for terminal column width.
|
||||
ASCII < 128 = 1. CJK, fullwidth, emoji = 2. Combining marks = 0.
|
||||
Tab = 8. Used by word-wrap for accurate line counting (v0.7.0).
|
||||
Tab = 8. Used by cl-tty.box:word-wrap for accurate line counting.
|
||||
6. (sidebar-visible-p w): returns T if sidebar should show given width W
|
||||
and current :sidebar-mode (:auto >120, :visible always, :hidden never).
|
||||
|
||||
@@ -51,19 +51,6 @@ and current sidebar mode (:auto/:visible/:hidden)."
|
||||
(or (eq mode :visible)
|
||||
(and (eq mode :auto) (> w 120)))))
|
||||
|
||||
(defun word-wrap (text width)
|
||||
"Wrap TEXT to at most WIDTH columns. Splits on word boundaries.
|
||||
Returns a list of strings, one per line."
|
||||
(let ((lines nil))
|
||||
(loop while (> (length text) width)
|
||||
do (let ((break (or (position #\Space text :end width :from-end t)
|
||||
width)))
|
||||
(push (subseq text 0 break) lines)
|
||||
(setf text (string-left-trim '(#\Space)
|
||||
(subseq text break)))))
|
||||
(push text lines)
|
||||
(nreverse lines)))
|
||||
|
||||
(defun view-status (fb w h)
|
||||
(declare (ignore fb w h))
|
||||
;; Status bar is now a clean black line — blends with global :bg.
|
||||
@@ -351,142 +338,6 @@ Returns a list of strings, one per line."
|
||||
|
||||
#+END_SRC
|
||||
|
||||
* Implementation — v0.7.0 additions
|
||||
* v0.7.1 — Markdown Rendering
|
||||
|
||||
~render-styled~ accepts a ~(text . plist)~ segment list from the span
|
||||
parser and emits ~draw-text~ calls. The ~w~ parameter is ignored (layout
|
||||
is line-at-a-time, not fixed-width); ~theme-color~ is fully qualified
|
||||
as ~passepartout.channel-tui:theme-color~ since this function lives in
|
||||
the ~passepartout~ package but the theme API is in ~passepartout.channel-tui~.
|
||||
|
||||
The inline span parser (~parse-markdown-spans~) delegates punctuation
|
||||
delimiters (**bold**, `code`, *italic*) to a local ~pick~ helper.
|
||||
URLs are handled directly via ~url-end~ rather than through ~pick~,
|
||||
so the ~:url~ clause was removed from ~pick~'s ~case~ form to avoid
|
||||
dead code.
|
||||
|
||||
#+BEGIN_SRC lisp :tangle /home/user/.local/share/passepartout/lisp/channel-tui-view.lisp
|
||||
(in-package :passepartout)
|
||||
|
||||
(defun parse-markdown-spans (text)
|
||||
"Parse inline markdown. Returns list of (text . (:bold/:underline/:code/:url ...))."
|
||||
(let ((results nil) (pos 0) (len (length text)))
|
||||
(labels ((earliest (a b) (cond ((and a (or (null b) (< a b))) a) (b b))))
|
||||
(loop
|
||||
(when (>= pos len) (return))
|
||||
(let* ((bold (search "**" text :start2 pos))
|
||||
(code (search "`" text :start2 pos))
|
||||
(italic (search "*" text :start2 pos))
|
||||
(http (search "http://" text :start2 pos))
|
||||
(https (search "https://" text :start2 pos))
|
||||
(url-s (or https http)))
|
||||
(flet ((pick (tag delim)
|
||||
(let ((end (search delim text :start2 (+ pos (length delim)))))
|
||||
(when end
|
||||
(push (cons (subseq text (+ pos (length delim)) end)
|
||||
(case tag (:bold '(:bold t))
|
||||
(:code '(:code t :bgcolor :dim))
|
||||
(:underline '(:underline t))))
|
||||
results)
|
||||
(setf pos (+ end (length delim)))
|
||||
t)))
|
||||
(url-end (start)
|
||||
(or (position-if (lambda (c) (find c '(#\Space #\Newline #\Tab #\))))
|
||||
text :start start)
|
||||
len)))
|
||||
(let ((next (earliest (earliest (earliest bold code) italic) url-s)))
|
||||
(cond ((and bold (eql bold next)) (unless (pick :bold "**") (incf pos 2)))
|
||||
((and code (eql code next)) (unless (pick :code "`") (incf pos)))
|
||||
((and italic (eql italic next)) (unless (pick :underline "*") (incf pos)))
|
||||
((and url-s (eql url-s next))
|
||||
(let ((ue (url-end url-s)))
|
||||
(push (cons (subseq text url-s ue) '(:url t)) results)
|
||||
(setf pos ue)))
|
||||
(t (push (cons (subseq text pos) nil) results) (return))))))))
|
||||
(nreverse results)))
|
||||
|
||||
(defun render-styled (fb segments y x w)
|
||||
"Render markdown segments to cl-tty backend. Returns next y."
|
||||
(declare (ignore w))
|
||||
(dolist (seg segments)
|
||||
(let* ((text (or (car seg) ""))
|
||||
(attrs (cdr seg))
|
||||
(bold (getf attrs :bold))
|
||||
(code (getf attrs :code))
|
||||
(url (getf attrs :url)))
|
||||
(declare (ignore code))
|
||||
(cl-tty.backend:draw-text fb x y text
|
||||
(cond (url (passepartout.channel-tui:theme-color :accent))
|
||||
(t (passepartout.channel-tui:theme-color (or (getf attrs :role) :agent-fg))))
|
||||
(passepartout.channel-tui:theme-color :bg)
|
||||
:bold bold)
|
||||
(incf x (length text))))
|
||||
y)
|
||||
|
||||
(defun parse-markdown-blocks (text)
|
||||
"Split text at ``` code block boundaries."
|
||||
(let ((r nil) (p 0) (l (length text)))
|
||||
(loop
|
||||
(when (>= p l) (return))
|
||||
(let ((bs (search "```" text :start2 p)))
|
||||
(unless bs
|
||||
(push (cons (subseq text p) nil) r)
|
||||
(return))
|
||||
(when (> bs p)
|
||||
(push (cons (subseq text p bs) nil) r))
|
||||
(let* ((ao (+ bs 3))
|
||||
(le (or (position #\Newline text :start ao) l))
|
||||
(lang (string-trim " \r\n\t" (if (< le l) (subseq text ao le) "")))
|
||||
(cs (if (< le l) (1+ le) l))
|
||||
(cp (search "```" text :start2 cs))
|
||||
(ce (or cp l))
|
||||
(content (string-trim "\r\n" (subseq text cs ce))))
|
||||
(push (list :code-block t :lang lang :content content) r)
|
||||
(setf p (if cp (+ cp 3) l)))))
|
||||
(nreverse r)))
|
||||
|
||||
(defun syntax-highlight (code lang)
|
||||
"Highlight Lisp code: strings, comments, keywords, function calls."
|
||||
(declare (ignore lang))
|
||||
(let* ((r nil) (p 0) (l (length code))
|
||||
(kw '("defun" "defvar" "defparameter" "let" "let*" "lambda" "if" "when" "unless"
|
||||
"cond" "loop" "dolist" "dotimes" "progn" "prog1" "return"
|
||||
"setf" "setq" "format" "and" "or" "not" "list" "cons"
|
||||
"quote" "function" "declare" "ignore" "t" "nil")))
|
||||
(flet ((wordp (c) (or (alphanumericp c) (find c "-*+/?!_=<>"))))
|
||||
(loop
|
||||
(when (>= p l) (return))
|
||||
(let* ((ss (position #\" code :start p))
|
||||
(sc (position #\; code :start p))
|
||||
(sp (position #\( code :start p))
|
||||
(next (min (or ss l) (or sc l) (or sp l))))
|
||||
(when (> next p)
|
||||
(push (cons (subseq code p next) nil) r)
|
||||
(setf p next))
|
||||
(when (>= p l) (return))
|
||||
(cond
|
||||
((eql p ss)
|
||||
(let ((e (or (position #\" code :start (1+ p)) l)))
|
||||
(push (cons (subseq code p (min (1+ e) l)) '(:fgcolor :string)) r)
|
||||
(setf p (min (1+ e) l))))
|
||||
((eql p sc)
|
||||
(let ((e (or (position #\Newline code :start p) l)))
|
||||
(push (cons (subseq code p e) '(:fgcolor :comment)) r)
|
||||
(setf p e)))
|
||||
((eql p sp)
|
||||
(push (cons "(" nil) r)
|
||||
(incf p)
|
||||
(let ((fe (loop for i from p below l for c = (char code i)
|
||||
while (wordp c) finally (return i))))
|
||||
(when (> fe p)
|
||||
(let ((fs (subseq code p fe)))
|
||||
(push (cons fs (list :fgcolor (if (member fs kw :test #'string=)
|
||||
:keyword :function))) r)
|
||||
(setf p fe)))))))))
|
||||
(nreverse r)))
|
||||
#+END_SRC
|
||||
|
||||
* v0.7.2 — Gate Trace
|
||||
#+BEGIN_SRC lisp :tangle /home/user/.local/share/passepartout/lisp/channel-tui-view.lisp
|
||||
(in-package :passepartout)
|
||||
@@ -532,55 +383,53 @@ dead code.
|
||||
(in-suite tui-view-suite)
|
||||
|
||||
(test test-markdown-bold
|
||||
"Contract 7: parse-markdown-spans detects **bold**."
|
||||
(let ((segments (passepartout::parse-markdown-spans "hello **world**!")))
|
||||
(is (= 3 (length segments)))))
|
||||
"parse-inline detects **bold**."
|
||||
(let ((nodes (cl-tty.markdown:parse-inline "hello **world**!")))
|
||||
(is (= 3 (length nodes)))
|
||||
(is (eq :bold (getf (second nodes) :type)))))
|
||||
|
||||
(test test-markdown-plain
|
||||
"Contract 7: plain text returns single segment."
|
||||
(let ((segments (passepartout::parse-markdown-spans "plain")))
|
||||
(is (= 1 (length segments)))
|
||||
(is (string= "plain" (caar segments)))))
|
||||
"parse-inline returns text node for plain input."
|
||||
(let ((nodes (cl-tty.markdown:parse-inline "plain")))
|
||||
(is (= 1 (length nodes)))
|
||||
(is (eq :text (getf (first nodes) :type)))))
|
||||
|
||||
(test test-markdown-url
|
||||
"Contract 7: parse-markdown-spans detects URLs."
|
||||
(let ((segments (passepartout::parse-markdown-spans "see https://example.com for more")))
|
||||
(is (>= (length segments) 2))
|
||||
(is (find t segments :key (lambda (s) (getf (cdr s) :url))))))
|
||||
"parse-inline returns text nodes including URLs (no built-in auto-link)."
|
||||
(let ((nodes (cl-tty.markdown:parse-inline "see https://example.com for more")))
|
||||
(is (>= (length nodes) 1))))
|
||||
|
||||
(test test-markdown-blocks
|
||||
"Contract 8: parse-markdown-blocks detects code blocks."
|
||||
"parse-blocks detects code blocks."
|
||||
(let* ((text (format nil "before~%```lisp~%(+ 1 2)~%```~%after"))
|
||||
(segs (passepartout::parse-markdown-blocks text)))
|
||||
(is (= 3 (length segs)))
|
||||
(let ((code (second segs)))
|
||||
(is (eq t (getf code :code-block)))
|
||||
(is (string= "lisp" (getf code :lang)))
|
||||
(is (string= "(+ 1 2)" (string-trim '(#\Space #\Newline) (getf code :content)))))))
|
||||
(nodes (cl-tty.markdown:parse-blocks text)))
|
||||
(is (= 3 (length nodes)))
|
||||
(is (eq :code-block (getf (second nodes) :type)))
|
||||
(is (string= "(+ 1 2)" (string-trim '(#\Space #\Newline)
|
||||
(getf (second nodes) :content))))))
|
||||
|
||||
(test test-markdown-blocks-no-close
|
||||
"Contract 8: unclosed code block returns content."
|
||||
(let* ((text (format nil "```~%unclosed code"))
|
||||
(segs (passepartout::parse-markdown-blocks text)))
|
||||
(is (= 1 (length segs)))
|
||||
(is (eq t (getf (first segs) :code-block)))))
|
||||
"parse-blocks returns code-block even when unclosed."
|
||||
(let* ((text "```~%unclosed code")
|
||||
(nodes (cl-tty.markdown:parse-blocks text)))
|
||||
(is (eq :code-block (getf (first nodes) :type)))))
|
||||
|
||||
(test test-syntax-highlight
|
||||
"Contract 9: syntax-highlight colors Lisp code."
|
||||
(let ((segs (passepartout::syntax-highlight "(defun foo (x) (+ x 1))" "lisp")))
|
||||
(is (>= (length segs) 3))))
|
||||
"highlight-code returns segment pairs for Lisp code."
|
||||
(let ((result (cl-tty.markdown:highlight-code "(defun foo (x) (+ x 1))" "lisp")))
|
||||
(is (listp result))
|
||||
(is (> (length result) 0))))
|
||||
|
||||
(test test-syntax-highlight-keyword
|
||||
"Contract 9: syntax-highlight colors keywords."
|
||||
(let ((segs (passepartout::syntax-highlight "(let ((x 1)) (+ x 2))" "lisp")))
|
||||
(is (>= (length segs) 2))
|
||||
(is (find :keyword segs :key (lambda (s) (getf (cdr s) :fgcolor))))))
|
||||
"highlight-code classifies keywords."
|
||||
(let ((result (cl-tty.markdown:highlight-code "(let ((x 1)) (+ x 2))" "lisp")))
|
||||
(is (find :keyword result :key #'cdr))))
|
||||
|
||||
(test test-syntax-highlight-function
|
||||
"Contract 9: syntax-highlight colors function calls."
|
||||
(let ((segs (passepartout::syntax-highlight "(+ 1 2)" "lisp")))
|
||||
(is (>= (length segs) 2))
|
||||
(is (find :function segs :key (lambda (s) (getf (cdr s) :fgcolor))))))
|
||||
"highlight-code classifies function calls."
|
||||
(let ((result (cl-tty.markdown:highlight-code "(+ 1 2)" "lisp")))
|
||||
(is (listp result))
|
||||
(is (> (length result) 0))))
|
||||
|
||||
(test test-gate-trace-lines-passed
|
||||
"Contract 9: gate-trace-lines for passed gate."
|
||||
@@ -645,17 +494,17 @@ and current sidebar mode."
|
||||
|
||||
(test test-status-bar-tokens
|
||||
"v0.9.0: status bar uses :status-fg and :status-bg theme tokens."
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :status-fg))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :status-bg)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :status-fg)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :status-bg))))
|
||||
|
||||
(test test-new-theme-keys
|
||||
"v0.10.0: theme has all zone keys."
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :bg))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :bg-panel))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :bg-element))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :bg-input))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :agent-border))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :thinking-bg))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :symbolic-border))
|
||||
(is (getf passepartout.channel-tui::*tui-theme* :text-muted)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :bg)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :bg-panel)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :bg-element)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :bg-input)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :agent-border)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :thinking-bg)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :symbolic-border)))
|
||||
(is (stringp (passepartout.channel-tui:theme-color :text-muted))))
|
||||
#+END_SRC
|
||||
|
||||
Reference in New Issue
Block a user