mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-06 03:40:56 -08:00
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog. * semantic.el (semantic-version): Update to 2.0. (semantic-mode-map): Add "," and "m" bindings. (navigate-menu): Update. * semantic/symref.el (semantic-symref-calculate-rootdir): New function. (semantic-symref-detect-symref-tool): Use it. * semantic/symref/grep.el (semantic-symref-grep-shell): New var. (semantic-symref-perform-search): Use it. Calculate root dir with semantic-symref-calculate-rootdir. (semantic-symref-derive-find-filepatterns): Improve error message. * semantic/symref/list.el (semantic-symref-results-mode-map): New bindings. (semantic-symref-auto-expand-results): New option. (semantic-symref-results-dump): Obey auto-expand. (semantic-symref-list-expand-all, semantic-symref-regexp) (semantic-symref-list-contract-all) (semantic-symref-list-map-open-hits) (semantic-symref-list-update-open-hits) (semantic-symref-list-create-macro-on-open-hit) (semantic-symref-list-call-macro-on-open-hits): New functions. (semantic-symref-list-menu-entries) (semantic-symref-list-menu): New vars. (semantic-symref-list-map-open-hits): Move cursor to beginning of match before calling the mapped function. * semantic/doc.el (semantic-documentation-comment-preceeding-tag): Do nothing if the mode doesn't provide comment-start-skip. * semantic/scope.el (semantic-analyze-scope-nested-tags-default): Strip duplicates. (semantic-analyze-scoped-inherited-tag-map): Take the tag we are looking for as part of the scoped tags list. * semantic/html.el (semantic-default-html-setup): Add senator-step-at-tag-classes. * semantic/decorate/include.el (semantic-decoration-on-unknown-includes): Change light bgcolor. (semantic-decoration-on-includes-highlight-default): Check that the include tag has a postion. * semantic/complete.el (semantic-collector-local-members): (semantic-complete-read-tag-local-members) (semantic-complete-jump-local-members): New class and functions. (semantic-complete-self-insert): Save excursion before completing. * semantic/analyze/complete.el (semantic-analyze-possible-completions-default): If no completions are found, return the raw by-name-only completion list. Add FLAGS arguments. Add support for 'no-tc (type constraint) and 'no-unique, or no stripping duplicates. (semantic-analyze-possible-completions-default): Add FLAGS arg. * semantic/util-modes.el (semantic-stickyfunc-show-only-functions-p): New option. (semantic-stickyfunc-fetch-stickyline): Don't show stickytext for the very first line in a buffer. * semantic/util.el (semantic-hack-search) (semantic-recursive-find-nonterminal-by-name) (semantic-current-tag-interactive): Deleted. (semantic-describe-buffer): Fix expand-nonterminal. Add lex-syntax-mods, type relation separator char, and command separation char. (semantic-sanity-check): Only message if called interactively. * semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the :filename property and the tag position. * semantic/lex-spp.el (semantic-lex-spp-lex-text-string): Add recursion limit. * semantic/imenu.el (semantic-imenu-bucketize-type-members): Make this buffer local, not the obsoleted variable. * semantic/idle.el: Add breadcrumbs support. (semantic-idle-summary-current-symbol-info-default) (semantic-idle-tag-highlight) (semantic-idle-completion-list-default): Use semanticdb-without-unloaded-file-searches for speed, and to conform to the controls that specify if the idle timer is supposed to be parsing unparsed includes. (semantic-idle-symbol-highlight-face) (semantic-idle-symbol-maybe-highlight): Rename from *-summary-*. Callers changed. (semantic-idle-work-parse-neighboring-files-flag): Default to nil. (semantic-idle-work-update-headers-flag): New var. (semantic-idle-work-for-one-buffer): Use it. (semantic-idle-local-symbol-highlight): Rename from semantic-idle-tag-highlight. (semantic-idle-truncate-long-summaries): New option. * semantic/ia.el (semantic-ia-cache) (semantic-ia-get-completions): Deleted. Callers changed. (semantic-ia-show-variants): New command. (semantic-ia-show-doc): If doc is empty, don't make a temp buffer. (semantic-ia-show-summary): If there isn't anything to show, say so. * semantic/grammar.el (semantic-grammar-create-package): Save the buffer even in batch mode. * semantic/fw.el (semanticdb-without-unloaded-file-searches): New macro. * semantic/dep.el (semantic-dependency-find-file-on-path): Fix case dereferencing ede-object when it is a list. * semantic/db-typecache.el (semanticdb-expand-nested-tag) (semanticdb-typecache-faux-namespace): New functions. (semanticdb-typecache-file-tags) (semanticdb-typecache-merge-streams): Use them. (semanticdb-typecache-file-tags): When deriving tags from a file, give the mode a chance to monkey with the tag copy. (semanticdb-typecache-find-default): Wrap find in save-excursion. (semanticdb-typecache-find-by-name-helper): Merge found names down. * semantic/db-global.el (semanticdb-enable-gnu-global-in-buffer): Don't show messages if GNU Global is not available and we don't want to throw an error. * semantic/db-find.el (semanticdb-find-result-nth-in-buffer): When trying to normalize the tag to a buffer, don't error if set-buffer method doesn't exist. * semantic/db-file.el (semanticdb-save-db): Simplify msg. * semantic/db.el (semanticdb-refresh-table): If forcing a refresh on a file not in a buffer, use semantic-find-file-noselect and delete the buffer after use. (semanticdb-current-database-list): When calculating root via hooks, force it through true-filename and skip the list of possible roots. * semantic/ctxt.el (semantic-ctxt-imported-packages): New. * semantic/analyze/debug.el (semantic-analyzer-debug-insert-tag): Reset standard output to current buffer. (semantic-analyzer-debug-global-symbol) (semantic-analyzer-debug-missing-innertype): Change "prefix" to "symbol" in messages. * semantic/analyze/refs.el: (semantic-analyze-refs-impl) (semantic-analyze-refs-proto): When calculating value, make sure the found tag is 'similar' to the originating tag. (semantic--analyze-refs-find-tags-with-parent): Attempt to identify matches via imported symbols of parents. (semantic--analyze-refs-full-lookup-with-parents): Do a deep search during the brute search. * semantic/analyze.el (semantic-analyze-find-tag-sequence-default): Be robust to calculated scopes being nil. * semantic/bovine/c.el (semantic-c-describe-environment): Add project macro symbol array. (semantic-c-parse-lexical-token): Add recursion limit. (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag): New overrides. (semantic-expand-c-tag-namelist): Split a full type from a typedef out to its own tag. (semantic-expand-c-tag-namelist): Do not split out a typedef'd inline type if it is an anonymous type. (semantic-c-reconstitute-token): Use the optional initializers as a clue that some function is probably a constructor. When defining the type of these constructors, split the parent name, and use only the class part, if applicable. * semantic/bovine/c-by.el: * semantic/wisent/python-wy.el: Regenerate.
300 lines
12 KiB
EmacsLisp
300 lines
12 KiB
EmacsLisp
;;; semantic/decorate.el --- Utilities for decorating/highlighting tokens.
|
|
|
|
;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2010
|
|
;;; Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Keywords: syntax
|
|
|
|
;; 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 <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Text representing a semantic tag is wrapped in an overlay.
|
|
;; This overlay can be used for highlighting, or setting other
|
|
;; editing properties on a tag, such as "read only."
|
|
;;
|
|
|
|
(require 'semantic)
|
|
(require 'pulse)
|
|
|
|
;;; Code:
|
|
|
|
;;; Highlighting Basics
|
|
(defun semantic-highlight-tag (tag &optional face)
|
|
"Specify that TAG should be highlighted.
|
|
Optional FACE specifies the face to use."
|
|
(let ((o (semantic-tag-overlay tag)))
|
|
(semantic-overlay-put o 'old-face
|
|
(cons (semantic-overlay-get o 'face)
|
|
(semantic-overlay-get o 'old-face)))
|
|
(semantic-overlay-put o 'face (or face 'semantic-tag-highlight-face))
|
|
))
|
|
|
|
(defun semantic-unhighlight-tag (tag)
|
|
"Unhighlight TAG, restoring its previous face."
|
|
(let ((o (semantic-tag-overlay tag)))
|
|
(semantic-overlay-put o 'face (car (semantic-overlay-get o 'old-face)))
|
|
(semantic-overlay-put o 'old-face (cdr (semantic-overlay-get o 'old-face)))
|
|
))
|
|
|
|
;;; Momentary Highlighting - One line
|
|
(defun semantic-momentary-highlight-one-tag-line (tag &optional face)
|
|
"Highlight the first line of TAG, unhighlighting before next command.
|
|
Optional argument FACE specifies the face to do the highlighting."
|
|
(save-excursion
|
|
;; Go to first line in tag
|
|
(semantic-go-to-tag tag)
|
|
(pulse-momentary-highlight-one-line (point))))
|
|
|
|
;;; Momentary Highlighting - Whole Tag
|
|
(defun semantic-momentary-highlight-tag (tag &optional face)
|
|
"Highlight TAG, removing highlighting when the user hits a key.
|
|
Optional argument FACE is the face to use for highlighting.
|
|
If FACE is not specified, then `highlight' will be used."
|
|
(when (semantic-tag-with-position-p tag)
|
|
(if (not (semantic-overlay-p (semantic-tag-overlay tag)))
|
|
;; No overlay, but a position. Highlight the first line only.
|
|
(semantic-momentary-highlight-one-tag-line tag face)
|
|
;; The tag has an overlay, highlight the whole thing
|
|
(pulse-momentary-highlight-overlay (semantic-tag-overlay tag)
|
|
face)
|
|
)))
|
|
|
|
(defun semantic-set-tag-face (tag face)
|
|
"Specify that TAG should use FACE for display."
|
|
(semantic-overlay-put (semantic-tag-overlay tag) 'face face))
|
|
|
|
(defun semantic-set-tag-invisible (tag &optional visible)
|
|
"Enable the text in TAG to be made invisible.
|
|
If VISIBLE is non-nil, make the text visible."
|
|
(semantic-overlay-put (semantic-tag-overlay tag) 'invisible
|
|
(not visible)))
|
|
|
|
(defun semantic-tag-invisible-p (tag)
|
|
"Return non-nil if TAG is invisible."
|
|
(semantic-overlay-get (semantic-tag-overlay tag) 'invisible))
|
|
|
|
(defun semantic-set-tag-intangible (tag &optional tangible)
|
|
"Enable the text in TAG to be made intangible.
|
|
If TANGIBLE is non-nil, make the text visible.
|
|
This function does not have meaning in XEmacs because it seems that
|
|
the extent 'intangible' property does not exist."
|
|
(semantic-overlay-put (semantic-tag-overlay tag) 'intangible
|
|
(not tangible)))
|
|
|
|
(defun semantic-tag-intangible-p (tag)
|
|
"Return non-nil if TAG is intangible.
|
|
This function does not have meaning in XEmacs because it seems that
|
|
the extent 'intangible' property does not exist."
|
|
(semantic-overlay-get (semantic-tag-overlay tag) 'intangible))
|
|
|
|
(defun semantic-overlay-signal-read-only
|
|
(overlay after start end &optional len)
|
|
"Hook used in modification hooks to prevent modification.
|
|
Allows deletion of the entire text.
|
|
Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system."
|
|
;; Stolen blithly from cpp.el in Emacs 21.1
|
|
(if (and (not after)
|
|
(or (< (semantic-overlay-start overlay) start)
|
|
(> (semantic-overlay-end overlay) end)))
|
|
(error "This text is read only")))
|
|
|
|
(defun semantic-set-tag-read-only (tag &optional writable)
|
|
"Enable the text in TAG to be made read-only.
|
|
Optional argument WRITABLE should be non-nil to make the text writable
|
|
instead of read-only."
|
|
(let ((o (semantic-tag-overlay tag))
|
|
(hook (if writable nil '(semantic-overlay-signal-read-only))))
|
|
(if (featurep 'xemacs)
|
|
;; XEmacs extents have a 'read-only' property.
|
|
(semantic-overlay-put o 'read-only (not writable))
|
|
(semantic-overlay-put o 'modification-hooks hook)
|
|
(semantic-overlay-put o 'insert-in-front-hooks hook)
|
|
(semantic-overlay-put o 'insert-behind-hooks hook))))
|
|
|
|
(defun semantic-tag-read-only-p (tag)
|
|
"Return non-nil if the current TAG is marked read only."
|
|
(let ((o (semantic-tag-overlay tag)))
|
|
(if (featurep 'xemacs)
|
|
;; XEmacs extents have a 'read-only' property.
|
|
(semantic-overlay-get o 'read-only)
|
|
(member 'semantic-overlay-signal-read-only
|
|
(semantic-overlay-get o 'modification-hooks)))))
|
|
|
|
;;; Secondary overlays
|
|
;;
|
|
;; Some types of decoration require a second overlay to be made.
|
|
;; It could be for images, arrows, or whatever.
|
|
;; We need a way to create such an overlay, and make sure it
|
|
;; gets whacked, but doesn't show up in the master list
|
|
;; of overlays used for searching.
|
|
(defun semantic-tag-secondary-overlays (tag)
|
|
"Return a list of secondary overlays active on TAG."
|
|
(semantic--tag-get-property tag 'secondary-overlays))
|
|
|
|
(defun semantic-tag-create-secondary-overlay (tag &optional link-hook)
|
|
"Create a secondary overlay for TAG.
|
|
Returns an overlay. The overlay is also saved in TAG.
|
|
LINK-HOOK is a function called whenever TAG is to be linked into
|
|
a buffer. It should take TAG and OVERLAY as arguments.
|
|
The LINK-HOOK should be used to position and set properties on the
|
|
generated secondary overlay."
|
|
(if (not (semantic-tag-overlay tag))
|
|
;; do nothing if there is no overlay
|
|
nil
|
|
(let* ((os (semantic-tag-start tag))
|
|
(oe (semantic-tag-end tag))
|
|
(o (semantic-make-overlay os oe (semantic-tag-buffer tag) t))
|
|
(attr (semantic-tag-secondary-overlays tag))
|
|
)
|
|
(semantic--tag-put-property tag 'secondary-overlays (cons o attr))
|
|
(semantic-overlay-put o 'semantic-secondary t)
|
|
(semantic-overlay-put o 'semantic-link-hook link-hook)
|
|
(semantic-tag-add-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
|
|
(semantic-tag-add-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
|
|
(semantic-tag-add-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
|
|
(run-hook-with-args link-hook tag o)
|
|
o)))
|
|
|
|
(defun semantic-tag-get-secondary-overlay (tag property)
|
|
"Return secondary overlays from TAG with PROPERTY.
|
|
PROPERTY is a symbol and all overlays with that symbol are returned.."
|
|
(let* ((olsearch (semantic-tag-secondary-overlays tag))
|
|
(o nil))
|
|
(while olsearch
|
|
(when (semantic-overlay-get (car olsearch) property)
|
|
(setq o (cons (car olsearch) o)))
|
|
(setq olsearch (cdr olsearch)))
|
|
o))
|
|
|
|
(defun semantic-tag-delete-secondary-overlay (tag overlay-or-property)
|
|
"Delete from TAG the secondary overlay OVERLAY-OR-PROPERTY.
|
|
If OVERLAY-OR-PROPERTY is an overlay, delete that overlay.
|
|
If OVERLAY-OR-PROPERTY is a symbol, find the overlay with that property."
|
|
(let* ((o overlay-or-property))
|
|
(if (semantic-overlay-p o)
|
|
(setq o (list o))
|
|
(setq o (semantic-tag-get-secondary-overlay tag overlay-or-property)))
|
|
(while (semantic-overlay-p (car o))
|
|
;; We don't really need to worry about the hooks.
|
|
;; They will clean themselves up eventually ??
|
|
(semantic--tag-put-property
|
|
tag 'secondary-overlays
|
|
(delete (car o) (semantic-tag-secondary-overlays tag)))
|
|
(semantic-overlay-delete (car o))
|
|
(setq o (cdr o)))))
|
|
|
|
(defun semantic--tag-unlink-copy-secondary-overlays (tag)
|
|
"Unlink secondary overlays from TAG which is a copy.
|
|
This means we don't destroy the overlays, only remove reference
|
|
from them in TAG."
|
|
(let ((ol (semantic-tag-secondary-overlays tag)))
|
|
(while ol
|
|
;; Else, remove all traces of ourself from the tag
|
|
;; Note to self: Does this prevent multiple types of secondary
|
|
;; overlays per tag?
|
|
(semantic-tag-remove-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
|
|
(semantic-tag-remove-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
|
|
(semantic-tag-remove-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
|
|
;; Next!
|
|
(setq ol (cdr ol)))
|
|
(semantic--tag-put-property tag 'secondary-overlays nil)
|
|
))
|
|
|
|
(defun semantic--tag-unlink-secondary-overlays (tag)
|
|
"Unlink secondary overlays from TAG."
|
|
(let ((ol (semantic-tag-secondary-overlays tag))
|
|
(nl nil))
|
|
(while ol
|
|
(if (semantic-overlay-get (car ol) 'semantic-link-hook)
|
|
;; Only put in a proxy if there is a link-hook. If there is no link-hook
|
|
;; the decorating mode must know when tags are unlinked on its own.
|
|
(setq nl (cons (semantic-overlay-get (car ol) 'semantic-link-hook)
|
|
nl))
|
|
;; Else, remove all traces of ourself from the tag
|
|
;; Note to self: Does this prevent multiple types of secondary
|
|
;; overlays per tag?
|
|
(semantic-tag-remove-hook tag 'link-hook 'semantic--tag-link-secondary-overlays)
|
|
(semantic-tag-remove-hook tag 'unlink-hook 'semantic--tag-unlink-secondary-overlays)
|
|
(semantic-tag-remove-hook tag 'unlink-copy-hook 'semantic--tag-unlink-copy-secondary-overlays)
|
|
)
|
|
(semantic-overlay-delete (car ol))
|
|
(setq ol (cdr ol)))
|
|
(semantic--tag-put-property tag 'secondary-overlays (nreverse nl))
|
|
))
|
|
|
|
(defun semantic--tag-link-secondary-overlays (tag)
|
|
"Unlink secondary overlays from TAG."
|
|
(let ((ol (semantic-tag-secondary-overlays tag)))
|
|
;; Wipe out old values.
|
|
(semantic--tag-put-property tag 'secondary-overlays nil)
|
|
;; Run all the link hooks.
|
|
(while ol
|
|
(semantic-tag-create-secondary-overlay tag (car ol))
|
|
(setq ol (cdr ol)))
|
|
))
|
|
|
|
;;; Secondary Overlay Uses
|
|
;;
|
|
;; States to put on tags that depend on a secondary overlay.
|
|
(defun semantic-set-tag-folded (tag &optional folded)
|
|
"Fold TAG, such that only the first line of text is shown.
|
|
Optional argument FOLDED should be non-nil to fold the tag.
|
|
nil implies the tag should be fully shown."
|
|
;; If they are different, do the deed.
|
|
(let ((o (semantic-tag-folded-p tag)))
|
|
(if (not folded)
|
|
;; We unfold.
|
|
(when o
|
|
(semantic-tag-delete-secondary-overlay tag 'semantic-folded))
|
|
(unless o
|
|
;; Add the foldn
|
|
(setq o (semantic-tag-create-secondary-overlay tag))
|
|
;; mark as folded
|
|
(semantic-overlay-put o 'semantic-folded t)
|
|
;; Move to cover end of tag
|
|
(save-excursion
|
|
(goto-char (semantic-tag-start tag))
|
|
(end-of-line)
|
|
(semantic-overlay-move o (point) (semantic-tag-end tag)))
|
|
;; We need to modify the invisibility spec for this to
|
|
;; work.
|
|
(if (or (eq buffer-invisibility-spec t)
|
|
(not (assoc 'semantic-fold buffer-invisibility-spec)))
|
|
(add-to-invisibility-spec '(semantic-fold . t)))
|
|
(semantic-overlay-put o 'invisible 'semantic-fold)
|
|
(overlay-put o 'isearch-open-invisible
|
|
'semantic-set-tag-folded-isearch)))
|
|
))
|
|
|
|
(declare-function semantic-current-tag "semantic/find")
|
|
|
|
(defun semantic-set-tag-folded-isearch (overlay)
|
|
"Called by isearch if it discovers text in the folded region.
|
|
OVERLAY is passed in by isearch."
|
|
(semantic-set-tag-folded (semantic-current-tag) nil)
|
|
)
|
|
|
|
(defun semantic-tag-folded-p (tag)
|
|
"Non-nil if TAG is currently folded."
|
|
(semantic-tag-get-secondary-overlay tag 'semantic-folded)
|
|
)
|
|
|
|
(provide 'semantic/decorate)
|
|
|
|
;; arch-tag: 30e5b6cb-dba0-41cd-920a-bc1dce267ad8
|
|
;;; semantic/decorate.el ends here
|