Bruce/vim-nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to fit new version of nomsu and to be less buggy

Browse Source
This commit is contained in:
Bruce Hill 2017-09-20 04:39:41 -07:00
parent 866116004a
commit 9538b2983f
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indent/nomsu.vim
View File

@ -24,7 +24,7 @@ function! GetNomsuIndent()
let previous = getline(previousNum) let previous = getline(previousNum)
let ind = indent(previousNum) let ind = indent(previousNum)
if previous =~ ':$' || previous =~ '\.\.$' || previous =~ '(\.\.)$' || previous =~ '\[\.\.\]$' || previous =~ '"\.\."$' || previous =~ '#\.\..*$' if previous =~ ':$' || previous =~ '(\.\.)$' || previous =~ '\[\.\.\]$' || previous =~ '"\.\."$' || previous =~ '#\.\..*$'
let ind += &tabstop let ind += &tabstop
endif endif

79
syntax/nomsu.vim
View File

@ -9,62 +9,67 @@ endif
" Highlight long strings. " Highlight long strings.
syn sync minlines=100 syn sync minlines=100
"highlight String ctermbg=DarkBlue ctermfg=Black
" Regular strings
"
syn region nomsuInterp matchgroup=nomsuInterpDelim start=/\\/ end=/\\/ contained
\ contains=@nomsuAll
hi def link nomsuInterpDelim PreProc hi def link nomsuInterpDelim PreProc
syn region nomsuOneLineComment start=/#/ end=/$/ syn region nomsuOneLineComment start=/#\(\.\.\)\@!/ end=/$/
hi nomsuOneLineComment ctermfg=DarkBlue
hi def link nomsuOneLineComment Comment hi def link nomsuOneLineComment Comment
syn region nomsuComment start=/#\.\.[^\n]*$\n\(\s*\n\)*\z(\s\+\)\S/ skip=/^\%(\z1\S\|^\s*$\)/ end=/^\z1\@!.*/me=s-1 syn region nomsuComment start=/\(\n\z(\s*\)[^\n]*\)\@<=#\.\./ skip=/\n\s*$/ end=/\n\(\z1\s\)\@!/
hi nomsuComment ctermfg=DarkBlue
hi def link nomsuComment Comment hi def link nomsuComment Comment
syn region nomsuString1 start=/"\(\(\.\."\)\@!\|\.\."\s*|.*$\)/ skip=/\\\\\|\\"/ end=/"/
hi def link nomsuString1 String
syn region nomsuStringLine start=/"\.\."/ end=/$/ syn region nomsuShortString start=/\("\.\.\)\@<!"\(\.\."\)\@!/ skip=/\\\\\|\\"/ end=/"/
\ contains=nomsuInterp,nomsuStringLineStart,nomsuStringTrailingSpace,nomsuOneLineComment,nomsuComment hi nomsuShortString ctermfg=Magenta
hi def link nomsuStringLine String hi def link nomsuShortString String
syn match nomsuStringLineStart /\(^[ \t]*\|"\.\."\s*\)\@<=|/ contained
hi def link nomsuStringLineStart Delimiter
syn match nomsuStringTrailingSpace /[ \t]*$/ contained
hi nomsuStringTrailingSpace ctermbg=Magenta
syn region nomsuLongString start=/"\.\."[^\n]*$\n\(\s*\n\)*\z(\s\+\)\S/ skip=/^\%(\z1\S\|^\s*$\)/ end=/^\z1\@!.*/me=s-1 syn match nomsuLongStringStart /"\.\."/ contains=nomsuIndentor contained
\ contains=nomsuInterp,nomsuStringLineStart,nomsuStringTrailingSpace,nomsuOneLineComment,nomsuComment hi nomsuLongStringStart ctermfg=Yellow
hi def link nomsuLongString String syn match nomsuStringPipe /|/ contained
hi nomsuStringPipe ctermfg=DarkGray
hi def link nomsuStringPipe Special
syn region nomsuInterp matchgroup=nomsuInterpDelim start=/\\/ end=/\\/ contained
\ contains=@nomsuAll
syn region nomsuLongStringValue start=/\(|\)\@<=/ end=/\(\n\)\@=/ contained
\ contains=nomsuInterp
hi nomsuLongStringValue ctermbg=Black ctermfg=Gray
hi def link nomsuLongStringValue String
syn region nomsuLongStringFirstLine start=/\("\.\."\s*\)\@<=|/ end=/$/ contained
\ contains=nomsuStringPipe,nomsuLongStringValue
syn region nomsuLongStringLine start=/^\s\+|/ end=/$/ contained
\ contains=nomsuStringPipe,nomsuLongStringValue
syn region nomsuLongString start=/\(^\z(\s*\)[^\n]*\)\@<="\.\."/ skip=/^\s*$/ end=/^\(\z1\s\)\@!/
\ contains=nomsuLongStringStart,nomsuOneLineComment,nomsuComment,nomsuLongStringLine,nomsuLongStringFirstLine
syn match nomsuVar /\v\%[a-zA-Z0-9_'+*/^&$@-][a-zA-Z0-9_+*/^&$@-]*/
syn match nomsuVar /\v\%[a-zA-Z0-9`~!@^&*_+=|<>?'-][a-zA-Z0-9`~!@^&*_+=|<>?-]*/
hi nomsuVar ctermfg=Cyan
hi def link nomsuVar Identifier hi def link nomsuVar Identifier
syn match nomsuNumber /\v([a-zA-Z])@<!\d+\.\d+/
syn match nomsuNumber /\v([a-zA-Z])@<!\d+/ syn match nomsuWord /\v[a-zA-Z0-9`~!@^&*_+=|<>?'-][a-zA-Z0-9`~!@^&*_+=|<>?-]*/
hi def link nomsuWord Function
hi nomsuWord ctermfg=White
syn match nomsuNumber /-\?\d\+\(\.\(\d\+\)\?\)\?/
syn match nomsuNumber /-\?\.\d\+/
hi def link nomsuNumber Number hi def link nomsuNumber Number
syn match nomsuIndentor /\[\.\.\]/
syn match nomsuIndentor /(\.\.)/
syn match nomsuIndentor /\.\.\s*$/
syn match nomsuIndentor /^\s*\.\./
hi def link nomsuIndentor Special
syn match nomsuIndentor /\.\./ syn match nomsuIndentor /\.\./
hi def link nomsuIndentor Delimiter hi def link nomsuIndentor Special
hi nomsuIndentor ctermfg=DarkGray
syn match nomsuComma /,/ syn match nomsuDelim /[,()\[\]]/
hi def link nomsuComma Delimiter hi nomsuDelim ctermfg=Yellow
hi def link nomsuDelim Delimiter
syn match nomsuThunk /:/ syn match nomsuThunk /:/
hi nomsuThunk ctermfg=Yellow
hi def link nomsuThunk Structure hi def link nomsuThunk Structure
syn match nomsuToken /\v(\%)@<!\%[a-zA-Z_'+*/^&$@#-][a-zA-Z0-9_+*/^&$@#-]*/ syn cluster nomsuAll contains=nomsuShortString,nomsuLongString,nomsuComment,nomsuOneLineComment,
hi def link nomsuToken Function \ nomsuVar,nomsuNumber,nomsuDelim,nomsuThunk,nomsuIndentor,nomsuWord
syn cluster nomsuAll contains=nomsuString1,nomsuLongString,nomsuComment,
\ nomsuVar,nomsuNumber,nomsuComma,nomsuThunk,nomsuIndentor,nomsuToken
if !exists('b:current_syntax') if !exists('b:current_syntax')
let b:current_syntax = 'nomsu' let b:current_syntax = 'nomsu'