Mercurial > vim
view runtime/syntax/dtd.vim @ 35039:fbdb6aeca2e2
runtime(java): Improve the recognition of the "style" method declarations
Commit: https://github.com/vim/vim/commit/a4c085a3e607bd01d34e1db600b6460fc35fb0a3
Author: Aliaksei Budavei <0x000c70@gmail.com>
Date: Wed Apr 24 21:04:25 2024 +0200
runtime(java): Improve the recognition of the "style" method declarations
- Request the new regexp engine (v7.3.970) for [:upper:] and
[:lower:].
- Recognise declarations of in-line annotated methods.
- Recognise declarations of _strictfp_ methods.
- Establish partial order for method modifiers as shown in
the MethodModifier production; namely, _public_ and
friends should be written the leftmost, possibly followed
by _abstract_ or _default_, or possibly followed by other
modifiers.
- Stop looking for parameterisable primitive types (void<?>,
int<Object>, etc., are malformed).
- Stop looking for arrays of _void_.
- Acknowledge the prevailing convention for method names to
begin with a small letter and for class/interface names to
begin with a capital letter; and, therefore, desist from
claiming declarations of enum constants and constructors
with javaFuncDef.
Rationale:
+ Constructor is distinct from method:
* its (overloaded) name is not arbitrary;
* its return type is implicit;
* its _throws_ clause depends on indirect vagaries of
instance (variable) initialisers;
* its invocation makes other constructors of its type
hierarchy invoked one by one, concluding with the
primordial constructor;
* its explicit invocation, via _this_ or _super_, can
only appear as the first statement in a constructor
(not anymore, see JEP 447); else, its _super_ call
cannot appear in constructors of _record_ or _enum_;
and neither invocation is allowed for the primordial
constructor;
* it is not a member of its class, like initialisers,
and is never inherited;
* it is never _abstract_ or _native_.
+ Constructor declarations tend to be few in number and
merit visual recognition from method declarations.
+ Enum constants define a fixed set of type instances
and more resemble class variable initialisers.
Note that the code duplicated for @javaFuncParams is written
keeping in mind for g:java_highlight_functions a pending 3rd
variant, which would require none of the :syn-cluster added
groups.
closes: #14620
Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 24 Apr 2024 21:15:02 +0200 |
parents | f0d7cb510ce3 |
children |
line wrap: on
line source
" Vim syntax file " Language: DTD (Document Type Definition for XML) " Maintainer: Christian Brabandt <cb@256bit.org> " Repository: https://github.com/chrisbra/vim-xml-ftplugin " Previous Maintainer: Johannes Zellner <johannes@zellner.org> " Author: Daniel Amyot <damyot@site.uottawa.ca> " Last Changed: Sept 24, 2019 " Filenames: *.dtd " " REFERENCES: " http://www.w3.org/TR/html40/ " http://www.w3.org/TR/NOTE-html-970421 " " TODO: " - improve synchronizing. if exists("b:current_syntax") finish endif let s:dtd_cpo_save = &cpo set cpo&vim if !exists("dtd_ignore_case") " I prefer having the case takes into consideration. syn case match else syn case ignore endif " the following line makes the opening <! and " closing > highlighted using 'dtdFunction'. " " PROVIDES: @dtdTagHook " syn region dtdTag matchgroup=dtdFunction \ start=+<!+ end=+>+ matchgroup=NONE \ contains=dtdTag,dtdTagName,dtdError,dtdComment,dtdString,dtdAttrType,dtdAttrDef,dtdEnum,dtdParamEntityInst,dtdParamEntityDecl,dtdCard,@dtdTagHook if !exists("dtd_no_tag_errors") " mark everything as an error which starts with a <! " and is not overridden later. If this is annoying, " it can be switched off by setting the variable " dtd_no_tag_errors. syn region dtdError contained start=+<!+lc=2 end=+>+ endif " if this is a html like comment highlight also " the opening <! and the closing > as Comment. syn region dtdComment start=+<![ \t]*--+ end=+-->+ contains=dtdTodo,@Spell " proper DTD comment syn region dtdComment contained start=+--+ end=+--+ contains=dtdTodo,@Spell " Start tags (keywords). This is contained in dtdFunction. " Note that everything not contained here will be marked " as error. syn match dtdTagName contained +<!\(ATTLIST\|DOCTYPE\|ELEMENT\|ENTITY\|NOTATION\|SHORTREF\|USEMAP\|\[\)+lc=2,hs=s+2 " wildcards and operators syn match dtdCard contained "|" syn match dtdCard contained "," " evenutally overridden by dtdEntity syn match dtdCard contained "&" syn match dtdCard contained "?" syn match dtdCard contained "\*" syn match dtdCard contained "+" " ...and finally, special cases. syn match dtdCard "ANY" syn match dtdCard "EMPTY" if !exists("dtd_no_param_entities") " highlight parameter entity declarations " and instances. Note that the closing `;' " is optional. " instances syn region dtdParamEntityInst oneline matchgroup=dtdParamEntityPunct \ start="%[-_a-zA-Z0-9.]\+"he=s+1,rs=s+1 \ skip=+[-_a-zA-Z0-9.]+ \ end=";\|\>" \ matchgroup=NONE contains=dtdParamEntityPunct syn match dtdParamEntityPunct contained "\." " declarations " syn region dtdParamEntityDecl oneline matchgroup=dtdParamEntityDPunct start=+<!ENTITY % +lc=8 skip=+[-_a-zA-Z0-9.]+ matchgroup=NONE end="\>" contains=dtdParamEntityDPunct syn match dtdParamEntityDecl +<!ENTITY % [-_a-zA-Z0-9.]*+lc=8 contains=dtdParamEntityDPunct syn match dtdParamEntityDPunct contained "%\|\." endif " &entities; compare with xml syn match dtdEntity "&[^; \t]*;" contains=dtdEntityPunct syn match dtdEntityPunct contained "[&.;]" " Strings are between quotes syn region dtdString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=dtdAttrDef,dtdAttrType,dtdParamEntityInst,dtdEntity,dtdCard syn region dtdString start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=dtdAttrDef,dtdAttrType,dtdParamEntityInst,dtdEntity,dtdCard " Enumeration of elements or data between parenthesis " " PROVIDES: @dtdEnumHook " syn region dtdEnum matchgroup=dtdType start="(" end=")" matchgroup=NONE contains=dtdEnum,dtdParamEntityInst,dtdCard,@dtdEnumHook "Attribute types syn keyword dtdAttrType NMTOKEN ENTITIES NMTOKENS ID CDATA syn keyword dtdAttrType IDREF IDREFS " ENTITY has to treated special for not overriding <!ENTITY syn match dtdAttrType +[^!]\<ENTITY+ "Attribute Definitions syn match dtdAttrDef "#REQUIRED" syn match dtdAttrDef "#IMPLIED" syn match dtdAttrDef "#FIXED" syn case match " define some common keywords to mark TODO " and important sections inside comments. syn keyword dtdTodo contained TODO FIXME XXX syn sync lines=250 " Define the default highlighting. " Only when an item doesn't have highlighting yet " The default highlighting. hi def link dtdFunction Function hi def link dtdTag Normal hi def link dtdType Type hi def link dtdAttrType dtdType hi def link dtdAttrDef dtdType hi def link dtdConstant Constant hi def link dtdString dtdConstant hi def link dtdEnum dtdConstant hi def link dtdCard dtdFunction hi def link dtdEntity Statement hi def link dtdEntityPunct dtdType hi def link dtdParamEntityInst dtdConstant hi def link dtdParamEntityPunct dtdType hi def link dtdParamEntityDecl dtdType hi def link dtdParamEntityDPunct dtdComment hi def link dtdComment Comment hi def link dtdTagName Statement hi def link dtdError Error hi def link dtdTodo Todo let &cpo = s:dtd_cpo_save unlet s:dtd_cpo_save let b:current_syntax = "dtd" " vim: ts=8