From 5ded0682bdc20aacdcd958dacdcd1b965c549654 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sat, 8 Jun 2019 13:28:47 +0200 Subject: [PATCH] Add dlang support, closes #401 --- README.md | 3 +- build | 1 + ftdetect/polyglot.vim | 35 +++ indent/d.vim | 81 ++++++ syntax/d.vim | 577 ++++++++++++++++++++++++++++++++++++++++++ syntax/dcov.vim | 55 ++++ syntax/dd.vim | 5 + syntax/ddoc.vim | 86 +++++++ syntax/dsdl.vim | 94 +++++++ 9 files changed, 936 insertions(+), 1 deletion(-) create mode 100644 indent/d.vim create mode 100644 syntax/d.vim create mode 100644 syntax/dcov.vim create mode 100644 syntax/dd.vim create mode 100644 syntax/ddoc.vim create mode 100644 syntax/dsdl.vim diff --git a/README.md b/README.md index 597a4b0..d9a42c0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A collection of language packs for Vim. > One to rule them all, one to find them, one to bring them all and in the darkness bind them. - It **won't affect your startup time**, as scripts are loaded only on demand\*. -- It **installs and updates 120+ times faster** than the 137 packages it consists of. +- It **installs and updates 120+ times faster** than the 138 packages it consists of. - Solid syntax and indentation support (other features skipped). Only the best language packs. - All unnecessary files are ignored (like enormous documentation from php support). - No support for esoteric languages, only most popular ones (modern too, like `slim`). @@ -68,6 +68,7 @@ If you need full functionality of any plugin, please use it directly with your p - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin) - [cue](https://github.com/mgrabovsky/vim-cuesheet) (syntax) - [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin) +- [dlang](https://github.com/JesseKPhillips/d.vim) (syntax, indent) - [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (syntax, indent, ftplugin) - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin) - [elm](https://github.com/ElmCast/elm-vim) (syntax, indent, autoload, ftplugin) diff --git a/build b/build index d719d8a..4fdc12a 100755 --- a/build +++ b/build @@ -176,6 +176,7 @@ PACKS=" cucumber:tpope/vim-cucumber cue:mgrabovsky/vim-cuesheet dart:dart-lang/dart-vim-plugin + dlang:JesseKPhillips/d.vim dockerfile:ekalinin/Dockerfile.vim elixir:elixir-lang/vim-elixir elm:ElmCast/elm-vim diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index 15eea89..7f62208 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -290,6 +290,41 @@ autocmd BufRead,BufNewFile *.dart set filetype=dart augroup end endif +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1 + augroup filetypedetect + " dlang, from d.vim in JesseKPhillips/d.vim +autocmd BufNewFile,BufRead *.d setf d + augroup end +endif + +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1 + augroup filetypedetect + " dlang, from dcov.vim in JesseKPhillips/d.vim +autocmd BufNewFile,BufRead *.lst set filetype=dcov + augroup end +endif + +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1 + augroup filetypedetect + " dlang, from dd.vim in JesseKPhillips/d.vim +au BufRead,BufNewFile *.dd set filetype=dd + augroup end +endif + +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1 + augroup filetypedetect + " dlang, from ddoc.vim in JesseKPhillips/d.vim +au BufRead,BufNewFile *.ddoc set filetype=ddoc + augroup end +endif + +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1 + augroup filetypedetect + " dlang, from dsdl.vim in JesseKPhillips/d.vim +autocmd BufNewFile,BufRead *.sdl set filetype=dsdl + augroup end +endif + if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1 augroup filetypedetect " dockerfile, from Dockerfile.vim in ekalinin/Dockerfile.vim diff --git a/indent/d.vim b/indent/d.vim new file mode 100644 index 0000000..13a6ddf --- /dev/null +++ b/indent/d.vim @@ -0,0 +1,81 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +" Vim indent file for the D programming language (version 1.076 and 2.063). +" +" Language: D +" Maintainer: Jesse Phillips +" Last Change: 2014 January 19 +" Version: 0.26 +" +" Please submit bugs/comments/suggestions to the github repo: +" https://github.com/JesseKPhillips/d.vim + +" Only load this indent file when no other was loaded. +if exists("b:did_indent") + finish +endif +let b:did_indent = 1 + +setlocal cindent +setlocal indentkeys& indentkeys+=0=in indentkeys+=0=out indentkeys+=0=body +setlocal indentexpr=GetDIndent() + +if exists("*GetDIndent") + finish +endif + +function! SkipBlanksAndComments(startline) + let lnum = a:startline + while lnum > 1 + let lnum = prevnonblank(lnum) + if getline(lnum) =~ '[*+]/\s*$' + while getline(lnum) !~ '/[*+]' && lnum > 1 + let lnum = lnum - 1 + endwhile + if getline(lnum) =~ '^\s*/[*+]' + let lnum = lnum - 1 + else + break + endif + elseif getline(lnum) =~ '\s*//' + let lnum = lnum - 1 + else + break + endif + endwhile + return lnum +endfunction + +function GetDIndent() + let lnum = v:lnum + let line = getline(lnum) + let cind = cindent(lnum) + + " Align contract blocks with function signature. + if line =~ '^\s*\(body\|in\|out\)\>' + " Skip in/out parameters. + if getline(lnum - 1) =~ '[(,]\s*$' + return cind + endif + " Find the end of the last block or the function signature. + if line !~ '^\s*}' && getline(lnum - 1) !~ '(' + while lnum > 1 && getline(lnum - 1) !~ '[(}]' + let lnum = lnum - 1 + endwhile + endif + let lnum = SkipBlanksAndComments(lnum) + return cindent(lnum - 1) + endif + + " Align multiline array literals. e.g.: + " auto a = [ + " [ 1, 2, 3 ], + " [ 4, 5, 6 ], + if line =~ '^\s*\[' && getline(lnum - 1) =~ '^\s*\[' + return indent(lnum - 1) + endif + + return cind +endfunction diff --git a/syntax/d.vim b/syntax/d.vim new file mode 100644 index 0000000..8550c25 --- /dev/null +++ b/syntax/d.vim @@ -0,0 +1,577 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +" Vim syntax file for the D programming language (version 1.076 and 2.069). +" +" Language: D +" Maintainer: Jesse Phillips +" Last Change: 2016 Feb 2 +" Version: 0.28 +" +" Please submit bugs/comments/suggestions to the github repo: +" https://github.com/JesseKPhillips/d.vim +" +" Options: +" d_comment_strings - Set to highlight strings and numbers in comments. +" +" d_hl_operator_overload - Set to highlight D's specially named functions +" that when overloaded implement unary and binary operators (e.g. opCmp). +" +" d_hl_object_types - Set to highlight some common types from object.di. + +"load the ddoc syntax +runtime! /syntax/ddoc.vim + +" Quit when a syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +" Support cpoptions +let s:cpo_save = &cpo +set cpo&vim + +" Set the current syntax to be known as d +let b:current_syntax = "d" + + +" Keyword definitions +" +syn keyword dExternal contained import module +syn keyword dAssert assert +syn keyword dConditional if else switch +syn keyword dBranch goto break continue +syn keyword dRepeat while for do foreach foreach_reverse +syn keyword dBoolean true false +syn keyword dConstant null +syn keyword dConstant __FILE__ __LINE__ __EOF__ __VERSION__ +syn keyword dConstant __DATE__ __TIME__ __TIMESTAMP__ __VENDOR__ +syn keyword dConstant __MODULE__ __FUNCTION__ __PRETTY_FUNCTION__ +syn keyword dTypedef alias typedef +syn keyword dStructure template interface class struct union +syn keyword dEnum enum +syn keyword dOperator new delete typeof typeid cast align is +syn keyword dOperator this super +if exists("d_hl_operator_overload") + syn keyword dOpOverload opNeg opCom opPostInc opPostDec opCast opAdd + syn keyword dOpOverload opSub opSub_r opMul opDiv opDiv_r opMod + syn keyword dOpOverload opMod_r opAnd opOr opXor opShl opShl_r opShr + syn keyword dOpOverload opShr_r opUShr opUShr_r opCat + syn keyword dOpOverload opCat_r opEquals opCmp + syn keyword dOpOverload opAssign opAddAssign opSubAssign opMulAssign + syn keyword dOpOverload opDivAssign opModAssign opAndAssign + syn keyword dOpOverload opOrAssign opXorAssign opShlAssign + syn keyword dOpOverload opShrAssign opUShrAssign opCatAssign + syn keyword dOpOverload opIndex opIndexAssign opIndexOpAssign + syn keyword dOpOverload opCall opSlice opSliceAssign opSliceOpAssign + syn keyword dOpOverload opPos opAdd_r opMul_r opAnd_r opOr_r opXor_r + syn keyword dOpOverload opIn opIn_r opPow opDispatch opStar opDot + syn keyword dOpOverload opApply opApplyReverse opDollar + syn keyword dOpOverload opUnary opIndexUnary opSliceUnary + syn keyword dOpOverload opBinary opBinaryRight +endif + +syn keyword dType byte ubyte short ushort int uint long ulong cent ucent +syn keyword dType void bool Object +syn keyword dType float double real +syn keyword dType ushort int uint long ulong float +syn keyword dType char wchar dchar string wstring dstring +syn keyword dType ireal ifloat idouble creal cfloat cdouble +syn keyword dType size_t ptrdiff_t sizediff_t equals_t hash_t +if exists("d_hl_object_types") + syn keyword dType Object Throwable AssociativeArray Error Exception + syn keyword dType Interface OffsetTypeInfo TypeInfo TypeInfo_Typedef + syn keyword dType TypeInfo_Enum TypeInfo_Pointer TypeInfo_Array + syn keyword dType TypeInfo_StaticArray TypeInfo_AssociativeArray + syn keyword dType TypeInfo_Function TypeInfo_Delegate TypeInfo_Class + syn keyword dType ClassInfo TypeInfo_Interface TypeInfo_Struct + syn keyword dType TypeInfo_Tuple TypeInfo_Const TypeInfo_Invariant + syn keyword dType TypeInfo_Shared TypeInfo_Inout MemberInfo + syn keyword dType MemberInfo_field MemberInfo_function ModuleInfo +endif +syn keyword dDebug deprecated unittest invariant +syn keyword dExceptions throw try catch finally +syn keyword dScopeDecl public protected private export package +syn keyword dStatement debug return with +syn keyword dStatement function delegate __ctfe mixin macro __simd +syn keyword dStatement in out body +syn keyword dStorageClass contained in out scope +syn keyword dStorageClass inout ref lazy pure nothrow +syn keyword dStorageClass auto static override final abstract volatile +syn keyword dStorageClass __gshared __vector +syn keyword dStorageClass synchronized shared immutable const lazy +syn keyword dIdentifier _arguments _argptr __vptr __monitor +syn keyword dIdentifier _ctor _dtor __argTypes __overloadset +syn keyword dScopeIdentifier contained exit success failure +syn keyword dTraitsIdentifier contained isAbstractClass isArithmetic +syn keyword dTraitsIdentifier contained isAssociativeArray isFinalClass +syn keyword dTraitsIdentifier contained isPOD isNested isFloating +syn keyword dTraitsIdentifier contained isIntegral isScalar isStaticArray +syn keyword dTraitsIdentifier contained isUnsigned isVirtualFunction +syn keyword dTraitsIdentifier contained isVirtualMethod isAbstractFunction +syn keyword dTraitsIdentifier contained isFinalFunction isStaticFunction +syn keyword dTraitsIdentifier contained isOverrideFunction isTemplate +syn keyword dTraitsIdentifier contained isRef isOut isLazy hasMember +syn keyword dTraitsIdentifier contained identifier getAliasThis +syn keyword dTraitsIdentifier contained getAttributes getFunctionAttributes getMember +syn keyword dTraitsIdentifier contained getOverloads getPointerBitmap getProtection +syn keyword dTraitsIdentifier contained getVirtualFunctions getVirtualIndex +syn keyword dTraitsIdentifier contained getVirtualMethods getUnitTests +syn keyword dTraitsIdentifier contained parent classInstanceSize allMembers +syn keyword dTraitsIdentifier contained derivedMembers isSame compiles +syn keyword dPragmaIdentifier contained inline lib mangle msg startaddress GNU_asm +syn keyword dExternIdentifier contained C C++ D Windows Pascal System Objective-C +syn keyword dAttribute contained safe trusted system +syn keyword dAttribute contained property disable nogc +syn keyword dVersionIdentifier contained DigitalMars GNU LDC SDC D_NET +syn keyword dVersionIdentifier contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha +syn keyword dVersionIdentifier contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64 +syn keyword dVersionIdentifier contained linux Posix OSX FreeBSD Windows Win32 Win64 +syn keyword dVersionIdentifier contained OpenBSD BSD Solaris AIX SkyOS SysV3 SysV4 Hurd +syn keyword dVersionIdentifier contained Cygwin MinGW +syn keyword dVersionIdentifier contained LittleEndian BigEndian +syn keyword dVersionIdentifier contained D_InlineAsm_X86 D_InlineAsm_X86_64 +syn keyword dVersionIdentifier contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC +syn keyword dVersionIdentifier contained unittest assert none all + +syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment + +" Highlight the sharpbang +syn match dSharpBang "\%^#!.*" display + +" Attributes/annotations +syn match dAnnotation "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>" contains=dAttribute + +" Version Identifiers +syn match dVersion "\" +syn match dVersion "\"he=s+7 contains=dVersionIdentifier + +" Scope Identifiers +syn match dStatement "\" +syn match dStatement "\"he=s+5 contains=dScopeIdentifier + +" Traits Statement +syn match dStatement "\<__traits\>" +syn match dStatement "\<__traits\s*([_a-zA-Z][_a-zA-Z0-9]*\>"he=s+8 contains=dTraitsIdentifier + +" Pragma Statement +syn match dPragma "\" +syn match dPragma "\"he=s+6 contains=dPragmaIdentifier + +" Necessary to highlight C++ in extern modifiers. +syn match dExternIdentifier "C\(++\)\?" contained + +" Extern Identifiers +syn match dExternal "\" +syn match dExtern "\"he=s+6 contains=dExternIdentifier + +" Make import a region to prevent highlighting keywords +syn region dImport start="\+ contained transparent contains=dNestAngleString,@Spell +syn region dNestCurlyString start=+{+ end=+}+ contained transparent contains=dNestCurlyString,@Spell + +" Nesting delimited strings +" +syn region dParenString matchgroup=dParenString start=+q"(+ end=+)"+ contains=dNestParenString,@Spell +syn region dBrackString matchgroup=dBrackString start=+q"\[+ end=+\]"+ contains=dNestBrackString,@Spell +syn region dAngleString matchgroup=dAngleString start=+q"<+ end=+>"+ contains=dNestAngleString,@Spell +syn region dCurlyString matchgroup=dCurlyString start=+q"{+ end=+}"+ contains=dNestCurlyString,@Spell + +hi link dParenString dNestString +hi link dBrackString dNestString +hi link dAngleString dNestString +hi link dCurlyString dNestString + +syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString + +" Token strings +" +syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens,dFormat +syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens,dFormat + +syn cluster dTokens add=dTokenString + +" Numbers +" +syn case ignore + +syn match dDec display "\<\d[0-9_]*\(u\=l\=\|l\=u\=\)\>" + +" Hex number +syn match dHex display "\<0x[0-9a-f_]\+\(u\=l\=\|l\=u\=\)\>" + +syn match dOctal display "\<0[0-7_]\+\(u\=l\=\|l\=u\=\)\>" +" flag an octal number with wrong digits +syn match dOctalError display "\<0[0-7_]*[89][0-9_]*" + +" binary numbers +syn match dBinary display "\<0b[01_]\+\(u\=l\=\|l\=u\=\)\>" + +"floating point without the dot +syn match dFloat display "\<\d[0-9_]*\(fi\=\|l\=i\)\>" +"floating point number, with dot, optional exponent +syn match dFloat display "\<\d[0-9_]*\.[0-9_]*\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=" +"floating point number, starting with a dot, optional exponent +syn match dFloat display "\(\.[0-9_]\+\)\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=\>" +"floating point number, without dot, with exponent +"syn match dFloat display "\<\d\+e[-+]\=\d\+[fl]\=\>" +syn match dFloat display "\<\d[0-9_]*e[-+]\=[0-9_]\+[fl]\=\>" + +"floating point without the dot +syn match dHexFloat display "\<0x[0-9a-f_]\+\(fi\=\|l\=i\)\>" +"floating point number, with dot, optional exponent +syn match dHexFloat display "\<0x[0-9a-f_]\+\.[0-9a-f_]*\(p[-+]\=[0-9_]\+\)\=[fl]\=i\=" +"floating point number, without dot, with exponent +syn match dHexFloat display "\<0x[0-9a-f_]\+p[-+]\=[0-9_]\+[fl]\=i\=\>" + +syn cluster dTokens add=dDec,dHex,dOctal,dOctalError,dBinary,dFloat,dHexFloat + +syn case match + +" Pragma (preprocessor) support +" TODO: Highlight following Integer and optional Filespec. +syn region dPragma start="#\s*\(line\>\)" skip="\\$" end="$" + +" Block +" +syn region dBlock start="{" end="}" transparent fold + + +" The default highlighting. +" +hi def link dBinary Number +hi def link dDec Number +hi def link dHex Number +hi def link dOctal Number +hi def link dFloat Float +hi def link dHexFloat Float +hi def link dDebug Debug +hi def link dBranch Conditional +hi def link dConditional Conditional +hi def link dLabel Label +hi def link dUserLabel Label +hi def link dRepeat Repeat +hi def link dExceptions Exception +hi def link dAssert Statement +hi def link dStatement Statement +hi def link dScopeDecl dStorageClass +hi def link dStorageClass StorageClass +hi def link dBoolean Boolean +hi def link dUnicode Special +hi def link dTokenStringBrack String +hi def link dHereString String +hi def link dNestString String +hi def link dDelimString String +hi def link dRawString String +hi def link dString String +hi def link dHexString String +hi def link dCharacter Character +hi def link dEscSequence SpecialChar +hi def link dFormat SpecialChar +hi def link dSpecialCharError Error +hi def link dOctalError Error +hi def link dOperator Operator +hi def link dOpOverload Identifier +hi def link dConstant Constant +hi def link dTypedef Typedef +hi def link dEnum Structure +hi def link dStructure Structure +hi def link dTodo Todo +hi def link dType Type +hi def link dLineComment Comment +hi def link dBlockComment Comment +hi def link dNestedComment Comment +hi def link ddocLineComment Comment +hi def link ddocBlockComment Comment +hi def link ddocNestedComment Comment +hi def link dCommentError Error +hi def link dNestedCommentError Error +hi def link dCommentStartError Error +hi def link dExternal Include +hi def link dAnnotation PreProc +hi def link dSharpBang PreProc +hi def link dAttribute StorageClass +hi def link dIdentifier Identifier +hi def link dVersion dStatement +hi def link dVersionIdentifier Identifier +hi def link dScopeIdentifier Identifier +hi def link dTraitsIdentifier Identifier +hi def link dPragma PreProc +hi def link dPragmaIdentifier Identifier +hi def link dExtern dExternal +hi def link dExternIdentifier Identifier + +" Marks contents of the asm statement body as special + +syn match dAsmStatement "\" +syn region dAsmBody start="asm[\n]*\s*{"hs=e+1 end="}"he=e-1 contains=dAsmStatement,dAsmOpCode,@dComment,DUserLabel + +hi def link dAsmBody dUnicode +hi def link dAsmStatement dStatement +hi def link dAsmOpCode Identifier + +syn keyword dAsmOpCode contained aaa aad aam aas +syn keyword dAsmOpCode contained add addpd addps addsd +syn keyword dAsmOpCode contained and andnpd andnps andpd +syn keyword dAsmOpCode contained arpl bound bsf bsr +syn keyword dAsmOpCode contained bt btc btr bts +syn keyword dAsmOpCode contained call bswap andps addss +syn keyword dAsmOpCode contained cbw cdq clc cld +syn keyword dAsmOpCode contained cli clts cmc cmova +syn keyword dAsmOpCode contained cmovb cmovbe cmovc cmove +syn keyword dAsmOpCode contained cmovge cmovl cmovle cmovna +syn keyword dAsmOpCode contained cmovnae cmovg cmovae clflush +syn keyword dAsmOpCode contained cmovnb cmovnbe cmovnc cmovne +syn keyword dAsmOpCode contained cmovnge cmovnl cmovnle cmovno +syn keyword dAsmOpCode contained cmovns cmovnz cmovo cmovp +syn keyword dAsmOpCode contained cmovpo cmovs cmovz cmp +syn keyword dAsmOpCode contained cmppd cmovpe cmovnp cmovng +syn keyword dAsmOpCode contained cmpps cmps cmpsb cmpsd +syn keyword dAsmOpCode contained cmpsw cmpxch8b cmpxchg comisd +syn keyword dAsmOpCode contained cpuid cvtdq2pd cvtdq2ps cvtpd2dq +syn keyword dAsmOpCode contained cvtpd2ps cvtpi2pd cvtpi2ps cvtps2dq +syn keyword dAsmOpCode contained cvtps2pd cvtpd2pi comiss cmpss +syn keyword dAsmOpCode contained cvtps2pi cvtsd2si cvtsd2ss cvtsi2sd +syn keyword dAsmOpCode contained cvtss2sd cvtss2si cvttpd2dq cvttpd2pi +syn keyword dAsmOpCode contained cvttps2pi cvttsd2si cvttss2si cwd +syn keyword dAsmOpCode contained da daa das db +syn keyword dAsmOpCode contained dd cwde cvttps2dq cvtsi2ss +syn keyword dAsmOpCode contained de dec df di +syn keyword dAsmOpCode contained divpd divps divsd divss +syn keyword dAsmOpCode contained dq ds dt dw +syn keyword dAsmOpCode contained enter f2xm1 fabs fadd +syn keyword dAsmOpCode contained faddp emms dl div +syn keyword dAsmOpCode contained fbld fbstp fchs fclex +syn keyword dAsmOpCode contained fcmovbe fcmove fcmovnb fcmovnbe +syn keyword dAsmOpCode contained fcmovnu fcmovu fcom fcomi +syn keyword dAsmOpCode contained fcomp fcompp fcos fdecstp +syn keyword dAsmOpCode contained fdisi fcomip fcmovne fcmovb +syn keyword dAsmOpCode contained fdiv fdivp fdivr fdivrp +syn keyword dAsmOpCode contained ffree fiadd ficom ficomp +syn keyword dAsmOpCode contained fidivr fild fimul fincstp +syn keyword dAsmOpCode contained fist fistp fisub fisubr +syn keyword dAsmOpCode contained fld finit fidiv feni +syn keyword dAsmOpCode contained fld1 fldcw fldenv fldl2e +syn keyword dAsmOpCode contained fldlg2 fldln2 fldpi fldz +syn keyword dAsmOpCode contained fmulp fnclex fndisi fneni +syn keyword dAsmOpCode contained fnop fnsave fnstcw fnstenv +syn keyword dAsmOpCode contained fnstsw fninit fmul fldl2t +syn keyword dAsmOpCode contained fpatan fprem fprem1 fptan +syn keyword dAsmOpCode contained frstor fsave fscale fsetpm +syn keyword dAsmOpCode contained fsincos fsqrt fst fstcw +syn keyword dAsmOpCode contained fstp fstsw fsub fsubp +syn keyword dAsmOpCode contained fsubr fstenv fsin frndint +syn keyword dAsmOpCode contained fsubrp ftst fucom fucomi +syn keyword dAsmOpCode contained fucomp fucompp fwait fxam +syn keyword dAsmOpCode contained fxrstor fxsave fxtract fyl2x +syn keyword dAsmOpCode contained hlt idiv imul in +syn keyword dAsmOpCode contained inc fyl2xp1 fxch fucomip +syn keyword dAsmOpCode contained ins insb insd insw +syn keyword dAsmOpCode contained into invd invlpg iret +syn keyword dAsmOpCode contained ja jae jb jbe +syn keyword dAsmOpCode contained jcxz je jecxz jg +syn keyword dAsmOpCode contained jge jc iretd int +syn keyword dAsmOpCode contained jl jle jmp jna +syn keyword dAsmOpCode contained jnb jnbe jnc jne +syn keyword dAsmOpCode contained jnge jnl jnle jno +syn keyword dAsmOpCode contained jns jnz jo jp +syn keyword dAsmOpCode contained jpe jnp jng jnae +syn keyword dAsmOpCode contained jpo js jz lahf +syn keyword dAsmOpCode contained ldmxcsr lds lea leave +syn keyword dAsmOpCode contained lfence lfs lgdt lgs +syn keyword dAsmOpCode contained lldt lmsw lock lods +syn keyword dAsmOpCode contained lodsb lidt les lar +syn keyword dAsmOpCode contained lodsd lodsw loop loope +syn keyword dAsmOpCode contained loopnz loopz lsl lss +syn keyword dAsmOpCode contained maskmovdqu maskmovq maxpd maxps +syn keyword dAsmOpCode contained maxss mfence minpd minps +syn keyword dAsmOpCode contained minsd maxsd ltr loopne +syn keyword dAsmOpCode contained minss mov movapd movaps +syn keyword dAsmOpCode contained movdq2q movdqa movdqu movhlps +syn keyword dAsmOpCode contained movhps movlhps movlpd movlps +syn keyword dAsmOpCode contained movmskps movntdq movnti movntpd +syn keyword dAsmOpCode contained movntps movmskpd movhpd movd +syn keyword dAsmOpCode contained movntq movq movq2dq movs +syn keyword dAsmOpCode contained movsd movss movsw movsx +syn keyword dAsmOpCode contained movups movzx mul mulpd +syn keyword dAsmOpCode contained mulsd mulss neg nop +syn keyword dAsmOpCode contained not mulps movupd movsb +syn keyword dAsmOpCode contained or orpd orps out +syn keyword dAsmOpCode contained outsb outsd outsw packssdw +syn keyword dAsmOpCode contained packuswb paddb paddd paddq +syn keyword dAsmOpCode contained paddsw paddusb paddusw paddw +syn keyword dAsmOpCode contained pand paddsb packsswb outs +syn keyword dAsmOpCode contained pandn pavgb pavgw pcmpeqb +syn keyword dAsmOpCode contained pcmpeqw pcmpgtb pcmpgtd pcmpgtw +syn keyword dAsmOpCode contained pinsrw pmaddwd pmaxsw pmaxub +syn keyword dAsmOpCode contained pminub pmovmskb pmulhuw pmulhw +syn keyword dAsmOpCode contained pmullw pminsw pextrw pcmpeqd +syn keyword dAsmOpCode contained pmuludq pop popa popad +syn keyword dAsmOpCode contained popfd por prefetchnta prefetcht0 +syn keyword dAsmOpCode contained prefetcht2 psadbw pshufd pshufhw +syn keyword dAsmOpCode contained pshufw pslld pslldq psllq +syn keyword dAsmOpCode contained psllw pshuflw prefetcht1 popf +syn keyword dAsmOpCode contained psrad psraw psrld psrldq +syn keyword dAsmOpCode contained psrlw psubb psubd psubq +syn keyword dAsmOpCode contained psubsw psubusb psubusw psubw +syn keyword dAsmOpCode contained punpckhdq punpckhqdq punpckhwd punpcklbw +syn keyword dAsmOpCode contained punpckldq punpckhbw psubsb psrlq +syn keyword dAsmOpCode contained punpcklqdq punpcklwd push pusha +syn keyword dAsmOpCode contained pushf pushfd pxor rcl +syn keyword dAsmOpCode contained rcpss rcr rdmsr rdpmc +syn keyword dAsmOpCode contained rep repe repne repnz +syn keyword dAsmOpCode contained repz rdtsc rcpps pushad +syn keyword dAsmOpCode contained ret retf rol ror +syn keyword dAsmOpCode contained rsqrtps rsqrtss sahf sal +syn keyword dAsmOpCode contained sbb scas scasb scasd +syn keyword dAsmOpCode contained seta setae setb setbe +syn keyword dAsmOpCode contained setc scasw sar rsm +syn keyword dAsmOpCode contained sete setg setge setl +syn keyword dAsmOpCode contained setna setnae setnb setnbe +syn keyword dAsmOpCode contained setne setng setnge setnl +syn keyword dAsmOpCode contained setno setnp setns setnz +syn keyword dAsmOpCode contained seto setnle setnc setle +syn keyword dAsmOpCode contained setp setpe setpo sets +syn keyword dAsmOpCode contained sfence sgdt shl shld +syn keyword dAsmOpCode contained shrd shufpd shufps sidt +syn keyword dAsmOpCode contained smsw sqrtpd sqrtps sqrtsd +syn keyword dAsmOpCode contained sqrtss sldt shr setz +syn keyword dAsmOpCode contained stc std sti stmxcsr +syn keyword dAsmOpCode contained stosb stosd stosw str +syn keyword dAsmOpCode contained subpd subps subsd subss +syn keyword dAsmOpCode contained sysexit test ucomisd ucomiss +syn keyword dAsmOpCode contained ud2 sysenter sub stos +syn keyword dAsmOpCode contained unpckhpd unpckhps unpcklpd unpcklps +syn keyword dAsmOpCode contained verw wbinvd wrmsr xadd +syn keyword dAsmOpCode contained xchg xlatb xor xorpd +syn keyword dAsmOpCode contained xorps pfrcpit1 pfmin movddup +syn keyword dAsmOpCode contained addsubpd addsubps fisttp haddps +syn keyword dAsmOpCode contained hsubpd hsubps lddqu monitor +syn keyword dAsmOpCode contained haddpd xlat wait verr +syn keyword dAsmOpCode contained movshdup movsldup mwait pfcmpeq +syn keyword dAsmOpCode contained pavgusb pf2id pfacc pfadd +syn keyword dAsmOpCode contained pfcmpge pfcmpgt pfmax pfmul +syn keyword dAsmOpCode contained pfnacc pfpnacc pfrcp pfrcpit1 +syn keyword dAsmOpCode contained pfrsqit1 pfrsqrt pfsub pfsubr +syn keyword dAsmOpCode contained pmulhrw pswapd syscall sysret +syn keyword dAsmOpCode contained vpmuldq xgetbv cmpxchg8b cmpxchg16b +syn keyword dAsmOpCode contained pabsb pabsd pabsw palignr +syn keyword dAsmOpCode contained phaddd phaddsw phaddw phsubd +syn keyword dAsmOpCode contained phsubsw phsubw pmaddubsw pmulhrsw +syn keyword dAsmOpCode contained pshufb psignb psignd psignw +syn keyword dAsmOpCode contained popfq pushfq blendpd blendps +syn keyword dAsmOpCode contained blendvpd blendvps extractps insertps +syn keyword dAsmOpCode contained movntdqa mpsadbw packusdw pblendvb +syn keyword dAsmOpCode contained pblendw pcmpeqq pextrb pextrd +syn keyword dAsmOpCode contained pextrq phminposuw pinsrb pinsrd +syn keyword dAsmOpCode contained pinsrq pmaxsb pmaxsd pmaxud +syn keyword dAsmOpCode contained pmaxuw pminsb pminsd pminud +syn keyword dAsmOpCode contained pminuw pmulld ptest roundpd +syn keyword dAsmOpCode contained roundps roundsd roundss pmuldq +syn keyword dAsmOpCode contained pmovsxbd pmovsxdq pmovzxbq pmovzxdq +syn keyword dAsmOpCode contained pmovsxbq pmovsxwd pmovzxbq pmovzxwd +syn keyword dAsmOpCode contained pmovsxbw pmovsxwq pmovzxbw pmovzxwq +syn keyword dAsmOpCode contained crc32 pcmpestri pcmpestrm pcmpgtq +syn keyword dAsmOpCode contained pcmpistri pcmpistrm popcnt pi2fd +syn keyword dAsmOpCode contained adc + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/syntax/dcov.vim b/syntax/dcov.vim new file mode 100644 index 0000000..e241fb3 --- /dev/null +++ b/syntax/dcov.vim @@ -0,0 +1,55 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +" Vim syntax file for coverage information for the reference compiler (DMD) of +" the D programming language. +" +" Language: dcov (dlang coverage testing output) +" Maintainer: Jesse Phillips +" Last Change: 2015-07-10 +" +" Contributors: +" - Joakim Brannstrom +" +" Please submit bugs/comments/suggestions to the github repo: +" https://github.com/JesseKPhillips/d.vim + +" Quit when a (custom) syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +" Provide highlight of D code. +runtime! syntax/d.vim +unlet b:current_syntax + +" Source lines +syn match dcovCode "^\s*|" +syn match dcovExecuted "^\s*\d\+|" +syn match dcovNotExecuted "^\s*0\+|" + +" Coverage statistic +" 0% is critical +" 1-39% is low +" 40-99 is partial +" 100% is complete +syn match dcovFile contained "^.\{-}\s\+\( is \)\@!" +syn match dcovPartial contained "\d\+% cov\w*" +syn match dcovFull contained "100% cov\w*" +syn match dcovLow contained "[1-3]\=\d\=% cov\w*" +syn match dcovNone contained "0% cov\w*" +syn match dcovStat "^\(.\{0,7}|\)\@!.*$" contains=dcovFull,dcovPartial,dcovNone,dcovFile,dcovLow + +" Define the default highlighting. +" Only used when an item doesn't have highlighting yet +hi def link dcovNotExecuted Constant +hi def link dcovExecuted Type +hi def link dcovCode Comment +hi def link dcovFull PreProc +hi def link dcovFile Identifier +hi def link dcovNone Error +hi def link dcovLow Operator +hi def link dcovPartial Structure + +let b:current_syntax = "dcov" diff --git a/syntax/dd.vim b/syntax/dd.vim new file mode 100644 index 0000000..ae682f5 --- /dev/null +++ b/syntax/dd.vim @@ -0,0 +1,5 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +runtime! /syntax/ddoc.vim diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim new file mode 100644 index 0000000..3c2860d --- /dev/null +++ b/syntax/ddoc.vim @@ -0,0 +1,86 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +if &filetype == "ddoc" + "ddoc file type + " Quit when a syntax file was already loaded + if exists("b:current_syntax") + finish + endif + + " Support cpoptions + let s:cpo_save = &cpo + set cpo&vim + + " Set the current syntax to be known as ddoc + let b:current_syntax = "ddoc" + + syn match ddocIdentifier "\$(\zs\a\w*\ze\_W*" display conceal contained + syn match ddocIdentifierDecl "^\s*\zs\a\w*\ze\s*=" display contained + syn region ddocDecl start="^\s*\a\w*\s*=" end="\(\n\_^\s*\_$\|\n^\s*\a\w*\s*=\)" transparent fold contains=ddocIdentifierDecl,ddocIdentifier + + "use html comment when fold method is marker + set commentstring= + + hi! def link ddocIdentifier Macro + hi! def link ddocIdentifierDecl Macro + + let &cpo = s:cpo_save + unlet s:cpo_save + +elseif &filetype == "dd" || &filetype == "d" && getline(1) =~ "^Ddoc" + "Ddoc source file or .d File begining with Ddoc + " Quit when a syntax file was already loaded + if exists("b:current_syntax") + finish + endif + + " Support cpoptions + let s:cpo_save = &cpo + set cpo&vim + " Set the current syntax to be known as ddoc + let b:current_syntax = "ddoc" + + syn match ddocKeyword "\%^Ddoc" display + syn keyword ddocKeyword MACROS contained + syn match ddocIdentifier "\$(\zs\a\w*\ze\_W*" display conceal + syn match ddocIdentifierDecl "^\s*\zs\a\w*\ze\s*=" display contained + "can slow down to much + "syn match ddocIdentifierDecl "\(^\s*MACROS:\s\+\)\@<=\zs\a\w*\ze\s*=" display contained + syn region ddocDecl start="^\s*MACROS:\_s\+" end="\%$" transparent fold contains=ddocKeyword,ddocIdentifierDecl,ddocIdentifier + + "use html comment when fold method is marker + set commentstring= + + " highlight only ddoc Identifiers + hi! def link ddocIdentifier Macro + hi! def link ddocIdentifierDecl Macro + hi! def link ddocKeyword Macro + let &cpo = s:cpo_save + unlet s:cpo_save + finish +elseif &filetype == "d" + "Ddoc inside comments + syn keyword ddocKeyword MACROS contained + syn match ddocIdentifier "\$(\zs\a\w*\ze\_W*" display contained conceal containedin=@ddocComment + + syn match ddocIdentifierBlockDecl "^\*\=\s*\a\w*\ze\s*=" display contained + "can slow down to much + "syn match ddocIdentifierBlockDecl "\(^*\=\s*MACROS:\s\+\)\@<=\zs\a\w*\ze\s*=" display contained + + syn region ddocBlockDecl start="^\*\=\s*\zsMACROS:\_s\+" end="\ze\*/" transparent fold contained containedin=ddocBlockComment contains=ddocKeyword,ddocIdentifierBlockDecl,ddocIdentifier + + syn match ddocIdentifierNestedDecl "^+\=\s*\a\w*\ze\s*=" display contained + "can slow down to much + "syn match ddocIdentifierNestedDecl "\(^+\=\s*MACROS:\s\+\)\@<=\zs\a\w*\ze\s*=" display contained + + syn region ddocNestedDecl start="^+\=\s*\zsMACROS:\_s\+" end="\ze+/" transparent fold contained containedin=ddocNestedComment contains=ddocKeyword,ddocIdentifierNestedDecl,ddocIdentifier + + "reset to default commentstring + set commentstring=/*%s*/ + hi! def link ddocIdentifier Macro + hi! def link ddocIdentifierBlockDecl Macro + hi! def link ddocIdentifierNestedDecl Macro + hi! def link ddocKeyword Macro +endif diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim new file mode 100644 index 0000000..f9ffc87 --- /dev/null +++ b/syntax/dsdl.vim @@ -0,0 +1,94 @@ +if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1 + finish +endif + +" Vim syntax file for DUB configurations." +" +" Language: SDLang (dub config) +" Maintainer: Jesse Phillips +" Last Change: 2015-07-11 +" +" Contributors: +" - Joakim Brannstrom +" +" Please submit bugs/comments/suggestions to the github repo: +" https://github.com/JesseKPhillips/d.vim + +" Quit when a (custom) syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +" General matchers +syn match dsdlAssign contained "=" +syn match dsdlAttribute "\w*\s*=" contains=dsdlAssign +syn match dsdlStatement "^\s*[a-zA-Z:]*" + +" Keyword grouping +syn keyword dsdlInfo name description copyright authors license +syn keyword dsdlStructure buildRequirements buildType configuration +syn keyword dsdlBoolean true false on off + +syn keyword dsdlTodo contained TODO FIXME XXX + +" dsdlCommentGroup allows adding matches for special things in comments +syn cluster dsdlCommentGroup contains=dsdlTodo + +" Highlight % items in strings. +syn match dsdlFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained + +" dsdlCppString: same as dsdlString, but ends at end of line +syn region dsdlString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,dsdlFormat,@Spell extend +syn region dsdlCppString start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,dsdlFormat,@Spell + +syn cluster dsdlStringGroup contains=dsdlCppString + +" Comments +syn region dsdlCommentL start="//" skip="\\$" end="$" keepend contains=@dsdlCommentGroup,cSpaceError,@Spell +syn region dsdlComment matchgroup=cCommentStart start="/\*" end="\*/" contains=@dsdlCommentGroup,dsdlCommentStartError,cSpaceError,@Spell fold extend +" keep a // comment separately, it terminates a preproc. conditional +syn match dsdlCommentError display "\*/" +syn match dsdlCommentStartError display "/\*"me=e-1 contained + +"integer number, or floating point number without a dot and with "f". +syn case ignore +syn match dsdlNumbers display transparent "\<\d\|\.\d" contains=dsdlNumber,dsdlFloat,cOctalError,dsdlOctal +" Same, but without octal error (for comments) +syn match dsdlNumbersCom display contained transparent "\<\d\|\.\d" contains=dsdlNumber,dsdlFloat,dsdlOctal +syn match dsdlNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>" +"hex number +syn match dsdlNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" +" Flag the first zero of an octal number as something special +syn match dsdlOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=dsdlOctalZero +syn match dsdlOctalZero display contained "\<0" +syn match dsdlFloat display contained "\d\+f" +"floating point number, with dot, optional exponent +syn match dsdlFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=" +"floating point number, starting with a dot, optional exponent +syn match dsdlFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" +"floating point number, without dot, with exponent +syn match dsdlFloat display contained "\d\+e[-+]\=\d\+[fl]\=\>" +syn case match + +" Define the default highlighting. +" Only used when an item doesn't have highlighting yet +hi def link dsdlInfo Constant +hi def link dsdlAssign Special +hi def link dsdlBoolean Boolean +hi def link dsdlFormat SpecialChar +hi def link dsdlCppString dsdlString +hi def link dsdlCommentL dsdlComment +hi def link dsdlNumber Number +hi def link dsdlOctal Number +hi def link dsdlOctalZero PreProc " link this to Error if you want +hi def link dsdlFloat Float +hi def link dsdlCommentError Error +hi def link dsdlCommentStartError Error +hi def link dsdlStructure Structure +hi def link dsdlString String +hi def link dsdlComment Comment +hi def link dsdlTodo Todo +hi def link dsdlStatement Statement +hi def link dsdlAttribute Tag + +let b:current_syntax = "dsdl"