better sort for tree, trace-io added to eval

This commit is contained in:
David Botton 2024-05-06 22:37:41 -04:00
parent f025a45ec6
commit 6f61020904
3 changed files with 20 additions and 7 deletions

View file

@ -123,7 +123,10 @@ provide an interactive console.)"))
(let* ((*query-io* (make-two-way-stream in-stream out-stream))
(*standard-output* console)
(*standard-input* (make-instance 'console-in-stream :clog-obj clog-obj))
(*terminal-io* (make-two-way-stream *standard-input* *standard-output*))
(*debug-io* *terminal-io*)
(*error-output* console)
(*trace-output* console)
(*debugger-hook* (if clog-connection:*disable-clog-debugging*
*debugger-hook*
#'my-debugger))

View file

@ -93,8 +93,10 @@
(labels ((project-tree-dir-select (node dir)
(let ((filter (equalp (text-value filter-btn)
"filter")))
(dolist (item (uiop:subdirectories dir))
(unless (and (ppcre:scan *project-tree-dir-filter* (format nil "~A" item))
(dolist (item (sort (uiop:subdirectories dir)
(lambda (a b)
(string-lessp (format nil "~A" a) (format nil "~A" b)))))
(unless (and (ppcre:scan *project-tree-dir-filter* (string-downcase (format nil "~A" item)))
filter)
(create-clog-tree (tree-root node)
:fill-function (lambda (obj)
@ -102,8 +104,14 @@
:indent-level (1+ (indent-level node))
:visible nil
:content (first (last (pathname-directory item))))))
(dolist (item (uiop:directory-files (directory-namestring dir)))
(unless (and (ppcre:scan *project-tree-file-filter* (file-namestring item))
(dolist (item (sort (uiop:directory-files (directory-namestring dir))
(lambda (a b)
(if (equal (pathname-name a) (pathname-name b))
(string-lessp (format nil "~A" a)
(format nil "~A" b))
(string-lessp (format nil "~A" (pathname-name a))
(format nil "~A" (pathname-name b)))))))
(unless (and (ppcre:scan *project-tree-file-filter* (string-downcase (file-namestring item)))
filter)
(create-clog-tree-item (tree-root node)
:on-click (lambda (obj)

View file

@ -16,9 +16,11 @@
(*default-title-class* *builder-title-class*)
(*default-border-class* *builder-border-class*)
(win (create-gui-window obj :title "CLOG Builder REPL"
:top 40 :left 225
:width 600 :height 400
:client-movement *client-side-movement*))
:has-pinner t
:keep-on-top t
:top 40 :left 225
:width 600 :height 400
:client-movement *client-side-movement*))
(repl (create-clog-builder-repl (window-content win))))
(when *clog-repl-private-console*
(let ((pcon (on-open-repl-console obj win)))