]> gitweb.factorcode.org Git - factor.git/commitdiff
misc/vim/indent: Update
authorGiftpflanze <gifti@tools.wmflabs.org>
Tue, 6 Dec 2022 20:51:11 +0000 (20:51 +0000)
committerGiftpflanze <gifti@tools.wmflabs.org>
Mon, 9 Jan 2023 19:40:36 +0000 (19:40 +0000)
misc/vim/indent/factor.vim

index 5d42de74f1c97343559bf130bd811132133c8d8a..f4a6f66ff2ca2d0a2c32e49e3e131d51f4288d31 100644 (file)
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:    Factor
 " Maintainer:  Giftpflanze <gifti@tools.wmflabs.org>
-" Last Change: 2022 August 23
+" Last Change: 2023-01-09
 
 if exists("b:did_indent")
        finish
@@ -20,14 +20,14 @@ function! GetFactorIndent(lnum)
        let cline = getline(a:lnum)
        let pline = getline(a:lnum-1)
        let pind = indent(a:lnum-1)
-       if pline =~ '^:'
+       if pline =~ '^[^ ]*:' || pline =~ '[{[]\s*$'
                let pind += shiftwidth()
        endif
-       if pline =~ ';$'
+       if pline =~ '^\(ALIAS\|C\|CONSTANT\|DEFER\|FORGET\|GENERIC#\?\|HELP\|\(\(SHUTDOWN\|STARTUP\)-\)\?HOOK\|IN\|INSTANCE\|MAIN\|MATH\|MIXIN\|PRIMITIVE\|QUALIFIED\(-WITH\)\?\|RENAME\|SINGLETON\|SLOT\|SYMBOL\|USE\|USING\):'
                let pind -= shiftwidth()
        endif
-       if pline =~ '[{[]$'
-               let pind += shiftwidth()
+       if pline =~ ';\( \(inline\|recursive\|foldable\|flushable\)\)*$'
+               let pind -= shiftwidth()
        endif
        if cline =~ '^\s*[\]}]'
                let pind -= shiftwidth()