From 1fa54e0239778052ed6826bd6f81385513c42af5 Mon Sep 17 00:00:00 2001 From: NAKAMURA Mitsuhiro Date: Wed, 7 Feb 2024 09:11:25 +0900 Subject: [PATCH 1/2] style: sort lispwords according to Fennel reference --- ftplugin/fennel.vim | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim index 35a28b2..4573936 100644 --- a/ftplugin/fennel.vim +++ b/ftplugin/fennel.vim @@ -1,6 +1,6 @@ " Vim filetype plugin file " Language: Fennel -" Last Change: 2021-07-07 +" Last Change: 2024-02-07 " Original Maintainer: Calvin Rose " Maintainer: Mitsuhiro Nakamura " URL: https://github.com/mnacamura/vim-fennel-syntax @@ -45,10 +45,13 @@ setl comments=n:; setl commentstring=;\ %s setl lisp -setl lispwords=fn,lambda,let,match,when,each,for,while,doto,macro -setl lispwords+=λ -setl lispwords+=with-open,collect,icollect + +setl lispwords=fn,lambda,λ,let +setl lispwords+=match +setl lispwords+=with-open +setl lispwords+=collect,icollect setl lispwords+=accumulate +setl lispwords+=when,each,for,while,doto,macro if strlen(&omnifunc) == 0 setl omnifunc=syntaxcomplete#Complete From 6de3de22bc348052fe549de083a64ddc9675cb61 Mon Sep 17 00:00:00 2001 From: NAKAMURA Mitsuhiro Date: Wed, 7 Feb 2024 09:13:00 +0900 Subject: [PATCH 2/2] fix: add new special forms to lispwords --- CHANGELOG.md | 4 ++++ ftplugin/fennel.vim | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f6287..4ead63b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Fixed + +- Special forms indent: `case`, `case-try`, `match-try`, `fcollect`, `faccumulate` + ## [1.0.0][v1.0.0] (2024-02-06) ### Added diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim index 4573936..7dc12da 100644 --- a/ftplugin/fennel.vim +++ b/ftplugin/fennel.vim @@ -47,10 +47,10 @@ setl commentstring=;\ %s setl lisp setl lispwords=fn,lambda,λ,let -setl lispwords+=match +setl lispwords+=match,match-try,case,case-try setl lispwords+=with-open -setl lispwords+=collect,icollect -setl lispwords+=accumulate +setl lispwords+=collect,icollect,fcollect +setl lispwords+=accumulate,faccumulate setl lispwords+=when,each,for,while,doto,macro if strlen(&omnifunc) == 0