aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-10-05 17:41:54 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-10-07 19:19:15 +0200
commit88085c2e80a7e3ac29aabb6b5420377eed99b8b6 (patch)
treea16a2f694bf50e477c227f023983fa5a802077e3
parent4ea0f1ec23eb74fb26b7137cdd83af3b0539f3be (diff)
downloadrneovim-88085c2e80a7e3ac29aabb6b5420377eed99b8b6.tar.gz
rneovim-88085c2e80a7e3ac29aabb6b5420377eed99b8b6.tar.bz2
rneovim-88085c2e80a7e3ac29aabb6b5420377eed99b8b6.zip
vim-patch:7c3f9af: runtime(misc): unset compiler in various ftplugins
just to foster best practices closes: vim/vim#15798 https://github.com/vim/vim/commit/7c3f9af0ed5dd7035f8a3fbb2f0bf965a453e359 Co-authored-by: Konfekt <Konfekt@users.noreply.github.com>
-rw-r--r--runtime/ftplugin/context.vim10
-rw-r--r--runtime/ftplugin/hare.vim10
-rw-r--r--runtime/ftplugin/jq.vim8
-rw-r--r--runtime/ftplugin/requirements.vim6
-rw-r--r--runtime/ftplugin/rust.vim1
-rw-r--r--runtime/ftplugin/typst.vim9
-rw-r--r--runtime/ftplugin/yaml.vim7
-rw-r--r--runtime/ftplugin/zig.vim9
8 files changed, 42 insertions, 18 deletions
diff --git a/runtime/ftplugin/context.vim b/runtime/ftplugin/context.vim
index 37f7240d7b..ed6b5fa672 100644
--- a/runtime/ftplugin/context.vim
+++ b/runtime/ftplugin/context.vim
@@ -12,10 +12,6 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
-if !exists('current_compiler')
- compiler context
-endif
-
let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
@@ -108,6 +104,12 @@ if get(g:, 'context_mappings', 1)
endif
endif
+if !exists('current_compiler')
+ let b:undo_ftplugin ..= "| compiler make"
+ compiler context
+endif
+
+let b:undo_ftplugin ..= "| sil! delc -buffer ConTeXt | sil! delc -buffer ConTeXtLog | sil! delc -buffer ConTeXtJobStatus | sil! delc -buffer ConTeXtStopJobs"
" Commands for asynchronous typesetting
command! -buffer -nargs=? -complete=file ConTeXt call context#typeset(<q-args>)
command! -nargs=0 ConTeXtJobStatus call context#job_status()
diff --git a/runtime/ftplugin/hare.vim b/runtime/ftplugin/hare.vim
index 422bb7b4e8..6c61c818d1 100644
--- a/runtime/ftplugin/hare.vim
+++ b/runtime/ftplugin/hare.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin.
" Language: Hare
" Maintainer: Amelia Clarke <selene@perilune.dev>
-" Last Updated: 2024-05-10
+" Last Updated: 2024 Oct 04
" Upstream: https://git.sr.ht/~sircmpwn/hare.vim
if exists('b:did_ftplugin')
@@ -12,9 +12,6 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
-" Set the default compiler.
-compiler hare
-
" Formatting settings.
setlocal comments=://
setlocal commentstring=//\ %s
@@ -53,6 +50,11 @@ augroup hare.vim
endif
augroup END
+if !exists('current_compiler')
+ let b:undo_ftplugin .= "| compiler make"
+ compiler hare
+endif
+
let &cpo = s:cpo_save
unlet s:cpo_save
diff --git a/runtime/ftplugin/jq.vim b/runtime/ftplugin/jq.vim
index d25883640b..307fbdb62d 100644
--- a/runtime/ftplugin/jq.vim
+++ b/runtime/ftplugin/jq.vim
@@ -3,6 +3,7 @@
" Maintainer: Vito <vito.blog@gmail.com>
" Last Change: 2024 Apr 29
" 2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
+" 2024 Oct 04 by Konfekt (unset compiler)
" Upstream: https://github.com/vito-c/jq.vim
if exists('b:did_ftplugin')
@@ -12,6 +13,11 @@ let b:did_ftplugin = 1
setlocal include=^\\s*\\%(import\\\|include\\)
setlocal commentstring=#\ %s
-compiler jq
let b:undo_ftplugin = 'setl commentstring< include<'
+
+if !exists('current_compiler')
+ let b:undo_ftplugin ..= "| compiler make"
+ compiler jq
+endif
+
diff --git a/runtime/ftplugin/requirements.vim b/runtime/ftplugin/requirements.vim
index fcfc1ac269..babf33795c 100644
--- a/runtime/ftplugin/requirements.vim
+++ b/runtime/ftplugin/requirements.vim
@@ -36,7 +36,11 @@ let b:undo_ftplugin = "setl iskeyword< commentstring<"
" pip options contain "-"
setlocal iskeyword+=-
setlocal commentstring=#\ %s
-compiler pip_compile
+
+if !exists('current_compiler')
+ let b:undo_ftplugin ..= "| compiler make"
+ compiler pip_compile
+endif
let &cpoptions = s:save_cpoptions
unlet s:save_cpoptions
diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index c2bcdd34bc..3e2741f919 100644
--- a/runtime/ftplugin/rust.vim
+++ b/runtime/ftplugin/rust.vim
@@ -148,6 +148,7 @@ endif
" Cleanup {{{1
let b:undo_ftplugin = "
+ \ compiler make |
\ setlocal formatoptions< comments< commentstring< include< includeexpr< suffixesadd<
\|if exists('b:rust_set_style')
\|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
diff --git a/runtime/ftplugin/typst.vim b/runtime/ftplugin/typst.vim
index fba8083717..895fc688d9 100644
--- a/runtime/ftplugin/typst.vim
+++ b/runtime/ftplugin/typst.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Typst
" Maintainer: Gregory Anders
-" Last Change: 2024-07-14
+" Last Change: 2024 Oct 04
" Based on: https://github.com/kaarmu/typst.vim
if exists('b:did_ftplugin')
@@ -9,8 +9,6 @@ if exists('b:did_ftplugin')
endif
let b:did_ftplugin = 1
-compiler typst
-
setlocal commentstring=//\ %s
setlocal comments=s1:/*,mb:*,ex:*/,://
setlocal formatoptions+=croq
@@ -22,3 +20,8 @@ if get(g:, 'typst_conceal', 0)
setlocal conceallevel=2
let b:undo_ftplugin .= ' cole<'
endif
+
+if !exists('current_compiler')
+ compiler typst
+ let b:undo_ftplugin ..= "| compiler make"
+endif
diff --git a/runtime/ftplugin/yaml.vim b/runtime/ftplugin/yaml.vim
index 8bfc45e4c8..4e12350c22 100644
--- a/runtime/ftplugin/yaml.vim
+++ b/runtime/ftplugin/yaml.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: YAML (YAML Ain't Markup Language)
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> (inactive)
-" Last Change: 2020 Mar 02
+" Last Change: 2024 Oct 04
if exists("b:did_ftplugin")
finish
@@ -18,7 +18,10 @@ setlocal formatoptions-=t formatoptions+=croql
" rime input method engine uses `*.custom.yaml` as its config files
if expand('%:r:e') ==# 'custom'
- compiler rime_deployer
+ if !exists('current_compiler')
+ compiler rime_deployer
+ let b:undo_ftplugin ..= "| compiler make"
+ endif
setlocal include=__include:\\s*
let b:undo_ftplugin ..= " inc<"
endif
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index ea229b6a49..ea584ed086 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Zig
" Maintainer: Mathias Lindgren <math.lindgren@gmail.com>
-" Last Change: 2024 May 21
+" Last Change: 2024 Oct 04
" Based on: https://github.com/ziglang/zig.vim
if exists("b:did_ftplugin")
@@ -13,8 +13,6 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo
set cpo&vim
-compiler zig_build
-
" Match Zig builtin fns
setlocal iskeyword+=@-@
setlocal formatoptions-=t formatoptions+=croql
@@ -47,6 +45,11 @@ if exists('g:zig_std_dir')
let b:undo_ftplugin .= ' | setl pa<'
endif
+if !exists('current_compiler')
+ compiler zig_build
+ let b:undo_ftplugin .= "| compiler make"
+endif
+
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab