adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0442: hare runtime files outdated

Browse Source 
Problem:  hare runtime files outdated
Solution: runtime(hare): update hare.vim to match upstream
          (Amelia Clarke)

closes: #14836

Signed-off-by: Amelia Clarke <selene@perilune.dev>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Amelia Clarke
2024-05-24 08:05:00 +02:00
committed by Christian Brabandt
parent 2b09de9104
commit 35dfe58a54
16 changed files with 443 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
runtime/ftplugin/hare.vim
View File

@ -1,35 +1,59 @@
" Vim filetype plugin
" Language: Hare
" Maintainer: Amelia Clarke <me@rsaihe.dev>
" Previous Maintainer: Drew DeVault <sir@cmpwn.com>
" Last Updated: 2022-09-28
" 2023 Aug 28 by Vim Project (undo_ftplugin)
" Vim filetype plugin.
" Language: Hare
" Maintainer: Amelia Clarke <selene@perilune.dev>
" Last Updated: 2024-05-10
" Upstream: https://git.sr.ht/~sircmpwn/hare.vim
if exists('b:did_ftplugin')
finish
endif
let b:did_ftplugin = 1
" Formatting settings.
setlocal formatoptions-=t formatoptions+=croql/
let s:cpo_save = &cpo
set cpo&vim
" Miscellaneous.
" Set the default compiler.
compiler hare
" Formatting settings.
setlocal comments=://
setlocal commentstring=//\ %s
setlocal formatlistpat=^\ \\?-\
setlocal formatoptions+=croqnlj/ formatoptions-=t
" Search for Hare modules.
setlocal include=^\\s*use\\>
setlocal includeexpr=hare#FindModule(v:fname)
setlocal isfname+=:
setlocal suffixesadd=.ha
let b:undo_ftplugin = "setl cms< com< fo< sua<"
" Add HAREPATH to the default search paths.
setlocal path-=/usr/include,,
let &l:path .= ',' .. hare#GetPath() .. ',,'
" Hare recommended style.
if get(g:, "hare_recommended_style", 1)
let b:undo_ftplugin = 'setl cms< com< flp< fo< inc< inex< isf< pa< sua< mp<'
" Follow the Hare style guide by default.
if get(g:, 'hare_recommended_style', 1)
setlocal noexpandtab
setlocal shiftwidth=8
setlocal shiftwidth=0
setlocal softtabstop=0
setlocal tabstop=8
setlocal textwidth=80
let b:undo_ftplugin ..= " | setl et< sts< sw< ts< tw<"
let b:undo_ftplugin .= ' et< sts< sw< ts< tw<'
endif
compiler hare
augroup hare.vim
autocmd!
" vim: et sw=2 sts=2 ts=8
" Highlight whitespace errors by default.
if get(g:, 'hare_space_error', 1)
autocmd InsertEnter * hi link hareSpaceError NONE
autocmd InsertLeave * hi link hareSpaceError Error
endif
augroup END
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: et sts=2 sw=2 ts=8

44
runtime/ftplugin/haredoc.vim Normal file
View File

@ -0,0 +1,44 @@
" Vim filetype plugin.
" Language: Haredoc (Hare documentation format)
" Maintainer: Amelia Clarke <selene@perilune.dev>
" Last Updated: 2024-05-02
" Upstream: https://git.sr.ht/~selene/hare.vim
if exists('b:did_ftplugin')
finish
endif
let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
" Formatting settings.
setlocal comments=:\
setlocal formatlistpat=^\ \\?-\
setlocal formatoptions+=tnlj formatoptions-=c formatoptions-=q
" Search for Hare modules.
setlocal includeexpr=hare#FindModule(v:fname)
setlocal isfname+=:
setlocal suffixesadd=.ha
" Add HAREPATH to the default search paths.
setlocal path-=/usr/include,,
let &l:path .= ',' .. hare#GetPath() .. ',,'
let b:undo_ftplugin = 'setl com< flp< fo< inex< isf< pa< sua<'
" Follow the Hare style guide by default.
if get(g:, 'hare_recommended_style', 1)
setlocal noexpandtab
setlocal shiftwidth=0
setlocal softtabstop=0
setlocal tabstop=8
setlocal textwidth=80
let b:undo_ftplugin .= ' et< sts< sw< ts< tw<'
endif
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: et sts=2 sw=2 ts=8