mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-12 09:28:24 +00:00
4c6554413d
Change docs to advertize `slot-value` rather than `oref`. Change the implementation of `:initform` to better match the CLOS semantics, while preserving the EIEIO semantics, but warn when encountering cases where the two diverge. Demote the mostly unused special semantics of `oref-default` on non-class allocated slots. * doc/misc/eieio.texi (Quick Start): Use `slot-value`. (Accessing Slots): Move `slot-value` before `oref`. Fix paren-typo in example (reported by pillule <pillule@riseup.net>). (Introspection): Remove mention of `class-slot-initarg`. * lisp/transient.el (transient--parse-group, transient--parse-suffix): Don't use `oref-default` to get the default value. (transient-lisp-variable): Init forms are evaluated. * lisp/emacs-lisp/eieio.el (defclass): Warn about inapplicable `:initarg` and about uses of init forms that are ambiguous. (oref): Don't advertize the deprecated use of initargs as slot names. (oref-default): Don't advertize the deprecated case where it returns the initform's value. (initialize-instance): Use `macroexp-const-p`. * lisp/emacs-lisp/eieio-core.el (eieio--unbound): Rename from `eieio-unbound`. (eieio--unbound-form): New var. (eieio--slot-override): Use it. (eieio-defclass-internal): Use it. Change `init` so it should always be evaluated. (eieio--known-class-slot-names): New var. (eieio--eval-default-p): Rename from `eieio-eval-default-p`. (eieio--perform-slot-validation-for-default): Use `macroexp-const-p` to decide whether to skip the test. (eieio--add-new-slot): Register slot in `eieio--known-class-slot-names` when applicable. (eieio-oref-default, eieio-oset-default): Add warning for unknown slots and slots not known to be allocated to the class. (eieio-default-eval-maybe): Delete function. Use just `eval` instead. (eieio-declare-slots): Allow slots to specify their allocation class. * lisp/cedet/srecode/insert.el (point): Declare the slot instead of moving the class definition before the slot's first use. (srecode-template-inserter-point, srecode-insert-fcn): Use nil instead of unbound for the `point` slot. * lisp/cedet/srecode/compile.el (srecode-template-inserter): Declare the `key` slot that all children should have. * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar) (eieio-speedbar-directory-button, eieio-speedbar-file-button): * lisp/emacs-lisp/eieio-custom.el (eieio-widget-test-class): * lisp/emacs-lisp/chart.el (chart-bar): * lisp/cedet/semantic/ede-grammar.el (semantic-ede-proj-target-grammar): * lisp/cedet/semantic/db.el (semanticdb-project-database): * lisp/cedet/semantic/db-javascript.el (semanticdb-table-javascript) (semanticdb-project-database-javascript): * lisp/cedet/semantic/db-el.el (semanticdb-table-emacs-lisp) (semanticdb-project-database-emacs-lisp): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-table-ebrowse) (semanticdb-project-database-ebrowse): * lisp/cedet/ede/proj.el (ede-proj-project): * lisp/cedet/ede/proj-obj.el (ede-proj-target-makefile-objectcode): * lisp/cedet/ede/generic.el (ede-generic-project): * lisp/cedet/ede/config.el (ede-project-with-config): * lisp/cedet/ede/base.el (ede-target, ede-project): * lisp/auth-source.el (auth-source-backend): Init forms are evaluated, so quote them accordingly.
422 lines
15 KiB
EmacsLisp
422 lines
15 KiB
EmacsLisp
;;; eieio-speedbar.el --- Classes for managing speedbar displays. -*- lexical-binding:t -*-
|
||
|
||
;; Copyright (C) 1999-2002, 2005, 2007-2021 Free Software Foundation,
|
||
;; Inc.
|
||
|
||
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
||
;; Keywords: OO, tools
|
||
;; Package: eieio
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software: you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation, either version 3 of the License, or
|
||
;; (at your option) any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;; GNU General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
;;
|
||
;; This provides some classes that can be used as a parent which
|
||
;; will automatically provide SPEEDBAR support for any list of objects
|
||
;; of that type.
|
||
;;
|
||
;; This file requires speedbar version 0.10 or later.
|
||
|
||
;;; Creating a new speedbar mode based on a pre-existing object hierarchy
|
||
;;
|
||
;; To create a new speedbar mode based on lists of objects is easier
|
||
;; than creating a whole new speedbar mode from scratch.
|
||
;;
|
||
;; 1) Objects that will have lists of items that can be expanded
|
||
;; should also inherit from the classes:
|
||
;; * `eieio-speedbar' - specify your own button behavior
|
||
;; * `eieio-speedbar-directory-button' - objects that behave like directories
|
||
;; * `eieio-speedbar-file-button' - objects that behave like files
|
||
;;
|
||
;; 2) Objects that have lists of children should implement the method
|
||
;; `eieio-speedbar-object-children' which returns a list of more
|
||
;; objects, or a list of strings.
|
||
;;
|
||
;; 3) Objects that return a list of strings should also implement these
|
||
;; methods:
|
||
;; * `eieio-speedbar-child-make-tag-lines' - make tag lines for a child.
|
||
;; * `eieio-speedbar-child-description' - describe non-object children
|
||
;;
|
||
;; 4) Objects which have expanded information should implement the method
|
||
;; `eieio-speedbar-description' to produce more information.
|
||
;;
|
||
;; 5) Objects that are associated with a directory should implement
|
||
;; the method `eieio-speedbar-derive-line-path' which returns a
|
||
;; path.
|
||
;;
|
||
;; 6) Objects that have a specialized behavior when clicked should
|
||
;; define the method `eieio-speedbar-handle-click'.
|
||
;;
|
||
;; To initialize a new eieio based speedbar display, do the following.
|
||
;;
|
||
;; 1) Create a keymap variable `foo-speedbar-key-map'.
|
||
;; This keymap variable should be initialized in a function.
|
||
;; If you have no special needs, use `eieio-speedbar-key-map'
|
||
;;
|
||
;; 2) Create a variable containing an easymenu definition compatible
|
||
;; with speedbar. if you have no special needs, use
|
||
;; `eieio-speedbar-menu'.
|
||
;;
|
||
;; 3) Create a function which returns the top-level list of children
|
||
;; objects to be displayed in speedbar.
|
||
;;
|
||
;; 4) Call `eieio-speedbar-create' as specified in it's documentation
|
||
;; string. This will automatically handle cases when speedbar is
|
||
;; not already loaded, and specifying all overload functions.
|
||
;;
|
||
;; 5) Create an initializer function which looks like this:
|
||
;;
|
||
;; (defun my-speedbar-mode-initialize ()
|
||
;; "documentation"
|
||
;; (interactive)
|
||
;; (speedbar-frame-mode 1)
|
||
;; (speedbar-change-initial-expansion-list mymodename)
|
||
;; (speedbar-get-focus))
|
||
;;
|
||
;; where `mymodename' is the same value as passed to `eieio-speedbar-create'
|
||
;; as the MODENAME parameter.
|
||
|
||
;; @todo - Can we make this ECB friendly?
|
||
|
||
;;; Code:
|
||
(require 'eieio)
|
||
(require 'eieio-custom)
|
||
(require 'speedbar)
|
||
|
||
;;; Support a way of adding generic object based modes into speedbar.
|
||
;;
|
||
(defun eieio-speedbar-make-map ()
|
||
"Make the generic object based speedbar keymap."
|
||
(let ((map (speedbar-make-specialized-keymap)))
|
||
|
||
;; General viewing things
|
||
(define-key map "\C-m" 'speedbar-edit-line)
|
||
(define-key map "+" 'speedbar-expand-line)
|
||
(define-key map "=" 'speedbar-expand-line)
|
||
(define-key map "-" 'speedbar-contract-line)
|
||
|
||
;; Some object based things
|
||
(define-key map "C" 'eieio-speedbar-customize-line)
|
||
map))
|
||
|
||
(defvar eieio-speedbar-key-map (eieio-speedbar-make-map)
|
||
"A generic object based speedbar display keymap.")
|
||
|
||
(defvar eieio-speedbar-menu
|
||
'([ "Edit Object/Field" speedbar-edit-line t]
|
||
[ "Expand Object" speedbar-expand-line
|
||
(save-excursion (beginning-of-line)
|
||
(looking-at "[0-9]+: *.\\+. "))]
|
||
[ "Contract Object" speedbar-contract-line
|
||
(save-excursion (beginning-of-line)
|
||
(looking-at "[0-9]+: *.-. "))]
|
||
"---"
|
||
[ "Customize Object" eieio-speedbar-customize-line
|
||
(eieio-object-p (speedbar-line-token)) ]
|
||
)
|
||
"Menu part in easymenu format used in speedbar while browsing objects.")
|
||
|
||
;; Note to self: Fix this silly thing!
|
||
(defalias 'eieio-speedbar-customize-line 'speedbar-edit-line)
|
||
|
||
(defun eieio-speedbar-create (map-fn map-var menu-var modename fetcher)
|
||
"Create a speedbar mode for displaying an object hierarchy.
|
||
MAP-FN is the keymap generator function used for extra keys.
|
||
MAP-VAR is the keymap variable used.
|
||
MENU-VAR is the symbol containing an easymenu compatible menu part to use.
|
||
MODENAME is a string used to identify this browser mode.
|
||
FETCHER is a generic function used to fetch the base object list used when
|
||
creating the speedbar display."
|
||
(with-eval-after-load 'speedbar
|
||
(eieio-speedbar-create-engine map-fn map-var menu-var modename fetcher)))
|
||
|
||
(defun eieio-speedbar-create-engine (map-fn map-var menu-var modename fetcher)
|
||
"Create a speedbar mode for displaying an object hierarchy.
|
||
Called from `eieio-speedbar-create', or the speedbar load-hook.
|
||
MAP-FN, MAP-VAR, MENU-VAR, MODENAME, and FETCHER are the same as in
|
||
`eieio-speedbar-create'."
|
||
;; make sure the keymap exists
|
||
(funcall map-fn)
|
||
;; Add to the expansion list.
|
||
(speedbar-add-expansion-list
|
||
(list modename
|
||
menu-var
|
||
map-var
|
||
(list 'lambda '(dir depth)
|
||
(list 'eieio-speedbar-buttons 'dir 'depth
|
||
(list 'quote fetcher)))))
|
||
;; Set the special functions.
|
||
(speedbar-add-mode-functions-list
|
||
(list modename
|
||
'(speedbar-item-info . eieio-speedbar-item-info)
|
||
'(speedbar-line-directory . eieio-speedbar-line-path))))
|
||
|
||
(defun eieio-speedbar-buttons (dir-or-object depth fetcher)
|
||
"Create buttons for the speedbar display.
|
||
Start in directory DIR-OR-OBJECT. If it is an object, just display that
|
||
object's subelements.
|
||
Argument DEPTH specifies how far down we have already been displayed.
|
||
If it is a directory, use FETCHER to fetch all objects associated with
|
||
that path."
|
||
(let ((objlst (cond ((eieio-object-p dir-or-object)
|
||
(list dir-or-object))
|
||
((stringp dir-or-object)
|
||
(funcall fetcher dir-or-object))
|
||
(t dir-or-object))))
|
||
(if (not objlst)
|
||
(speedbar-make-tag-line nil nil nil nil "Empty display" nil nil nil
|
||
depth)
|
||
;; Dump all objects into speedbar
|
||
(while objlst
|
||
(eieio-speedbar-make-tag-line (car objlst) depth)
|
||
(setq objlst (cdr objlst))))))
|
||
|
||
|
||
;;; DEFAULT SUPERCLASS baseline methods
|
||
;;
|
||
;; First, define methods with no class defined. These will work as if
|
||
;; on the default superclass. Specifying no class will allow these to be used
|
||
;; when no other methods are found, allowing multiple inheritance to work
|
||
;; reliably with eieio-speedbar.
|
||
|
||
(cl-defmethod eieio-speedbar-description (object)
|
||
"Return a string describing OBJECT."
|
||
(eieio-object-name-string object))
|
||
|
||
(cl-defmethod eieio-speedbar-derive-line-path (_object)
|
||
"Return the path which OBJECT has something to do with."
|
||
nil)
|
||
|
||
(cl-defmethod eieio-speedbar-object-buttonname (object)
|
||
"Return a string to use as a speedbar button for OBJECT."
|
||
(eieio-object-name-string object))
|
||
|
||
(cl-defmethod eieio-speedbar-make-tag-line (object depth)
|
||
"Insert a tag line into speedbar at point for OBJECT.
|
||
By default, all objects appear as simple TAGS with no need to inherit from
|
||
the special `eieio-speedbar' classes. Child classes should redefine this
|
||
method to create more accurate tag lines.
|
||
Argument DEPTH is the depth at which the tag line is inserted."
|
||
(speedbar-make-tag-line nil nil nil nil
|
||
(eieio-speedbar-object-buttonname object)
|
||
'eieio-speedbar-object-click
|
||
object
|
||
'speedbar-tag-face
|
||
depth))
|
||
|
||
(cl-defmethod eieio-speedbar-handle-click (object)
|
||
"Handle a click action on OBJECT in speedbar.
|
||
Any object can be represented as a tag in SPEEDBAR without special
|
||
attributes. These default objects will be pulled up in a custom
|
||
object edit buffer doing an in-place edit.
|
||
|
||
If your object represents some other item, override this method
|
||
and take the appropriate action."
|
||
(require 'eieio-custom)
|
||
(dframe-with-attached-buffer
|
||
(eieio-customize-object object))
|
||
(dframe-maybee-jump-to-attached-frame))
|
||
|
||
|
||
;;; Class definitions
|
||
;;
|
||
;; Now define a special speedbar class with some
|
||
;; variables with :allocation class which can be attached into
|
||
;; object hierarchies.
|
||
;;
|
||
;; These more complex types are for objects which wish to display
|
||
;; lists of children buttons.
|
||
|
||
(defclass eieio-speedbar nil
|
||
((buttontype :initform nil
|
||
:type symbol
|
||
:documentation
|
||
"The type of expansion button used for objects of this class.
|
||
Possible values are those symbols supported by the `exp-button-type' argument
|
||
to `speedbar-make-tag-line'."
|
||
:allocation :class)
|
||
(buttonface :initform 'speedbar-tag-face
|
||
:type (or symbol face)
|
||
:documentation
|
||
"The face used on the textual part of the button for this class.
|
||
See `speedbar-make-tag-line' for details."
|
||
:allocation :class)
|
||
(expanded :initform nil
|
||
:type boolean
|
||
:documentation
|
||
"State of an object being expanded in speedbar.")
|
||
)
|
||
"Class which provides basic speedbar support for child classes.
|
||
Add one of the child classes to this class to the parent list of a class."
|
||
:method-invocation-order :depth-first
|
||
:abstract t)
|
||
|
||
(defclass eieio-speedbar-directory-button (eieio-speedbar)
|
||
((buttontype :initform 'angle)
|
||
(buttonface :initform 'speedbar-directory-face))
|
||
"Class providing support for objects which behave like a directory."
|
||
:method-invocation-order :depth-first
|
||
:abstract t)
|
||
|
||
(defclass eieio-speedbar-file-button (eieio-speedbar)
|
||
((buttontype :initform 'bracket)
|
||
(buttonface :initform 'speedbar-file-face))
|
||
"Class providing support for objects which behave like a file."
|
||
:method-invocation-order :depth-first
|
||
:abstract t)
|
||
|
||
|
||
;;; Methods to eieio-speedbar-* which do not need to be overridden
|
||
;;
|
||
(cl-defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
|
||
depth)
|
||
"Insert a tag line into speedbar at point for OBJECT.
|
||
All objects a child of symbol `eieio-speedbar' can be created from
|
||
this method. Override this if you need non-traditional tag lines.
|
||
Argument DEPTH is the depth at which the tag line is inserted."
|
||
(let ((children (eieio-speedbar-object-children object))
|
||
(exp (oref object expanded)))
|
||
(if (not children)
|
||
(if (eq (oref object buttontype) 'expandtag)
|
||
(speedbar-make-tag-line 'statictag
|
||
? nil nil
|
||
(eieio-speedbar-object-buttonname object)
|
||
'eieio-speedbar-object-click
|
||
object
|
||
(oref object buttonface)
|
||
depth)
|
||
(speedbar-make-tag-line (oref object buttontype)
|
||
? nil nil
|
||
(eieio-speedbar-object-buttonname object)
|
||
'eieio-speedbar-object-click
|
||
object
|
||
(oref object buttonface)
|
||
depth))
|
||
(speedbar-make-tag-line (oref object buttontype)
|
||
(if exp ?- ?+)
|
||
'eieio-speedbar-object-expand
|
||
object
|
||
(eieio-speedbar-object-buttonname object)
|
||
'eieio-speedbar-object-click
|
||
object
|
||
(oref object buttonface)
|
||
depth)
|
||
(if exp
|
||
(eieio-speedbar-expand object (1+ depth))))))
|
||
|
||
(cl-defmethod eieio-speedbar-child-make-tag-lines ((object eieio-speedbar) _depth)
|
||
"Base method for creating tag lines for non-object children."
|
||
(error "You must implement `eieio-speedbar-child-make-tag-lines' for %s"
|
||
(eieio-object-name object)))
|
||
|
||
(cl-defmethod eieio-speedbar-expand ((object eieio-speedbar) depth)
|
||
"Expand OBJECT at indentation DEPTH.
|
||
Inserts a list of new tag lines representing expanded elements within
|
||
OBJECT."
|
||
(let ((children (eieio-speedbar-object-children object)))
|
||
(cond ((eieio-object-p (car children))
|
||
(mapcar (lambda (car)
|
||
(eieio-speedbar-make-tag-line car depth))
|
||
children))
|
||
(children (eieio-speedbar-child-make-tag-lines object depth)))))
|
||
|
||
|
||
;;; Speedbar specific function callbacks.
|
||
;;
|
||
(defun eieio-speedbar-object-click (_text token _indent)
|
||
"Handle a user click on TEXT representing object TOKEN.
|
||
The object is at indentation level INDENT."
|
||
(eieio-speedbar-handle-click token))
|
||
|
||
(defun eieio-speedbar-object-expand (text token indent)
|
||
"Expand object represented by TEXT.
|
||
TOKEN is the object. INDENT is the current indentation level."
|
||
(cond ((string-match "\\+" text) ;we have to expand this file
|
||
(speedbar-change-expand-button-char ?-)
|
||
(oset token expanded t)
|
||
(speedbar-with-writable
|
||
(save-excursion
|
||
(end-of-line) (forward-char 1)
|
||
(eieio-speedbar-expand token (1+ indent)))))
|
||
((string-match "-" text) ;we have to contract this node
|
||
(speedbar-change-expand-button-char ?+)
|
||
(oset token expanded nil)
|
||
(speedbar-delete-subblock indent))
|
||
(t (error "Ooops... not sure what to do")))
|
||
(speedbar-center-buffer-smartly))
|
||
|
||
(cl-defmethod eieio-speedbar-child-description ((obj eieio-speedbar))
|
||
"Return a description for a child of OBJ which is not an object."
|
||
(error "You must implement `eieio-speedbar-child-description' for %s"
|
||
(eieio-object-name obj)))
|
||
|
||
(defun eieio-speedbar-item-info ()
|
||
"Display info for the current line when in EDE display mode."
|
||
;; Switch across the types of the tokens.
|
||
(let ((tok (speedbar-line-token)))
|
||
(cond ((eieio-object-p tok)
|
||
(message (eieio-speedbar-description tok)))
|
||
(t
|
||
(let ((no (eieio-speedbar-find-nearest-object)))
|
||
(if no
|
||
(eieio-speedbar-child-description no)))))))
|
||
|
||
(defun eieio-speedbar-find-nearest-object (&optional depth)
|
||
"Search backwards to the first line associated with an object.
|
||
Optional argument DEPTH is the current depth of the search."
|
||
(save-excursion
|
||
(if (not depth)
|
||
(progn
|
||
(beginning-of-line)
|
||
(when (looking-at "^\\([0-9]+\\):")
|
||
(setq depth (string-to-number (match-string 1))))))
|
||
(when depth
|
||
(while (and (not (eieio-object-p (speedbar-line-token)))
|
||
(> depth 0))
|
||
(setq depth (1- depth))
|
||
(re-search-backward (format "^%d:" depth) nil t))
|
||
(speedbar-line-token))))
|
||
|
||
(defun eieio-speedbar-line-path (&optional depth)
|
||
"If applicable, return the path to the file the cursor is on.
|
||
Optional DEPTH is the depth we start at."
|
||
(save-match-data
|
||
(if (not depth)
|
||
(progn
|
||
(beginning-of-line)
|
||
(looking-at "^\\([0-9]+\\):")
|
||
(setq depth (string-to-number (match-string 1)))))
|
||
;; This whole function is presently bogus. Make it better later.
|
||
(let ((tok (eieio-speedbar-find-nearest-object depth)))
|
||
(if (eieio-object-p tok)
|
||
(eieio-speedbar-derive-line-path tok)
|
||
default-directory))))
|
||
|
||
|
||
;;; Methods to the eieio-speedbar-* classes which need to be overridden.
|
||
;;
|
||
(cl-defmethod eieio-speedbar-object-children ((_object eieio-speedbar))
|
||
"Return a list of children to be displayed in speedbar.
|
||
If the return value is a list of OBJECTs, then those objects are
|
||
queried for details. If the return list is made of strings,
|
||
then this object will be queried for the details needed
|
||
to create a speedbar button."
|
||
nil)
|
||
|
||
(provide 'eieio-speedbar)
|
||
|
||
;;; eieio-speedbar.el ends here
|