plugin/gist.vim plugin/scratch.vim plugin/visSum.vim syntax/mkd.vim @@ -1,7 +1,5 @@ " camron flanders // macvim -" last edit: 09/29/08:CBF -" last upload: 10/27/2008 -" automatically uploaded from my macbookpro each monday at noon. +" last update: 05/21/09:CBF " this is my primary, day-to-day, preferred .vimrc tuned for macvim. " I do not publish any of my other .vimrcs which I use for windows gvim @@ -30,8 +28,8 @@ source macros/matchit.vim silent execute '!rm -f ~/temp/vim_backups/*' set bk "backup, just incase -set backupdir=/Users/camflan/temp/vim_backups/ "where to put those backups -set directory=/Users/camflan/temp/vim_backups/ "this is for swp files +set backupdir=$HOME/temp/vim_backups/ "where to put those backups +set directory=$HOME/temp/vim_backups/ "this is for swp files "}}} "file type settings, on {{{ @@ -60,12 +58,12 @@ set tags=./tags,tags; "set tags for filetype {{{ autocmd FileType python - \ set tags+=/Users/camflan/.vim/tags/python.ctags; + \ set tags+=$HOME/.vim/tags/python.ctags; autocmd FileType javascript - \ set tags+=/Users/camflan/work/scripts/generic_functions/common/tags; | - \ set tags+=/Users/camflan/work/scripts/generic_functions/6.x/tags; | - \ set tags+=/Users/camflan/work/scripts/generic_functions/5.x/tags; + \ set tags+=$HOME/work/scripts/generic_functions/common/tags; | + \ set tags+=$HOME/work/scripts/generic_functions/6.x/tags; | + \ set tags+=$HOME/work/scripts/generic_functions/5.x/tags; au FileType javascript setl foldtext=FoldText() "}}} @@ -79,7 +77,7 @@ set showmatch "show me whe set ruler "show me the ruler! set rulerformat=%35(%5l,%-6(%c%V%)\ %5L\ %P%) "my ruler shows: line/vColumn/total/pos " set guifont=Consolas:h11 "the best thing to come out of Redmond -set guifont=Espresso\ Mono:h11 +" set guifont=Espresso\ Mono:h11 "for that change of pace. set history=100 "keep last 100 commands set sc "show commands as I type set anti "make text pretty @@ -117,9 +115,9 @@ endif "}}} "cursor options {{{ -set gcr=a:blinkwait500-blinkon1300-blinkoff150 "tune the blinking of the cursor, short on, long off. -set gcr=i:hor10 "underline cursor. not too thick not too thin. goldielocks style -set gcr=v:block "selecting should cover the text +"set gcr=a:blinkwait500-blinkon1300-blinkoff150 "tune the blinking of the cursor, short on, long off. +"set gcr=i:hor10 "underline cursor. not too thick not too thin. goldielocks style +"set gcr=v:block "selecting should cover the text "}}} "tab stuff {{{ @@ -166,6 +164,15 @@ let Tlist_Ctags_Cmd = "/usr/local/bin/ctags" "gotta tell "let g:TabIndentStyle = 3 "}}} +"Gist options {{{ +let g:gist_clip_command = 'pbcopy' +let g:gist_detect_filetype = 1 +let g:gist_open_browser_after_post = 1 + +let g:github_user = "camflan" +let g:github_token = "897b6a6109e0de41cdb13f391ba62ea2" + +"}}} "}}} "omnicomplete setup {{{ @@ -281,8 +288,8 @@ map EE :NERDTreeToggle<CR> ".vimrc editing maps {{{ "makes it easy to edit/reload vimrc for tweaks. I like to tweak. -:nmap ,s :source /Users/camflan/.vimrc<CR> -:nmap ,v :tabe /Users/camflan/.vimrc<CR> +:nmap <leader>s :!source $HOME/.vimrc<CR> +:nmap ,v :tabe $HOME/.vimrc<CR> "}}} "iScript imaps {{{ @@ -372,6 +379,9 @@ map! ii <C-[> " easily, temporarily disable search highlighting" nmap <silent> <leader>n :silent :nohlsearch<CR> +" toggle a scratch buffer, in a split +map ,s :call ToggleScratch()<CR> + "}}} "expansions {{{ @@ -379,8 +389,6 @@ nmap <silent> <leader>n :silent :nohlsearch<CR> imap <leader>fd <C-R>=expand("%:p:h")<CR> " present working dir imap <leader>pwd <C-R>=getcwd()<CR> -" date and name ie 05/11/07:CBF -imap <leader>ts <C-R>=strftime("%m/%d/%y:CBF")<CR> "}}} "django mappings {{{ @@ -413,7 +421,7 @@ function SetToJS() "}}} "simply writes the script to my VM so I can run it {{{ function Write_script() - let fname = '/Users/camflan/Documents/Parallels/Windows\ XP\ Professional/Windows\ Disks/C/inserver6/script/vim.js' + let fname = '$HOME/Documents/Parallels/Windows\ XP\ Professional/Windows\ Disks/C/inserver6/script/vim.js' exec ":w! " . fname :endfunction "}}} @@ -468,6 +476,15 @@ function! FoldText() return substitute(getline(v:foldstart), '{.*', ' {...} ', '') endfunction "}}} +"Toggle Scratch Buffer {{{ +function! ToggleScratch() + if expand('%') == g:ScratchBufferName + quit + else + Sscratch + endif +endfunction +"}}} "}}} dotvimrc @@ -1,3 +1,8 @@ " JavaScript, ECMAScript au BufNewFile,BufRead *.js,*.javascript,*.jsh,*.es setf javascript + +" iScript log files au BufNewFile,BufRead *.log setf log + +" markdown +au BufNewFile,BufRead *.mkd,*.markdown setf mkd filetype.vim @@ -1,14 +1,13 @@ " Vim syntax file -" Language: JavaScript/iScript -" Maintainer: Camron Flanders -" Last Change: 03/27/08:CBF -" based on javascript syntax, modified for iScript -" $Revision: 2270 $ - -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -" tuning parameters: -" unlet javaScript_fold +" Language: JavaScript +" Maintainer: Yi Zhao (ZHAOYI) <zzlinux AT hotmail DOT com> +" Last Change: Nov 17, 2007 +" Version: 0.7.6 +" Changes: Update the 'syntax sync' method to improve the performance +" with larget Javascript files. +" +" TODO: +" - Add the HTML syntax inside the JSDoc if !exists("main_syntax") if version < 600 @@ -19,74 +18,180 @@ if !exists("main_syntax") let main_syntax = 'javascript' endif -" Drop fold if it set but vim doesn't support it. -if version < 600 && exists("javaScript_fold") - unlet javaScript_fold +"" Drop fold if it set but VIM doesn't support it. +let b:javascript_fold='true' +if version < 600 " Don't support the old version + unlet! b:javascript_fold endif -syn case ignore - - -syn keyword javaScriptCommentTodo TODO FIXME XXX TBD contained -syn match javaScriptLineComment "\/\/.*" contains=@Spell,javaScriptCommentTodo -syn match javaScriptCommentSkip "^[ \t]*\*\($\|[ \t]\+\)" -syn region javaScriptComment start="/\*" end="\*/" contains=@Spell,javaScriptCommentTodo -syn match javaScriptSpecial "\\\d\d\d\|\\." -syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc -syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc - -syn match javaScriptSpecialCharacter "'\\.'" -syn match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>" -syn region javaScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline - -syn keyword iScriptObjects INDocument INWfItem INWfQueue INLogicalObject INClassProp INDocManager INDocPriv INDocType INDocTypeList INDrawer INFont INInstanceProp INKeys INLogicalObject INMail INPriv INPrivEnum INProperty INSubObject INSubobPriv INSubobTemplate INUser INVersion INWfAdmin INWfQueuePriv INWorksheet INWsDataDef INWsPresentation - -syn keyword iScriptObjProps id drawer folder tab f3 f4 f5 docTypeName name objectId logobCount -syn match iScriptMethods "\..\{-}\>" -syn match iScriptSyms "[\&\|\^\%\$\#\@\!\*\+\=\_\-<>]" -syn match iScriptArray "\<\w\{-}\[.\{-}\]" - -syn keyword ToDo define link -syn keyword javaScriptConditional if else switch -syn keyword javaScriptRepeat while for do in -syn keyword javaScriptBranch break continue -syn keyword javaScriptOperator new delete instanceof typeof -syn keyword javaScriptType Array Boolean Date Function Number Object String RegExp -syn keyword javaScriptStatement return with -"syn keyword javaScriptBoolean true false -syn keyword javaScriptNull null undefined -syn keyword javaScriptIdentifier arguments this var -syn keyword javaScriptLabel case default -syn keyword javaScriptException try catch finally throw -syn keyword javaScriptMessage alert confirm prompt status -syn keyword javaScriptGlobal self window top parent -syn keyword javaScriptMember document event location -syn keyword javaScriptDeprecated escape unescape -syn keyword javaScriptReserved abstract boolean byte char class const debugger double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile - -syn keyword True true True -syn keyword False false False - -if exists("javaScript_fold") - syn match javaScriptFunction "\<function\>" - syn region javaScriptFunctionFold start="\<function\>.*[^};]$" end="^\z1}.*$" transparent fold keepend - - syn sync match javaScriptSync grouphere javaScriptFunctionFold "\<function\>" - syn sync match javaScriptSync grouphere NONE "^}" - - setlocal foldmethod=syntax - setlocal foldtext=getline(v:foldstart) -else - syn keyword javaScriptFunction function - syn match javaScriptBraces "[{}\[\]]" - syn match javaScriptParens "[()]" -endif +"" dollar sigh is permittd anywhere in an identifier +setlocal iskeyword+=$ + +syntax sync fromstart + +""syn case ignore + +"" JavaScript comment +syntax keyword javaScriptCommentTodo TODO FIXME XXX TBD contained +syntax region javaScriptLineComment start=+\/\/+ end=+$+ keepend contains=javaScriptCommentTodo,@Spell +syntax region javaScriptLineComment start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=javaScriptCommentTodo,@Spell fold +syntax region javaScriptCvsTag start="\$\cid:" end="\$" oneline contained +syntax region javaScriptComment start="/\*" end="\*/" contains=javaScriptCommentTodo,javaScriptCvsTag,@Spell fold + +"" JSDoc support start +if !exists("javascript_ignore_javaScriptdoc") + syntax case ignore + + "" syntax coloring for javadoc comments (HTML) + "syntax include @javaHtml <sfile>:p:h/html.vim + "unlet b:current_syntax + + syntax region javaScriptDocComment matchgroup=javaScriptComment start="/\*\*\s*$" end="\*/" contains=javaScriptDocTags,javaScriptCommentTodo,javaScriptCvsTag,@javaScriptHtml,@Spell fold + syntax match javaScriptDocTags contained "@\(param\|argument\|requires\|exception\|throws\|type\|class\|extends\|see\|link\|member\|module\|method\|title\|namespace\|optional\|default\|base\|file\)\>" nextgroup=javaScriptDocParam,javaScriptDocSeeTag skipwhite + syntax match javaScriptDocTags contained "@\(beta\|deprecated\|description\|fileoverview\|author\|license\|version\|returns\=\|constructor\|private\|protected\|final\|ignore\|addon\|exec\)\>" + syntax match javaScriptDocParam contained "\%(#\|\w\|\.\|:\|\/\)\+" + syntax region javaScriptDocSeeTag contained matchgroup=javaScriptDocSeeTag start="{" end="}" contains=javaScriptDocTags + + syntax case match +endif "" JSDoc end + +syntax case match + +"" Syntax in the JavaScript code +syntax match javaScriptSpecial "\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\." +syntax region javaScriptStringD start=+"+ skip=+\\\\\|\\$"+ end=+"+ contains=javaScriptSpecial,@htmlPreproc +syntax region javaScriptStringS start=+'+ skip=+\\\\\|\\$'+ end=+'+ contains=javaScriptSpecial,@htmlPreproc +syntax region javaScriptRegexpString start=+/\(\*\|/\)\@!+ skip=+\\\\\|\\/+ end=+/[gim]\{,3}+ contains=javaScriptSpecial,@htmlPreproc oneline +syntax match javaScriptNumber /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/ +syntax match javaScriptFloat /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/ +syntax match javaScriptLabel /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/ + +"" JavaScript Prototype +syntax keyword javaScriptPrototype prototype + +"" Programm Keywords +syntax keyword javaScriptSource import export +syntax keyword javaScriptType const this var void yield +syntax keyword javaScriptOperator delete new in instanceof let typeof +"syntax keyword javaScriptBoolean true false +syntax keyword javaScriptNull null + +"" Statement Keywords +syntax keyword javaScriptConditional if else +syntax keyword javaScriptRepeat do while for +syntax keyword javaScriptBranch break continue switch case default return +syntax keyword javaScriptStatement try catch throw with finally + +syntax keyword javaScriptGlobalObjects Array Boolean Date Function Infinity JavaArray JavaClass JavaObject JavaPackage Math Number NaN Object Packages RegExp String Undefined java netscape sun + +syntax keyword javaScriptExceptions Error EvalError RangeError ReferenceError SyntaxError TypeError URIError + +syntax keyword javaScriptFutureKeys abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public + +syntax keyword iScriptObjects INDocument INWfItem INWfQueue INLogicalObject INClassProp INDocManager INDocPriv INDocType INDocTypeList INDrawer INFont INInstanceProp INKeys INLogicalObject INMail INPriv INPrivEnum INProperty INSubObject INSubobPriv INSubobTemplate INUser INVersion INWfAdmin INWfQueuePriv INWorksheet INWsDataDef INWsPresentation +syntax keyword iScriptObjProps id drawer folder tab f3 f4 f5 docTypeName name objectId logobCount + +syntax keyword ToDo define link +syntax keyword True true True +syntax keyword False false False -syn sync fromstart -syn sync maxlines=100 +syntax match iScriptMethods "\..\{-}\>" +syntax match iScriptSyms "[\&\|\^\%\$\#\@\!\*\+\=\_\-<>]" +syntax match iScriptArray "\<\w\{-}\[.\{-}\]" + +"" DOM/HTML/CSS specified things + + " DOM2 Objects + syntax keyword javaScriptGlobalObjects DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction + syntax keyword javaScriptExceptions DOMException + + " DOM2 CONSTANT + syntax keyword javaScriptDomErrNo INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR + syntax keyword javaScriptDomNodeConsts ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE + + " HTML events and internal variables + syntax case ignore + syntax keyword javaScriptHtmlEvents onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize + syntax case match + +" Follow stuff should be highligh within a special context +" While it can't be handled with context depended with Regex based highlight +" So, turn it off by default +if exists("javascript_enable_domhtmlcss") + + " DOM2 things + syntax match javaScriptDomElemAttrs contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/ + syntax match javaScriptDomElemFuncs contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=javaScriptParen skipwhite + " HTML things + syntax match javaScriptHtmlElemAttrs contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/ + syntax match javaScriptHtmlElemFuncs contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=javaScriptParen skipwhite + + " CSS Styles in JavaScript + syntax keyword javaScriptCssStyles contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition + syntax keyword javaScriptCssStyles contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition + syntax keyword javaScriptCssStyles contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode + syntax keyword javaScriptCssStyles contained bottom height left position right top width zIndex + syntax keyword javaScriptCssStyles contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout + syntax keyword javaScriptCssStyles contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop + syntax keyword javaScriptCssStyles contained listStyle listStyleImage listStylePosition listStyleType + syntax keyword javaScriptCssStyles contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat + syntax keyword javaScriptCssStyles contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType + syntax keyword javaScriptCssStyles contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText + syntax keyword javaScriptCssStyles contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor + + " Highlight ways + syntax match javaScriptDotNotation "\." nextgroup=javaScriptPrototype,javaScriptDomElemAttrs,javaScriptDomElemFuncs,javaScriptHtmlElemAttrs,javaScriptHtmlElemFuncs + syntax match javaScriptDotNotation "\.style\." nextgroup=javaScriptCssStyles + +endif "DOM/HTML/CSS + +"" end DOM/HTML/CSS specified things + + +"" Code blocks +syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptLabel,javaScriptSource,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFunction,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptGlobalObjects,javaScriptExceptions,javaScriptFutureKeys,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation +syntax region javaScriptBracket matchgroup=javaScriptBracket transparent start="\[" end="\]" contains=@javaScriptAll,javaScriptParensErrB,javaScriptParensErrC,javaScriptBracket,javaScriptParen,javaScriptBlock,@htmlPreproc +syntax region javaScriptParen matchgroup=javaScriptParen transparent start="(" end=")" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrC,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc +syntax region javaScriptBlock matchgroup=javaScriptBlock transparent start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock,@htmlPreproc + +"" catch errors caused by wrong parenthesis +syntax match javaScriptParensError ")\|}\|\]" +syntax match javaScriptParensErrA contained "\]" +syntax match javaScriptParensErrB contained ")" +syntax match javaScriptParensErrC contained "}" if main_syntax == "javascript" - syn sync ccomment javaScriptComment + syntax sync clear + syntax sync ccomment javaScriptComment minlines=200 + syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/ +endif + +"" Fold control +if exists("b:javascript_fold") + syn region myFold start="{" end="}" transparent fold + syn sync fromstart + set foldmethod=syntax + set foldtext=getline(v:foldstart) + syn sync maxlines=100 + + "" + "" syntax match javaScriptFunction /\<function\>/ nextgroup=javaScriptFuncName skipwhite + "" syntax match javaScriptOpAssign /=\@<!=/ nextgroup=javaScriptFuncBlock skipwhite skipempty + "" syntax region javaScriptFuncName contained matchgroup=javaScriptFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=javaScriptLineComment,javaScriptComment nextgroup=javaScriptFuncBlock skipwhite skipempty + "" syntax region javaScriptFuncBlock contained matchgroup=javaScriptFuncBlock start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock fold + "" + "" if &l:filetype=='javascript' && !&diff + "" " Fold setting + "" " Redefine the foldtext (to show a JS function outline) and foldlevel + "" " only if the entire buffer is JavaScript, but not if JavaScript syntax + "" " is embedded in another syntax (e.g. HTML). + "" setlocal foldmethod=syntax + "" setlocal foldlevel=4 + "" endif + ""else + "" syntax keyword javaScriptFunction function + "" setlocal foldmethod< + "" setlocal foldlevel< endif " Define the default highlighting. @@ -99,52 +204,68 @@ if version >= 508 || !exists("did_javascript_syn_inits") else command -nargs=+ HiLink hi def link <args> endif - HiLink iScriptObjProps LineNr - HiLink iScriptSyms LineNr - HiLink javaScrParenError javaScriptError - HiLink javaScriptBoolean Boolean - HiLink javaScriptBraces LineNr - HiLink javaScriptBranch Conditional - HiLink javaScriptCharacter Character - HiLink javaScriptComment Comment - HiLink javaScriptCommentTodo Todo - HiLink javaScriptConditional Conditional - HiLink javaScriptError Error - HiLink javaScriptFunction Function - HiLink javaScriptLineComment Comment - HiLink javaScriptNull Keyword - HiLink javaScriptNumber Number - HiLink javaScriptOperator Operator - HiLink javaScriptParens LineNr - HiLink javaScriptRegexpString String - HiLink javaScriptRepeat Repeat - HiLink javaScriptSpecial Special - HiLink javaScriptSpecialCharacter javaScriptSpecial - HiLink javaScriptStatement Statement - HiLink javaScriptStringD String - HiLink javaScriptStringS Identifier - HiLink javaScriptType Type + + HiLink iScriptObjProps LineNr + HiLink iScriptSyms LineNr HiLink iScriptArray javaScriptArray + HiLink iScriptMethods Delimiter + HiLink iScriptObjects pythonExClass - HiLink iScriptMethods Delimiter - HiLink iScriptObjects pythonExClass - HiLink javaScriptConstant Label - HiLink javaScriptDebug Debug - HiLink javaScriptDeprecated Exception - HiLink javaScriptException Exception - HiLink javaScriptGlobal Keyword - HiLink javaScriptIdentifier Identifier - HiLink javaScriptLabel Label - HiLink javaScriptMember Keyword - HiLink javaScriptMessage Keyword - HiLink javaScriptReserved Keyword + HiLink javaScriptBoolean Boolean + HiLink javaScriptBranch Conditional + HiLink javaScriptCharacter Character + HiLink javaScriptComment Comment + HiLink javaScriptCommentTodo Todo + HiLink javaScriptConditional Conditional + HiLink javaScriptCssStyles Label + HiLink javaScriptCvsTag Function + HiLink javaScriptDocComment Comment + HiLink javaScriptDocParam Function + HiLink javaScriptDocSeeTag Function + HiLink javaScriptDocTags Special + HiLink javaScriptDomElemAttrs Label + HiLink javaScriptDomElemFuncs PreProc + HiLink javaScriptDomErrNo Constant + HiLink javaScriptDomNodeConsts Constant + HiLink javaScriptError Error + HiLink javaScriptExceptions Special + HiLink javaScriptFloat Number + HiLink javaScriptFunction Function + HiLink javaScriptGlobalObjects Special + HiLink javaScriptHtmlElemAttrs Label + HiLink javaScriptHtmlElemFuncs PreProc + HiLink javaScriptHtmlEvents Special + HiLink javaScriptLabel Label + HiLink javaScriptLineComment Comment + HiLink javaScriptNull Type + HiLink javaScriptNumber Number + HiLink javaScriptOperator Operator + HiLink javaScriptParensErrA Error + HiLink javaScriptParensErrB Error + HiLink javaScriptParensErrC Error + HiLink javaScriptParensError Error + HiLink javaScriptPrototype Type + HiLink javaScriptRegexpString String + HiLink javaScriptRepeat Repeat + HiLink javaScriptSource Special + HiLink javaScriptSpecial Special + HiLink javaScriptStatement Statement + HiLink javaScriptStringD String + HiLink javaScriptStringS String + HiLink javaScriptType Type delcommand HiLink endif +" Define the htmlJavaScript for HTML syntax html.vim +"syntax clear htmlJavaScript +"syntax clear javaScriptExpression +syntax cluster htmlJavaScript contains=@javaScriptAll,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError +syntax cluster javaScriptExpression contains=@javaScriptAll,javaScriptBracket,javaScriptParen,javaScriptBlock,javaScriptParenError,@htmlPreproc + let b:current_syntax = "javascript" if main_syntax == 'javascript' unlet main_syntax endif -" vim: ts=8 +" vim: ts=4 syntax/javascript.vim cc622dd12973b92272259002c0eb4c6cbd84a398 Camron Flanders camron.flanders@gmail.com http://github.com/camflan/dotvim/commit/ade9bcf45d58b82b9f9eb7d549c0d8d797f6ad38 ade9bcf45d58b82b9f9eb7d549c0d8d797f6ad38 2009-06-25T08:23:03-07:00 2009-06-25T08:23:03-07:00 pushing mods a6bb5c71f03b09b9ce2a5199a5d93b7a9e472ef8 Camron Flanders camron.flanders@gmail.com