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

Updates to keep up with the language

Browse Source
This commit is contained in:
Bruce Hill 2019-04-06 13:20:57 -07:00
parent 757fc306a0
commit 82559ecbef
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indent/nomsu.vim
View File

@ -10,7 +10,7 @@ let b:did_indent = 1
setlocal autoindent setlocal autoindent
setlocal indentexpr=GetNomsuIndent() setlocal indentexpr=GetNomsuIndent()
setlocal indentkeys+=0],0),1) setlocal indentkeys+=0],0),1),1.
" Only define the function once. " Only define the function once.
if exists("*GetNomsuIndent") if exists("*GetNomsuIndent")
@ -30,7 +30,7 @@ function! GetNomsuIndent()
endif endif
" TODO: dedent to matching parens, don't just dedent once " TODO: dedent to matching parens, don't just dedent once
if line =~ '^\s*\%([\])}]\|")\)' if line =~ '^\s*\%([\])}]\|")\|\.\.\)'
"let ind -= &tabstop "let ind -= &tabstop
return current_ind - &tabstop return current_ind - &tabstop
endif endif

11
syntax/nomsu.vim
View File

@ -15,9 +15,6 @@ hi nomsuInterpDelim ctermfg=Gray
"syn region nomsuOneLineComment start=/#/ end=/$/ "syn region nomsuOneLineComment start=/#/ end=/$/
"hi nomsuOneLineComment ctermfg=DarkBlue "hi nomsuOneLineComment ctermfg=DarkBlue
"hi def link nomsuOneLineComment Comment "hi def link nomsuOneLineComment Comment
syn region nomsuComment start=/\%(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\%(\z1\s\)\@!/
hi nomsuComment ctermfg=DarkBlue
hi def link nomsuComment Comment
syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll
hi nomsuList ctermfg=Blue hi nomsuList ctermfg=Blue
@ -70,14 +67,14 @@ hi nomsuVarParens ctermfg=LightCyan
syn match nomsuWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ syn match nomsuWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/
hi def link nomsuWord Function hi def link nomsuWord Function
hi nomsuWord ctermfg=White hi nomsuWord ctermfg=White
syn match nomsuOpWord ;[`~!@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; syn match nomsuOpWord ;[`~!|%#@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#;
hi def link nomsuOpWord Function hi def link nomsuOpWord Function
hi nomsuOpWord ctermfg=LightYellow hi nomsuOpWord ctermfg=LightYellow
syn match nomsuVarWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained syn match nomsuVarWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained
hi def link nomsuVarWord Function hi def link nomsuVarWord Function
hi nomsuVarWord ctermfg=LightCyan hi nomsuVarWord ctermfg=LightCyan
syn match nomsuVarOpWord ;[`~!@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; contained syn match nomsuVarOpWord ;[`~!|%#@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; contained
hi def link nomsuVarOpWord Function hi def link nomsuVarOpWord Function
hi nomsuVarOpWord ctermfg=LightCyan hi nomsuVarOpWord ctermfg=LightCyan
@ -112,6 +109,10 @@ syn match nomsuSemicolon /;/
hi nomsuSemicolon ctermfg=Blue hi nomsuSemicolon ctermfg=Blue
hi def link nomsuSemicolon Delimiter hi def link nomsuSemicolon Delimiter
syn region nomsuComment start=/\%(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\%(\z1\s\)\@!/
hi nomsuComment ctermfg=DarkBlue
hi def link nomsuComment Comment
syn cluster nomsuExpr contains=nomsuParenGroup,nomsuText,nomsuIndentedText,nomsuVar, syn cluster nomsuExpr contains=nomsuParenGroup,nomsuText,nomsuIndentedText,nomsuVar,
\nomsuActionVar,nomsuNumber,nomsuDict,nomsuList,nomsuIndentedBlock \nomsuActionVar,nomsuNumber,nomsuDict,nomsuList,nomsuIndentedBlock