runtime(scheme): update runtime files

Add TODO highlighting, disable text-wrapping, add "define-library" to
lispwords on CHICKEN. Update MAINTAINERS.

closes: #15063

Signed-off-by: Evan Hanson <evhan@foldling.org>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 19574990f26c7c43339b18f1da5ca70d93ad984c..0bc4a8f53ec6b6583ec80695c596bf9aa9e729ce 100644 (file)
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -115,6 +115,7 @@ runtime/ftplugin/basic.vim          @dkearns
 runtime/ftplugin/bst.vim               @tpope
 runtime/ftplugin/cfg.vim               @chrisbra
 runtime/ftplugin/chatito.vim           @ObserverOfTime
+runtime/ftplugin/chicken.vim           @evhan
 runtime/ftplugin/clojure.vim           @axvr
 runtime/ftplugin/cs.vim                        @nickspoons
 runtime/ftplugin/csh.vim               @dkearns
@@ -222,6 +223,7 @@ runtime/ftplugin/ruby.vim           @tpope @dkearns
 runtime/ftplugin/rust.vim              @lilyball
 runtime/ftplugin/sass.vim              @tpope
 runtime/ftplugin/scala.vim             @derekwyatt
+runtime/ftplugin/scheme.vim            @evhan
 runtime/ftplugin/scss.vim              @tpope
 runtime/ftplugin/sdoc.vim              @gpanders
 runtime/ftplugin/sed.vim               @dkearns
@@ -322,6 +324,7 @@ runtime/indent/readline.vim         @dkearns
 runtime/indent/ruby.vim                        @AndrewRadev @dkearns
 runtime/indent/sass.vim                        @tpope
 runtime/indent/scala.vim               @derekwyatt
+runtime/indent/scheme.vim              @evhan
 runtime/indent/scss.vim                        @tpope
 runtime/indent/sh.vim                  @chrisbra
 runtime/indent/solidity.vim            @cothi
@@ -368,6 +371,7 @@ runtime/syntax/cabalconfig.vim              @coot
 runtime/syntax/cabalproject.vim                @coot
 runtime/syntax/cf.vim                  @ernstvanderlinden
 runtime/syntax/chatito.vim             @ObserverOfTime
+runtime/syntax/chicken.vim             @evhan
 runtime/syntax/chuck.vim               @gacallea
 runtime/syntax/clojure.vim             @axvr
 runtime/syntax/cs.vim                  @nickspoons
@@ -502,6 +506,7 @@ runtime/syntax/rst.vim                      @marshallward
 runtime/syntax/ruby.vim                        @dkearns
 runtime/syntax/sass.vim                        @tpope
 runtime/syntax/scala.vim               @derekwyatt
+runtime/syntax/scheme.vim              @evhan
 runtime/syntax/scss.vim                        @tpope
 runtime/syntax/sdoc.vim                        @gpanders
 runtime/syntax/sed.vim                 @dkearns

diff --git a/runtime/ftplugin/chicken.vim b/runtime/ftplugin/chicken.vim
index 84d45bae1e89ec7e87771b8833c58e2d3d405563..b12b264f6e4369ba041afceae5828050c663002f 100644 (file)
--- a/runtime/ftplugin/chicken.vim
+++ b/runtime/ftplugin/chicken.vim
@@ -1,12 +1,12 @@
 " CHICKEN-specific Vim customizations
-" Last Change: 2018-03-05
-" Author: Evan Hanson <evhan@foldling.org>
-" Maintainer: Evan Hanson <evhan@foldling.org>
-" Repository: https://git.foldling.org/vim-scheme.git
-" URL: https://foldling.org/vim/ftplugin/chicken.vim
-" Notes: These are supplemental settings, to be loaded after the core
-" Scheme ftplugin file (ftplugin/scheme.vim). Enable it by setting
-" b:is_chicken=1 and filetype=scheme.
+" Last Change: 2024 Jun 21
+" Author:      Evan Hanson <evhan@foldling.org>
+" Maintainer:  Evan Hanson <evhan@foldling.org>
+" Repository:  https://git.foldling.org/vim-scheme.git
+" URL:         https://foldling.org/vim/ftplugin/chicken.vim
+" Notes:       These are supplemental settings, to be loaded after the
+"              core Scheme ftplugin file (ftplugin/scheme.vim). Enable
+"              it by setting b:is_chicken=1 and filetype=scheme.
 
 if !exists('b:did_scheme_ftplugin')
   finish

diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 03f625b564d6000e34366e419401540a700a9d1b..63e578199d98d6fb5fca16c52407e9ac591c4573 100644 (file)
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -1,12 +1,12 @@
 " Vim filetype plugin file
-" Language:    Scheme (R7RS)
-" Last Change: 2019 Nov 19
-"              2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
-" Author:      Evan Hanson <evhan@foldling.org>
-" Maintainer:  Evan Hanson <evhan@foldling.org>
+" Language:            Scheme (R7RS)
+" Last Change:         2024 Jun 21
+"                      2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
+" Author:              Evan Hanson <evhan@foldling.org>
+" Maintainer:          Evan Hanson <evhan@foldling.org>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
-" Repository:  https://git.foldling.org/vim-scheme.git
-" URL:         https://foldling.org/vim/ftplugin/scheme.vim
+" Repository:          https://git.foldling.org/vim-scheme.git
+" URL:                 https://foldling.org/vim/ftplugin/scheme.vim
 
 if exists('b:did_ftplugin')
   finish
@@ -20,11 +20,13 @@ setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|#
 setl commentstring=;\ %s
 setl define=^\\s*(def\\k*
 setl iskeyword=33,35-39,42-43,45-58,60-90,94,95,97-122,126
+setl formatoptions-=t
 
-let b:undo_ftplugin = 'setl lisp< comments< commentstring< define< iskeyword<'
+let b:undo_ftplugin = 'setl lisp< comments< commentstring< define< iskeyword< formatoptions<'
 
 setl lispwords+=case
 setl lispwords+=define
+setl lispwords+=define-library
 setl lispwords+=define-record-type
 setl lispwords+=define-syntax
 setl lispwords+=define-values

diff --git a/runtime/indent/scheme.vim b/runtime/indent/scheme.vim
index 496da3267d4388263cd6f057affb2b6cfab694d5..888659b1de8b811e92eb6df411b705f21e67015d 100644 (file)
--- a/runtime/indent/scheme.vim
+++ b/runtime/indent/scheme.vim
@@ -1,9 +1,10 @@
 " Vim indent file
-" Language: Scheme
-" Last Change: 2018 Jan 31
-" Maintainer: Evan Hanson <evhan@foldling.org>
+" Language:            Scheme
+" Last Change:         2024 Jun 21
+" Maintainer:          Evan Hanson <evhan@foldling.org>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
-" URL: https://foldling.org/vim/indent/scheme.vim
+" Repository:          https://git.foldling.org/vim-scheme.git
+" URL:                 https://foldling.org/vim/indent/scheme.vim
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")

diff --git a/runtime/syntax/chicken.vim b/runtime/syntax/chicken.vim
index f53d872e745b55fee864e527c3b87c789fe6bc90..958fc1f3618db5296ed76c5e3befa5917c1c1f43 100644 (file)
--- a/runtime/syntax/chicken.vim
+++ b/runtime/syntax/chicken.vim
@@ -1,13 +1,13 @@
 " Vim syntax file
-" Language: Scheme (CHICKEN)
-" Last Change: 2021 Oct 01
-" Author: Evan Hanson <evhan@foldling.org>
-" Maintainer: Evan Hanson <evhan@foldling.org>
-" Repository: https://git.foldling.org/vim-scheme.git
-" URL: https://foldling.org/vim/syntax/chicken.vim
-" Notes: This is supplemental syntax, to be loaded after the core Scheme
-" syntax file (syntax/scheme.vim). Enable it by setting b:is_chicken=1
-" and filetype=scheme.
+" Language:    Scheme (CHICKEN)
+" Last Change: 2024 Jun 21
+" Author:      Evan Hanson <evhan@foldling.org>
+" Maintainer:  Evan Hanson <evhan@foldling.org>
+" Repository:  https://git.foldling.org/vim-scheme.git
+" URL:         https://foldling.org/vim/syntax/chicken.vim
+" Notes:       This is supplemental syntax, to be loaded after the core
+"              Scheme syntax file (syntax/scheme.vim). Enable it by
+"              setting b:is_chicken=1 and filetype=scheme.
 
 " Only to be used on top of the Scheme syntax.
 if !exists('b:did_scheme_syntax')

diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
index c4454fc57c1ca7d3b9b6f681351f3e40db23173e..59b0cc5b188d9a6a4dc293fdc22be9b419355e3a 100644 (file)
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -1,12 +1,12 @@
 " Vim syntax file
-" Language: Scheme (R7RS)
-" Last Change: 2021-01-03
-" Author: Evan Hanson <evhan@foldling.org>
-" Maintainer: Evan Hanson <evhan@foldling.org>
-" Previous Author: Dirk van Deun <dirk@igwe.vub.ac.be>
+" Language:            Scheme (R7RS)
+" Last Change:         2024 Jun 21
+" Author:              Evan Hanson <evhan@foldling.org>
+" Maintainer:          Evan Hanson <evhan@foldling.org>
+" Previous Author:     Dirk van Deun <dirk@igwe.vub.ac.be>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
-" Repository: https://git.foldling.org/vim-scheme.git
-" URL: https://foldling.org/vim/syntax/scheme.vim
+" Repository:          https://git.foldling.org/vim-scheme.git
+" URL:                 https://foldling.org/vim/syntax/scheme.vim
 
 if exists('b:current_syntax')
   finish
@@ -50,9 +50,11 @@ syn match schemeBoolean /#f\(alse\)\?/
 syn match schemeCharacter /#\\.[^ `'\t\n\[\]()]*/
 syn match schemeCharacter /#\\x[0-9a-fA-F]\+/
 
-syn match schemeComment /;.*$/ contains=@Spell
+syn match schemeComment /;.*$/ contains=schemeTodo,@Spell
 
-syn region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeMultilineComment,@Spell
+syn region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeTodo,schemeMultilineComment,@Spell
+
+syn match schemeTodo /\c\<\(todo\|xxx\|fixme\|note\):\?\>/ contained
 
 syn region schemeForm matchgroup=schemeParentheses start="(" end=")" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
 syn region schemeForm matchgroup=schemeParentheses start="\[" end="\]" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
@@ -427,6 +429,7 @@ syn keyword schemeFunction write-string
 syn keyword schemeFunction write-u8
 syn keyword schemeFunction zero?
 
+hi def link schemeTodo Todo
 hi def link schemeBoolean Boolean
 hi def link schemeCharacter Character
 hi def link schemeComment Comment