Skip to content

Indent #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2017
Merged

Indent #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2618f1
indent class and remove '|' from operator characters
Aug 22, 2017
1b212ed
indent pattern guards
Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions indent/purescript.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,16 @@ function! GetPurescriptIndent()
endif

let s = match(prevline, '[[:alnum:][:blank:]]\@<=|[[:alnum:][:blank:]$]')
if s >= 0 && index(s:GetSynStack(v:lnum - 1, s), "purescriptFunctionDecl") == -1
" ident pattern quards but not if we are in a type declaration
if s >= 0 && prevline !~ '^class\>' && index(s:GetSynStack(v:lnum - 1, s), "purescriptFunctionDecl") == -1
" ident pattern guards but not if we are in a type declaration
" what we detect using syntax groups
return s
if prevline =~ '|\s*otherwise\>'
return indent(search('^\s*\k', 'bnW'))
" somehow this pattern does not work :/
" return indent(search('^\(\s*|\)\@!', 'bnW'))
else
return s
endif
endif

let s = match(line, '\%(\\.\{-}\)\@<=->')
Expand Down Expand Up @@ -165,10 +171,10 @@ function! GetPurescriptIndent()
endif
endif

if prevline =~ '[!#$%&*+./<>?@\\^|~-]\s*$'
if prevline =~ '[!#$%&*+./<>?@\\^~-]\s*$'
let s = match(prevline, '=')
if s > 0
return s + 2
return s + &l:shiftwidth
endif

let s = match(prevline, '\<:\>')
Expand Down Expand Up @@ -223,6 +229,10 @@ function! GetPurescriptIndent()
return match(prevline, '\S') + (line !~ '^\s*[})]]' ? 0 : &l:shiftwidth)
endif

if prevline =~ '^class'
return &l:shiftwidth
endif

let s = match(prevline, '\<where\>\s*$')
if s >= 0 && index(s:GetSynStack(v:lnum - 1, s), 'purescriptString') == -1
return match(prevline, '\S') + g:purescript_indent_where
Expand Down