Mercurial > vim
view runtime/syntax/hare.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 | 1e91e26ceebf |
| children | ea0402ba92f6 |
line wrap: on
line source
" PRELUDE {{{1 " Vim syntax file " Language: Hare " Maintainer: Amelia Clarke <me@rsaihe.dev> " Last Change: 2022-09-21 if exists("b:current_syntax") finish endif let b:current_syntax = "hare" " SYNTAX {{{1 syn case match " KEYWORDS {{{2 syn keyword hareConditional if else match switch syn keyword hareKeyword break continue return yield syn keyword hareKeyword defer syn keyword hareKeyword fn syn keyword hareKeyword let syn keyword hareLabel case syn keyword hareOperator as is syn keyword hareRepeat for syn keyword hareStorageClass const def export nullable static syn keyword hareStructure enum struct union syn keyword hareTypedef type " C ABI. syn keyword hareKeyword vastart vaarg vaend " BUILTINS {{{2 syn keyword hareBuiltin abort syn keyword hareBuiltin alloc free syn keyword hareBuiltin append delete insert syn keyword hareBuiltin assert syn keyword hareBuiltin len offset " TYPES {{{2 syn keyword hareType bool syn keyword hareType char str syn keyword hareType f32 f64 syn keyword hareType u8 u16 u32 u64 i8 i16 i32 i64 syn keyword hareType uint int syn keyword hareType rune syn keyword hareType uintptr syn keyword hareType void " C ABI. syn keyword hareType valist " LITERALS {{{2 syn keyword hareBoolean true false syn keyword hareNull null " Number literals. syn match hareNumber "\v(\.@1<!|\.\.)\zs<\d+([Ee][+-]?\d+)?(z|[iu](8|16|32|64)?)?>" display syn match hareNumber "\v(\.@1<!|\.\.)\zs<0b[01]+(z|[iu](8|16|32|64)?)?>" display syn match hareNumber "\v(\.@1<!|\.\.)\zs<0o\o+(z|[iu](8|16|32|64)?)?>" display syn match hareNumber "\v(\.@1<!|\.\.)\zs<0x\x+(z|[iu](8|16|32|64)?)?>" display " Floating-point number literals. syn match hareFloat "\v<\d+\.\d+([Ee][+-]?\d+)?(f32|f64)?>" display syn match hareFloat "\v<\d+([Ee][+-]?\d+)?(f32|f64)>" display " String and rune literals. syn match hareEscape "\\[\\'"0abfnrtv]" contained display syn match hareEscape "\v\\(x\x{2}|u\x{4}|U\x{8})" contained display syn match hareFormat "\v\{\d*(\%\d*|(:[ 0+-]?\d*(\.\d+)?[Xbox]?))?}" contained display syn match hareFormat "\({{\|}}\)" contained display syn region hareRune start="'" end="'\|$" skip="\\'" contains=hareEscape display extend syn region hareString start=+"+ end=+"\|$+ skip=+\\"+ contains=hareEscape,hareFormat display extend syn region hareString start="`" end="`\|$" contains=hareFormat display " MISCELLANEOUS {{{2 syn keyword hareTodo FIXME TODO XXX contained " Attributes. syn match hareAttribute "@[a-z]*" " Blocks. syn region hareBlock start="{" end="}" fold transparent " Comments. syn region hareComment start="//" end="$" contains=hareCommentDoc,hareTodo,@Spell display keepend syn region hareCommentDoc start="\[\[" end="]]\|\ze\_s" contained display " The size keyword can be either a builtin or a type. syn match hareBuiltin "\v<size>\ze(\_s*//.*\_$)*\_s*\(" contains=hareComment syn match hareType "\v<size>((\_s*//.*\_$)*\_s*\()@!" contains=hareComment " Trailing whitespace. syn match hareSpaceError "\v\s+$" display excludenl syn match hareSpaceError "\v\zs +\ze\t" display " Use statement. syn region hareUse start="\v^\s*\zsuse>" end=";" contains=hareComment display syn match hareErrorAssertion "\v(^([^/]|//@!)*\)\_s*)@<=!\=@!" syn match hareQuestionMark "?" " DEFAULT HIGHLIGHTING {{{1 hi def link hareAttribute Keyword hi def link hareBoolean Boolean hi def link hareBuiltin Function hi def link hareComment Comment hi def link hareCommentDoc SpecialComment hi def link hareConditional Conditional hi def link hareEscape SpecialChar hi def link hareFloat Float hi def link hareFormat SpecialChar hi def link hareKeyword Keyword hi def link hareLabel Label hi def link hareNull Constant hi def link hareNumber Number hi def link hareOperator Operator hi def link hareQuestionMark Special hi def link hareRepeat Repeat hi def link hareRune Character hi def link hareStorageClass StorageClass hi def link hareString String hi def link hareStructure Structure hi def link hareTodo Todo hi def link hareType Type hi def link hareTypedef Typedef hi def link hareUse PreProc hi def link hareSpaceError Error autocmd InsertEnter * hi link hareSpaceError NONE autocmd InsertLeave * hi link hareSpaceError Error hi def hareErrorAssertion ctermfg=red cterm=bold guifg=red gui=bold " vim: tabstop=8 shiftwidth=2 expandtab