branch: externals/inspector commit f5b136d1693fd694b5fe8c02df040a87c45e1bf2 Author: Mariano Montone <marianomont...@gmail.com> Commit: Mariano Montone <marianomont...@gmail.com>
tree-inspector: cons --- tree-inspector-tests.el | 21 +++++++++------------ tree-inspector.el | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tree-inspector-tests.el b/tree-inspector-tests.el index 65cb0c3e27..5a0e36351b 100644 --- a/tree-inspector-tests.el +++ b/tree-inspector-tests.el @@ -125,19 +125,16 @@ ;; (buffer-string (make-category-set "al")) ;; (should (cl-search "nil" buffer-string)))) -(ert-deftest inspector-tests--inspect-nil-test () - (inspector-inspect nil) - (let ((buffer-string (buffer-string))) - (should (cl-search "nil" buffer-string)) - (inspector-quit))) +(ert-deftest tree-inspector-tests--inspect-nil-test () + (tree-inspector-tests--with-tree-inspector-contents + (buffer-string nil) + (should (cl-search "nil" buffer-string)))) -(ert-deftest inspector-tests--inspect-cons-test () - (inspector-inspect (cons 1 2)) - (let ((buffer-string (buffer-string))) - (should (cl-search "cons" buffer-string)) - (should (cl-search "1" buffer-string)) - (should (cl-search "2" buffer-string)) - (inspector-quit))) +(ert-deftest tree-inspector-tests--inspect-cons-test () + (tree-inspector-tests--with-tree-inspector-contents + (buffer-string (cons 1 "foo")) + (should (cl-search "1" buffer-string)) + (should (cl-search "foo" buffer-string)))) (ert-deftest inspector-tests--inspect-alist-test () (inspector-inspect '((a . 33) (b . 44))) diff --git a/tree-inspector.el b/tree-inspector.el index 0f959c5865..9ace580d48 100644 --- a/tree-inspector.el +++ b/tree-inspector.el @@ -194,7 +194,9 @@ in a format understood by `kbd'. Commands a names of Lisp functions." ;;(treeview-set-node-parent child object) child)) object)) - (t (error "Implement children for: %s" object)))) + ;; a cons + (t (list (tree-inspector--make-node (car object)) + (tree-inspector--make-node (cdr object)))))) (cl-defmethod tree-inspector--node-children ((object vector)) (cl-map 'list @@ -271,7 +273,17 @@ in a format understood by `kbd'. Commands a names of Lisp functions." ;; child)) ;; object)) node)) - (t (error "Implement inspector for: %s" object)))) + ;; a cons + (t (let ((node (treeview-new-node))) + (treeview-set-node-name + node (format "(%s . %s)" + (tree-inspector--print-object (car object)) + (tree-inspector--print-object (cdr object)))) + (treeview-set-node-prop node 'object object) + (treeview-set-node-children + node (list (tree-inspector--make-node (car object)) + (tree-inspector--make-node (cdr object)))) + node)))) (cl-defmethod tree-inspector--make-node ((object bool-vector)) (let ((node (treeview-new-node)))