Skip to content

Improve do-notation indentation #26

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
itchyny merged 4 commits into from
Oct 26, 2024
Merged

Improve do-notation indentation #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1538c2
improve do-notation
Futarimiti Aug 3, 2024
b86e9a2
add tests for do-notation with first stmt on the same line
Futarimiti Aug 4, 2024
98d100d
update date of last change
Futarimiti Aug 4, 2024
90b2807
Merge branch 'master' into patch-3
itchyny Oct 26, 2024
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
4 changes: 4 additions & 0 deletions indent/haskell.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ function! GetHaskellIndent() abort
return match(nonblankline, '\v^\s*%(<where>|.*<let>)?\s*\zs') + &shiftwidth
endif

if nonblankline =~# '\v<do>\s*[[:alnum:](]'
return match(nonblankline, '\v<do>\s*\zs\S')
endif

if nonblankline =~# '\v<deriving>'
return s:indent('', '\v^\s*\zs<data>', 0)
endif
Expand Down
2 changes: 2 additions & 0 deletions test/do/do_same_line.in.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
main = do print "hello"
print "world"
2 changes: 2 additions & 0 deletions test/do/do_same_line.out.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
main = do print "hello"
print "world"
Loading