Commit: runtime(misc): unset compiler in various ftplugins

[Christian Brabandt]

runtime(misc): unset compiler in various ftplugins

Commit: https://github.com/vim/vim/commit/7c3f9af0ed5dd7035f8a3fbb2f0bf965a453e359
Author: Konfekt <Kon...@users.noreply.github.com>
Date: Sat Oct 5 17:26:46 2024 +0200

runtime(misc): unset compiler in various ftplugins

just to foster best practices

closes: #15798

Signed-off-by: Konfekt <Kon...@users.noreply.github.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/ftplugin/context.vim b/runtime/ftplugin/context.vim
index 0070f8542..b39a306d7 100644
--- a/runtime/ftplugin/context.vim
+++ b/runtime/ftplugin/context.vim
@@ -4,7 +4,7 @@ vim9script
# Language: ConTeXt typesetting engine
# Maintainer: Nicola Vitacolonna <nvitac...@gmail.com>
# Former Maintainers: Nikolai Weibull <n...@bitwi.se>
-# Latest Revision: 2023 Dec 26
+# Latest Revision: 2024 Oct 04

if exists("b:did_ftplugin")
finish
@@ -14,10 +14,6 @@ import autoload '../autoload/context.vim'

b:did_ftplugin = 1

-if !exists('current_compiler')
- compiler context
-endif
-
b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"

setlocal comments=b:%D,b:%C,b:%M,:%
@@ -106,6 +102,12 @@ if !get(g:, 'no_context_maps', 0) && !get(g:, 'no_plugin_maps', 0)
endfor
endif

+if !exists('current_compiler')
+ b:undo_ftplugin ..= "| compiler make"
+ compiler context
+endif
+
+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=buffer ConTeXt context.Typeset(<q-args>)
command! -buffer -nargs=0 ConTeXtLog context.Log('%')
diff --git a/runtime/ftplugin/hare.vim b/runtime/ftplugin/hare.vim
index 422bb7b4e..6c61c818d 100644
--- a/runtime/ftplugin/hare.vim
+++ b/runtime/ftplugin/hare.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin.
" Language: Hare
" Maintainer: Amelia Clarke <sel...@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 d25883640..307fbdb62 100644
--- a/runtime/ftplugin/jq.vim
+++ b/runtime/ftplugin/jq.vim
@@ -3,6 +3,7 @@
" Maintainer: Vito <vito...@gmail.com>
" Last Change: 2024 Apr 29
" 2024 May 23 by Riley Bruins <rib...@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 fcfc1ac26..babf33795 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 c2bcdd34b..3e2741f91 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 fba808371..895fc688d 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 8bfc45e4c..4e12350c2 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 <n...@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 ea229b6a4..ea584ed08 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.l...@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