mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-25 06:50:46 -08:00
* lisp/cedet/cedet.el (cedet-version): * lisp/cedet/srecode.el (srecode-version): Bump version to 1.0. * lisp/cedet/pulse.el (pulse-momentary-highlight-overlay): If pulse-flag is 'never, disable all pulsing. * lisp/cedet/srecode/compile.el (srecode-compile-templates): Fix directory compare of built-in templates. Give built-ins lower piority. Support special variable "project". (srecode-compile-template-table): Set :project slot of new tables. (srecode-compile-one-template-tag): Use srecode-create-dictionaries-from-tags. * lisp/cedet/srecode/cpp.el (srecode-cpp): New defgroup. (srecode-cpp-namespaces): New option. (srecode-semantic-handle-:using-namespaces) (srecode-cpp-apply-templates): New functions. (srecode-semantic-apply-tag-to-dict): Handle template parameters by calling `srecode-cpp-apply-templates'. * lisp/cedet/srecode/dictionary.el (srecode-dictionary-add-template-table): Do not add variables in tables not for the current project. (srecode-compound-toString): Handle cases where the default value is another compound value. (srecode-dictionary-lookup-name): New optional argument NON-RECURSIVE, which inhibits visiting dictionary parents. (srecode-dictionary-add-section-dictionary) (srecode-dictionary-merge): New optional argument FORCE adds values even if an identically named entry exists. (srecode-dictionary-add-entries): New method. (srecode-create-dictionaries-from-tags): New function. * lisp/cedet/srecode/fields.el (srecode-fields-exit-confirmation): New option. (srecode-field-exit-ask): Use it. * lisp/cedet/srecode/find.el (srecode-template-get-table) (srecode-template-get-table-for-binding) (srecode-all-template-hash): Skip if not in current project. (srecode-template-table-in-project-p): New method. * lisp/cedet/srecode/getset.el (srecode-insert-getset): Force tag table update. Don't query the class if it is empty. * lisp/cedet/srecode/insert.el (srecode-insert-fcn): Merge template dictionary before resolving arguments. (srecode-insert-method-helper): Add error checking to make sure that we only have dictionaries. (srecode-insert-method): Check template nesting depth when using point inserter override. (srecode-insert-method): Install override with depth limit. * lisp/cedet/srecode/map.el (srecode-map-update-map): Make map loading more robust. * lisp/cedet/srecode/mode.el (srecode-bind-insert): Call srecode-load-tables-for-mode. (srecode-minor-mode-templates-menu): Do not list templates that are not in the current project. (srecode-menu-bar): Add binding for srecode-macro-help. * lisp/cedet/srecode/table.el (srecode-template-table): Add :project slot. (srecode-dump): Dump it. * lisp/cedet/srecode/texi.el (srecode-texi-insert-tag-as-doc): New function. (semantic-insert-foreign-tag): Use it.
181 lines
3.4 KiB
Text
181 lines
3.4 KiB
Text
;; java.srt
|
||
|
||
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
||
|
||
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
||
|
||
;; 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/>.
|
||
|
||
set mode "java-mode"
|
||
set escape_start "{{"
|
||
set escape_end "}}"
|
||
|
||
context file
|
||
|
||
set comment_start "/**"
|
||
set comment_end " */"
|
||
set comment_prefix " *"
|
||
|
||
template empty :file :user :time :java :indent
|
||
"Fill out an empty file."
|
||
sectiondictionary "CLASSSECTION"
|
||
set NAME macro "FILENAME_AS_CLASS"
|
||
----
|
||
{{>:filecomment}}
|
||
|
||
package {{FILENAME_AS_PACKAGE}};
|
||
|
||
{{>CLASSSECTION:declaration:class}}
|
||
|
||
----
|
||
bind "e"
|
||
|
||
context declaration
|
||
|
||
template import :blank :indent
|
||
"Template to import a package."
|
||
----
|
||
{{>:declaration:include}}
|
||
----
|
||
bind "i"
|
||
|
||
template class :blank :indent
|
||
"Template to declare a variable."
|
||
sectiondictionary "DOCSECTION"
|
||
set NAME macro "NAME"
|
||
----
|
||
{{>DOCSECTION:declaration:javadoc-class}}
|
||
public class {{?NAME}} {
|
||
|
||
{{^}}
|
||
|
||
} // {{NAME}}
|
||
----
|
||
bind "c"
|
||
|
||
;;; Semantic Tag support
|
||
;;
|
||
template class-tag :indent :blank
|
||
"Insert a Java class with the expectation of it being used by a tag inserter.
|
||
Override this to affect applications, or the outer class structure for
|
||
the user-facing template."
|
||
----
|
||
{{>:declaration:javadoc-class}}
|
||
public Class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
|
||
{
|
||
{{^}}
|
||
};
|
||
----
|
||
|
||
template include :blank
|
||
"An include statement."
|
||
----
|
||
import {{?NAME}};
|
||
----
|
||
|
||
context misc
|
||
|
||
template arglist
|
||
"Insert an argument list for a function.
|
||
@todo - Support smart CR in a buffer for not too long lines."
|
||
----
|
||
({{#ARGS}}{{TYPE}} {{NAME}}{{#NOTLAST}},{{/NOTLAST}}{{/ARGS}})
|
||
----
|
||
|
||
context classdecl
|
||
|
||
template function :indent :blank
|
||
----
|
||
public {{?TYPE}} {{?NAME}}{{>:misc:arglist}} {
|
||
{{^}}
|
||
}
|
||
----
|
||
bind "m"
|
||
|
||
template variable :indent :blank
|
||
"Insert a variable declaration."
|
||
----
|
||
{{?TYPE}} {{?NAME}}{{#HAVEDEFAULT}} = {{DEFAULT}}{{/HAVEDEFAULT}};
|
||
----
|
||
bind "v"
|
||
|
||
;;; Java Doc Comments
|
||
;;
|
||
context classdecl
|
||
|
||
prompt GROUPNAME "Name of declaration group: "
|
||
|
||
template javadoc-function-group-start :indent :blank
|
||
----
|
||
/**
|
||
* {{?GROUPNAME}}
|
||
* @{
|
||
*/
|
||
|
||
----
|
||
|
||
template javadoc-function-group-end :indent :blank
|
||
----
|
||
/**
|
||
* @}
|
||
*/
|
||
|
||
----
|
||
|
||
context declaration
|
||
|
||
template javadoc-class :indent :blank :time :user :tag
|
||
----
|
||
/**
|
||
* {{DOC}}{{^}}
|
||
*
|
||
* Created: {{DATE}}
|
||
*
|
||
* @author {{AUTHOR}}
|
||
* @version
|
||
* @since
|
||
*/
|
||
----
|
||
|
||
template javadoc-function :indent :blank :tag
|
||
----
|
||
/**
|
||
* {{DOC}}{{^}}
|
||
* {{#ARGS}}
|
||
* @param {{?NAME}} - {{DOC}}{{/ARGS}}
|
||
* @return {{TYPE}}{{#THROWS}}
|
||
* @exception {{NAME}} - {{EXDOC}}{{/THROWS}}
|
||
*/
|
||
----
|
||
|
||
template javadoc-variable-same-line
|
||
----
|
||
/**< {{DOC}}{{^}} */
|
||
----
|
||
|
||
template javadoc-section-comment :blank :indent
|
||
"Insert a comment that separates sections of an Emacs Lisp file."
|
||
----
|
||
|
||
/** {{?TITLE}}
|
||
*
|
||
* {{^}}
|
||
*/
|
||
|
||
----
|
||
|
||
|
||
;; end
|