mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-14 07:59:34 +00: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.
131 lines
5 KiB
EmacsLisp
131 lines
5 KiB
EmacsLisp
;;; semantic/doc.el --- Routines for documentation strings
|
|
|
|
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2008, 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:
|
|
;;
|
|
;; It is good practice to write documentation for your functions and
|
|
;; variables. These core routines deal with these documentation
|
|
;; comments or strings. They can exist either as a tag property
|
|
;; (:documentation) or as a comment just before the symbol, or after
|
|
;; the symbol on the same line.
|
|
|
|
(require 'semantic/tag)
|
|
|
|
;;; Code:
|
|
|
|
;;;###autoload
|
|
(define-overloadable-function semantic-documentation-for-tag (&optional tag nosnarf)
|
|
"Find documentation from TAG and return it as a clean string.
|
|
TAG might have DOCUMENTATION set in it already. If not, there may be
|
|
some documentation in a comment preceding TAG's definition which we
|
|
can look for. When appropriate, this can be overridden by a language specific
|
|
enhancement.
|
|
Optional argument NOSNARF means to only return the lexical analyzer token for it.
|
|
If nosnarf if 'lex, then only return the lex token."
|
|
(if (not tag) (setq tag (semantic-current-tag)))
|
|
(save-excursion
|
|
(when (semantic-tag-with-position-p tag)
|
|
(set-buffer (semantic-tag-buffer tag)))
|
|
(:override
|
|
;; No override. Try something simple to find documentation nearby
|
|
(save-excursion
|
|
(semantic-go-to-tag tag)
|
|
(let ((doctmp (semantic-tag-docstring tag (current-buffer))))
|
|
(or
|
|
;; Is there doc in the tag???
|
|
doctmp
|
|
;; Check just before the definition.
|
|
(when (semantic-tag-with-position-p tag)
|
|
(semantic-documentation-comment-preceeding-tag tag nosnarf))
|
|
;; Lets look for comments either after the definition, but before code:
|
|
;; Not sure yet. Fill in something clever later....
|
|
nil))))))
|
|
|
|
;; FIXME this is not how you spell "preceding".
|
|
(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf)
|
|
"Find a comment preceding TAG.
|
|
If TAG is nil. use the tag under point.
|
|
Searches the space between TAG and the preceding tag for a comment,
|
|
and converts the comment into clean documentation.
|
|
Optional argument NOSNARF with a value of 'lex means to return
|
|
just the lexical token and not the string."
|
|
(if (not tag) (setq tag (semantic-current-tag)))
|
|
(save-excursion
|
|
;; Find this tag.
|
|
(semantic-go-to-tag tag)
|
|
(let* ((starttag (semantic-find-tag-by-overlay-prev
|
|
(semantic-tag-start tag)))
|
|
(start (if starttag
|
|
(semantic-tag-end starttag)
|
|
(point-min))))
|
|
(when (and comment-start-skip
|
|
(re-search-backward comment-start-skip start t))
|
|
;; We found a comment that doesn't belong to the body
|
|
;; of a function.
|
|
(semantic-doc-snarf-comment-for-tag nosnarf)))
|
|
))
|
|
|
|
(defun semantic-doc-snarf-comment-for-tag (nosnarf)
|
|
"Snarf up the comment at POINT for `semantic-documentation-for-tag'.
|
|
Attempt to strip out comment syntactic sugar.
|
|
Argument NOSNARF means don't modify the found text.
|
|
If NOSNARF is 'lex, then return the lex token."
|
|
(let* ((semantic-ignore-comments nil)
|
|
(semantic-lex-analyzer #'semantic-comment-lexer))
|
|
(if (memq nosnarf '(lex flex)) ;; keep `flex' for compatibility
|
|
(car (semantic-lex (point) (1+ (point))))
|
|
(let ((ct (semantic-lex-token-text
|
|
(car (semantic-lex (point) (1+ (point)))))))
|
|
(if nosnarf
|
|
nil
|
|
;; ok, try to clean the text up.
|
|
;; Comment start thingy
|
|
(while (string-match (concat "^\\s-*" comment-start-skip) ct)
|
|
(setq ct (concat (substring ct 0 (match-beginning 0))
|
|
(substring ct (match-end 0)))))
|
|
;; Arbitrary punctuation at the beginning of each line.
|
|
(while (string-match "^\\s-*\\s.+\\s-*" ct)
|
|
(setq ct (concat (substring ct 0 (match-beginning 0))
|
|
(substring ct (match-end 0)))))
|
|
;; End of a block comment.
|
|
(if (and (boundp 'block-comment-end)
|
|
block-comment-end
|
|
(string-match block-comment-end ct))
|
|
(setq ct (concat (substring ct 0 (match-beginning 0))
|
|
(substring ct (match-end 0)))))
|
|
;; In case it's a real string, STRIPIT.
|
|
(while (string-match "\\s-*\\s\"+\\s-*" ct)
|
|
(setq ct (concat (substring ct 0 (match-beginning 0))
|
|
(substring ct (match-end 0))))))
|
|
;; Now return the text.
|
|
ct))))
|
|
|
|
(provide 'semantic/doc)
|
|
|
|
;; Local variables:
|
|
;; generated-autoload-file: "loaddefs.el"
|
|
;; generated-autoload-load-name: "semantic/doc"
|
|
;; End:
|
|
|
|
;; arch-tag: fe6e965b-4a81-4304-aab8-22ca113194ca
|
|
;;; semantic/doc.el ends here
|