nyx/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-03-16 23:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions3

runtime(compilers): ensure compiler! sets global options ()

Browse source 
Previously some options were only set locally by
&l:makeprg/errorformat

This suffices for :compiler (without a trailing bang)
but falls short for :compiler! that sets &g:makeprg/errorformat as
well

Also apply kind suggestions by @dkearns and @lifepillar 

Signed-off-by: Konfekt <Konfekt@users.noreply.github.com>
Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Enno 2024-03-31 18:37:05 +02:00 • committed by GitHub
parent 80aabaab66
commit 18d730d7b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 16 deletions

10
runtime/compiler/bdf.vim
View file

@ -1,7 +1,8 @@
" Vim compiler file
" Compiler: BDF to PCF Conversion
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2006-04-19
" Contributors: Enno Nagel
" Last Change: 2024 Mar 29
if exists("current_compiler")
finish
@ -11,9 +12,12 @@ let current_compiler = "bdf"
let s:cpo_save = &cpo
set cpo-=C
setlocal makeprg=bdftopcf\ $*
if exists(":CompilerSet") != 2 " Older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif
setlocal errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
CompilerSet makeprg=bdftopcf\ $*
CompilerSet errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
\%-Z%p^,
\%Cbdftopcf:\ bdf\ input\\,\ %f\\,\ corrupt,
\%-G%.%#

6
runtime/compiler/context.vim
View file

@ -3,7 +3,8 @@ vim9script
# Language: ConTeXt typesetting engine
# Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
# Former Maintainers: Nikolai Weibull <now@bitwi.se>
# Latest Revision: 2023 Dec 26
# Contributors: Enno Nagel
# Last Change: 2024 Mar 29
if exists("g:current_compiler")
finish
@ -19,7 +20,8 @@ g:current_compiler = 'context'
if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
(!filereadable('Makefile') && !filereadable('makefile'))
&l:makeprg = join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
var makeprg = join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
execute 'CompilerSet makeprg=' .. escape(makeprg, ' ')
else
g:current_compiler = 'make'
endif

15
runtime/compiler/mcs.vim
View file

@ -1,8 +1,8 @@
" Vim compiler file
" Compiler: Mono C# Compiler
" Maintainer: Jarek Sobiecki <harijari@go2.pl>
" Last Updated By: Peter Collingbourne
" Latest Revision: 2012 Jul 19
" Compiler: Mono C# Compiler
" Maintainer: Jarek Sobiecki <harijari@go2.pl>
" Contributors: Peter Collingbourne and Enno Nagel
" Last Change: 2024 Mar 29
if exists("current_compiler")
finish
@ -12,7 +12,12 @@ let current_compiler = "mcs"
let s:cpo_save = &cpo
set cpo-=C
setlocal errorformat=
if exists(":CompilerSet") != 2 " Older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif
CompilerSet makeprg=mcs
CompilerSet errorformat=
\%D%.%#Project\ \"%f/%[%^/\"]%#\"%.%#,
\%X%.%#Done\ building\ project\ \"%f/%[%^/\"]%#\"%.%#,
\%-G%\\s%.%#,

6
runtime/compiler/modelsim_vcom.vim
View file

@ -1,7 +1,8 @@
" Vim Compiler File
" Compiler: Modelsim Vcom
" Maintainer: Paul Baleme <pbaleme@mail.com>
" Last Change: September 8, 2003
" Contributors: Enno Nagel
" Last Change: 2024 Mar 29
" Thanks to: allanherriman@hotmail.com
if exists("current_compiler")
@ -13,8 +14,9 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
command -nargs=* CompilerSet setlocal <args>
endif
"setlocal errorformat=\*\*\ %tRROR:\ %f(%l):\ %m,%tRROR:\ %f(%l):\ %m,%tARNING\[%*[0-9]\]:\ %f(%l):\ %m,\*\*\ %tRROR:\ %m,%tRROR:\ %m,%tARNING\[%*[0-9]\]:\ %m
CompilerSet makeprg=vcom
"setlocal errorformat=\*\*\ %tRROR:\ %f(%l):\ %m,%tRROR:\ %f(%l):\ %m,%tARNING\[%*[0-9]\]:\ %f(%l):\ %m,\*\*\ %tRROR:\ %m,%tRROR:\ %m,%tARNING\[%*[0-9]\]:\ %m
"setlocal errorformat=%tRROR:\ %f(%l):\ %m,%tARNING\[%*[0-9]\]:\ %m
CompilerSet errorformat=\*\*\ %tRROR:\ %f(%l):\ %m,\*\*\ %tRROR:\ %m,\*\*\ %tARNING:\ %m,\*\*\ %tOTE:\ %m,%tRROR:\ %f(%l):\ %m,%tARNING\[%*[0-9]\]:\ %f(%l):\ %m,%tRROR:\ %m,%tARNING\[%*[0-9]\]:\ %m

7
runtime/compiler/powershell.vim
View file

@ -1,7 +1,8 @@
" Vim compiler file
" Compiler: powershell
" URL: https://github.com/PProvost/vim-ps1
" Last Change: 2020 Mar 30
" Contributors: Enno Nagel
" Last Change: 2024 Mar 29
if exists("current_compiler")
finish
@ -37,7 +38,7 @@ let g:ps1_efm_show_error_categories = get(g:, 'ps1_efm_show_error_categories', 0
" Use absolute path because powershell requires explicit relative paths
" (./file.ps1 is okay, but # expands to file.ps1)
let &l:makeprg = g:ps1_makeprg_cmd .' %:p:S'
let makeprg = g:ps1_makeprg_cmd .. ' %:p:S'
" Parse file, line, char from callstacks:
" Write-Ouput : The term 'Write-Ouput' is not recognized as the name of a
@ -50,6 +51,8 @@ let &l:makeprg = g:ps1_makeprg_cmd .' %:p:S'
" + CategoryInfo : ObjectNotFound: (Write-Ouput:String) [], CommandNotFoundException
" + FullyQualifiedErrorId : CommandNotFoundException
execute 'CompilerSet makeprg=' .. escape(makeprg, ' ')
" Showing error in context with underlining.
CompilerSet errorformat=%+G+%m
" Error summary.

6
runtime/compiler/tex.vim
View file

@ -1,7 +1,8 @@
" Vim compiler file
" Compiler: TeX
" Maintainer: Artem Chuprina <ran@ran.pp.ru>
" Last Change: 2012 Apr 30
" Contributors: Enno Nagel
" Last Change: 2024 Mar 29
if exists("current_compiler")
finish
@ -27,7 +28,8 @@ if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') ||
else
let current_compiler = "latex"
endif
let &l:makeprg=current_compiler.' -interaction=nonstopmode'
let makeprg=current_compiler .. ' -interaction=nonstopmode'
execute 'CompilerSet makeprg=' .. escape(makeprg, ' ')
else
let current_compiler = 'make'
endif